callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app/display/gimpdisplayshell.c (gimp_display_shell_real_scaled)

Browse Source 
2004-10-08  Michael Natterer  <mitch@gimp.org>

	* app/display/gimpdisplayshell.c (gimp_display_shell_real_scaled)
	(gimp_display_shell_flush)
	* app/gui/gui-vtable.c (gui_display_create): always pass a
	GimpDisplay, not a GimpDisplayShell as "data" to
	gimp_ui_manager_update().

	* app/actions/actions.c (action_data_get_*): removed checks if the
	passed data is a GimpDisplayShell and temporarily added g_assert()
	to be sure. The assertions will be removed before 2.2.
This commit is contained in:
Michael Natterer
2004-10-08 09:16:04 +00:00
committed by Michael Natterer
parent de68f16e72
commit fb315d6ca7
4 changed files with 45 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/gui/gui-vtable.c
View File

@ -327,9 +327,8 @@ gui_display_create (GimpImage *gimage,
GimpUnit unit,
gdouble scale)
{
GimpDisplayShell *shell;
GimpDisplay *gdisp;
GList *image_managers;
GimpDisplay *gdisp;
GList *image_managers;
image_managers = gimp_ui_managers_from_name ("<Image>");
@ -338,11 +337,10 @@ gui_display_create (GimpImage *gimage,
image_managers->data);
shell = GIMP_DISPLAY_SHELL (gdisp->shell);
gimp_context_set_display (gimp_get_user_context (gimage->gimp), gdisp);
gimp_ui_manager_update (shell->menubar_manager, shell);
gimp_ui_manager_update (GIMP_DISPLAY_SHELL (gdisp->shell)->menubar_manager,
gdisp);
return GIMP_OBJECT (gdisp);
}