Re: GLib/GTK+ 2.0.3 freeze

[Owen Taylor <otaylor redhat com>]

Sven Neumann <sven gimp org> writes:

> Hi,
> 
> Owen Taylor <otaylor redhat com> writes:
> 
> > GLib/GTK+ should have about all the changes I think I 
> > can get in for 2.0.3 at this point, with the exception of some
> > gettext compability configure changes for GLib where I still
> > need feedback from the bug reporters.
> 
> GTK+ HEAD in its current state in CVS doesn't compile for any other
> GDK target but X11. I'd suggest to change the include of gtkplug.h
> from gtkwindow.c to something like this:
> 
>  #ifdef GDK_WINDOWING_X11
>  #include "gtkplug.h"
>  #else
>  #define GTK_IS_PLUG(win) (FALSE)
>  #endif

Not particularly liking the fake GTK_IS_PLUG() definition. I went
with slightly different solution below. (Not saying its cleaner,
just more to my taste.)

Regards,
                                        Owen

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gtk+/ChangeLog,v
retrieving revision 1.3338.2.60
diff -u -p -r1.3338.2.60 ChangeLog
--- ChangeLog	20 May 2002 19:04:12 -0000	1.3338.2.60
+++ ChangeLog	21 May 2002 19:32:52 -0000
@@ -1,3 +1,9 @@
+Tue May 21 15:33:32 2002  Owen Taylor  <otaylor redhat com>
+
+	* gtk/gtkwindow.c (gtk_window_show): Conditionalize
+	GTK_IS_PLUG() check on GDK_WINDOWING_X11. (Problem
+	reported by Sven Neumann)
+
 Mon May 20 15:02:21 2002  Owen Taylor  <otaylor redhat com>
 
 	* gdk/x11/gdkdisplay-x11.c: Patch from HideToshi Tajima
Index: gtk/gtkwindow.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkwindow.c,v
retrieving revision 1.201.2.3
diff -u -p -r1.201.2.3 gtkwindow.c
--- gtk/gtkwindow.c	17 May 2002 21:44:37 -0000	1.201.2.3
+++ gtk/gtkwindow.c	21 May 2002 19:32:52 -0000
@@ -3092,7 +3092,11 @@ 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)