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

Use gimp_display_shell_present() instead of gtk_window_present()

Browse Source
This commit is contained in:
Michael Natterer
2009-10-04 19:27:58 +02:00
parent 94dcbe0e2e
commit 31a41c2b3d
8 changed files with 12 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/actions/documents-commands.c
View File

@ -45,6 +45,7 @@
#include "display/gimpdisplay.h" #include "display/gimpdisplay.h"
#include "display/gimpdisplay-foreach.h" #include "display/gimpdisplay-foreach.h"
#include "display/gimpdisplayshell.h"
#include "documents-commands.h" #include "documents-commands.h"
#include "file-commands.h" #include "file-commands.h"
@ -356,6 +357,6 @@ documents_raise_display (GimpDisplay *display,
if (uri && ! strcmp (closure->name, uri)) if (uri && ! strcmp (closure->name, uri))
{ {
closure->found = TRUE; closure->found = TRUE;
gtk_window_present (GTK_WINDOW (display->shell)); gimp_display_shell_present (GIMP_DISPLAY_SHELL (display->shell));
} }
} }

8
app/actions/images-commands.c
View File

@ -31,6 +31,7 @@
#include "widgets/gimpimageview.h" #include "widgets/gimpimageview.h"
#include "display/gimpdisplay.h" #include "display/gimpdisplay.h"
#include "display/gimpdisplayshell.h"
#include "images-commands.h" #include "images-commands.h"
@ -62,12 +63,7 @@ images_raise_views_cmd_callback (GtkAction *action,
GimpDisplay *display = list->data; GimpDisplay *display = list->data;
if (display->image == image) if (display->image == image)
{ gimp_display_shell_present (GIMP_DISPLAY_SHELL (display->shell));
GtkWidget *toplevel = gtk_widget_get_toplevel (display->shell);
if (GTK_IS_WINDOW (toplevel))
gtk_window_present (GTK_WINDOW (display->shell));
}
} }
} }
} }

4
app/actions/windows-commands.c
View File

@ -71,10 +71,8 @@ windows_show_display_cmd_callback (GtkAction *action,
gpointer data) gpointer data)
{ {
GimpDisplay *display = g_object_get_data (G_OBJECT (action), "display"); GimpDisplay *display = g_object_get_data (G_OBJECT (action), "display");
GtkWidget *toplevel = gtk_widget_get_toplevel (display->shell);
if (GTK_IS_WINDOW (toplevel)) gimp_display_shell_present (GIMP_DISPLAY_SHELL (display->shell));
gtk_window_present (GTK_WINDOW (toplevel));
} }
void void

3
app/dialogs/quit-dialog.c
View File

@ -33,6 +33,7 @@
#include "display/gimpdisplay.h" #include "display/gimpdisplay.h"
#include "display/gimpdisplay-foreach.h" #include "display/gimpdisplay-foreach.h"
#include "display/gimpdisplayshell.h"
#include "widgets/gimpcontainertreeview.h" #include "widgets/gimpcontainertreeview.h"
#include "widgets/gimpcontainerview.h" #include "widgets/gimpcontainerview.h"
@ -255,6 +256,6 @@ quit_close_all_dialog_image_activated (GimpContainerView *view,
GimpDisplay *display = list->data; GimpDisplay *display = list->data;
if (display->image == image) if (display->image == image)
gtk_window_present (GTK_WINDOW (display->shell)); gimp_display_shell_present (GIMP_DISPLAY_SHELL (display->shell));
} }
} }

5
app/display/gimpdisplay.c
View File

@ -426,16 +426,13 @@ gimp_display_new (Gimp *gimp,
gimp_image_window_add_shell (window, gimp_image_window_add_shell (window,
GIMP_DISPLAY_SHELL (display->shell)); GIMP_DISPLAY_SHELL (display->shell));
gimp_image_window_set_active_shell (window, gimp_display_shell_present (GIMP_DISPLAY_SHELL (display->shell));
GIMP_DISPLAY_SHELL (display->shell));
g_signal_connect (gimp_display_shell_get_statusbar (GIMP_DISPLAY_SHELL (display->shell)), g_signal_connect (gimp_display_shell_get_statusbar (GIMP_DISPLAY_SHELL (display->shell)),
"cancel", "cancel",
G_CALLBACK (gimp_display_progress_canceled), G_CALLBACK (gimp_display_progress_canceled),
display); display);
gtk_window_present (GTK_WINDOW (window));
/* add the display to the list */ /* add the display to the list */
gimp_container_add (gimp->displays, GIMP_OBJECT (display)); gimp_container_add (gimp->displays, GIMP_OBJECT (display));

5
app/display/gimpdisplayshell-dnd.c
View File

@ -182,10 +182,7 @@ static void
gimp_display_shell_dnd_flush (GimpDisplayShell *shell, gimp_display_shell_dnd_flush (GimpDisplayShell *shell,
GimpImage *image) GimpImage *image)
{ {
GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (shell)); gimp_display_shell_present (shell);
if (GTK_IS_WINDOW (toplevel))
gtk_window_present (GTK_WINDOW (toplevel));
gimp_image_flush (image); gimp_image_flush (image);

10
app/gui/gimpdbusservice.c
View File

@ -33,6 +33,7 @@
#include "file/file-open.h" #include "file/file-open.h"
#include "display/gimpdisplay.h" #include "display/gimpdisplay.h"
#include "display/gimpdisplayshell.h"
#include "gimpdbusservice.h" #include "gimpdbusservice.h"
#include "gimpdbusservice-glue.h" #include "gimpdbusservice-glue.h"
@ -204,14 +205,7 @@ gimp_dbus_service_activate (GimpDBusService *service,
display = gimp_container_get_first_child (service->gimp->displays); display = gimp_container_get_first_child (service->gimp->displays);
if (display) if (display)
{ gimp_display_shell_present (GIMP_DISPLAY_SHELL (GIMP_DISPLAY (display)->shell));
GtkWidget *toplevel;
toplevel = gtk_widget_get_toplevel (GIMP_DISPLAY (display)->shell);
if (GTK_IS_WINDOW (toplevel))
gtk_window_present (GTK_WINDOW (toplevel));
}
return TRUE; return TRUE;
} }

2
app/gui/gui-unique.c
View File

@ -173,7 +173,7 @@ gui_unique_win32_idle_open (IdleOpenData *data)
display = gimp_container_get_first_child (unique_gimp->displays); display = gimp_container_get_first_child (unique_gimp->displays);
gtk_window_present (GTK_WINDOW (GIMP_DISPLAY (display)->shell)); gimp_display_shell_present (GIMP_DISPLAY_SHELL (GIMP_DISPLAY (display)->shell));
} }
return FALSE; return FALSE;