gtk+ r19450 - in branches/gtk-2-12: . gtk

[bratsche svn gnome org]

Author: bratsche
Date: Thu Jan 31 17:56:34 2008
New Revision: 19450
URL: http://svn.gnome.org/viewvc/gtk+?rev=19450&view=rev

Log:
2008-01-31  Cody Russell  <bratsche gnome org>

        Merge from trunk:

        * gtk/gtkpaned.c (gtk_paned_set_position):
        Change queue_resize() to queue_draw(), and add a check for
        child2 != NULL in case someone calls this before there is
        a child packed in there.  (#144269 again)



Modified:
   branches/gtk-2-12/ChangeLog
   branches/gtk-2-12/gtk/gtkpaned.c

Modified: branches/gtk-2-12/gtk/gtkpaned.c
==============================================================================
--- branches/gtk-2-12/gtk/gtkpaned.c	(original)
+++ branches/gtk-2-12/gtk/gtkpaned.c	Thu Jan 31 17:56:34 2008
@@ -1235,7 +1235,10 @@
 
 #ifdef G_OS_WIN32
   /* Hacky work-around for bug #144269 */
-  gtk_widget_queue_resize (paned->child2);
+  if (paned->child2 != NULL)
+    {
+      gtk_widget_queue_draw (paned->child2);
+    }
 #endif
 }