No need for ifdef, can now use GTK_IS_PLUG() with all backends.

2005-07-21  Tor Lillqvist  <tml@novell.com>

	* gtk/gtkwindow.c (gtk_window_show): No need for ifdef, can now
	use GTK_IS_PLUG() with all backends.
This commit is contained in:
Tor Lillqvist 2005-07-21 13:45:34 +00:00 committed by Tor Lillqvist
parent 860ab51af9
commit 0d3033d4c3
4 changed files with 23 additions and 11 deletions

View File

@ -1,8 +1,13 @@
2005-07-21 Tor Lillqvist <tml@novell.com>
* 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

View File

@ -1,8 +1,13 @@
2005-07-21 Tor Lillqvist <tml@novell.com>
* 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

View File

@ -1,8 +1,13 @@
2005-07-21 Tor Lillqvist <tml@novell.com>
* 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

View File

@ -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)