From 0d3033d4c3f472f4e796be925fd7d098a5ab44fd Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Thu, 21 Jul 2005 13:45:34 +0000 Subject: [PATCH] No need for ifdef, can now use GTK_IS_PLUG() with all backends. 2005-07-21 Tor Lillqvist * gtk/gtkwindow.c (gtk_window_show): No need for ifdef, can now use GTK_IS_PLUG() with all backends. --- ChangeLog | 9 +++++++-- ChangeLog.pre-2-10 | 9 +++++++-- ChangeLog.pre-2-8 | 9 +++++++-- gtk/gtkwindow.c | 7 ++----- 4 files changed, 23 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index f8f27a504f..a4ae967a79 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,13 @@ 2005-07-21 Tor Lillqvist - * gtk/gtk.symbols: Make GtkPlug/Socket API available on all platforms. + * gtk/gtkwindow.c (gtk_window_show): No need for ifdef, can now + use GTK_IS_PLUG() with all backends. - * gtk/Makefile.am: Changes to build GtkPlug/Socket on all platforms. + * gtk/gtk.symbols: Make GtkPlug/Socket API available with all + backends. + + * gtk/Makefile.am: Changes to build GtkPlug/Socket with all + backends. * gtk/gtksocket.c * gtk/gtkplug.c: Splice out backend-dependend parts to separate diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index f8f27a504f..a4ae967a79 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,8 +1,13 @@ 2005-07-21 Tor Lillqvist - * gtk/gtk.symbols: Make GtkPlug/Socket API available on all platforms. + * gtk/gtkwindow.c (gtk_window_show): No need for ifdef, can now + use GTK_IS_PLUG() with all backends. - * gtk/Makefile.am: Changes to build GtkPlug/Socket on all platforms. + * gtk/gtk.symbols: Make GtkPlug/Socket API available with all + backends. + + * gtk/Makefile.am: Changes to build GtkPlug/Socket with all + backends. * gtk/gtksocket.c * gtk/gtkplug.c: Splice out backend-dependend parts to separate diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index f8f27a504f..a4ae967a79 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,8 +1,13 @@ 2005-07-21 Tor Lillqvist - * gtk/gtk.symbols: Make GtkPlug/Socket API available on all platforms. + * gtk/gtkwindow.c (gtk_window_show): No need for ifdef, can now + use GTK_IS_PLUG() with all backends. - * gtk/Makefile.am: Changes to build GtkPlug/Socket on all platforms. + * gtk/gtk.symbols: Make GtkPlug/Socket API available with all + backends. + + * gtk/Makefile.am: Changes to build GtkPlug/Socket with all + backends. * gtk/gtksocket.c * gtk/gtkplug.c: Splice out backend-dependend parts to separate diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index 8f0365c2dd..7d0da98eaf 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -30,6 +30,8 @@ #include "gdk/gdk.h" #include "gdk/gdkkeysyms.h" +#include "gtkintl.h" + #include "gtkprivate.h" #include "gtkrc.h" #include "gtkwindow.h" @@ -40,7 +42,6 @@ #include "gtkmnemonichash.h" #include "gtkiconfactory.h" #include "gtkicontheme.h" -#include "gtkintl.h" #include "gtkmarshalers.h" #include "gtkplug.h" #include "gtkalias.h" @@ -3935,11 +3936,7 @@ gtk_window_show (GtkWidget *widget) /* Try to make sure that we have some focused widget */ -#ifdef GDK_WINDOWING_X11 if (!window->focus_widget && !GTK_IS_PLUG (window)) -#else - if (!window->focus_widget) -#endif gtk_window_move_focus (window, GTK_DIR_TAB_FORWARD); if (window->modal)