HP-UX gcc compilation fixes

[wxWidgets.git] / src / gtk1 / win_gtk.c

diff --git a/src/gtk1/win_gtk.c b/src/gtk1/win_gtk.c
index cd9ed0177e0065f30fcdf6871477d63a9e6ef2ad..e4fe2c1812ce0031f0b661f483f2e572b6b73d56 100644 (file)
--- a/src/gtk1/win_gtk.c
+++ b/src/gtk1/win_gtk.c
@@ -225,14 +225,16 @@ gtk_myfixed_put (GtkMyFixed   *myfixed,
 
   myfixed->children = g_list_append (myfixed->children, child_info); 
 
-  if (GTK_WIDGET_REALIZED (myfixed) && !GTK_WIDGET_REALIZED (widget))
+  if (GTK_WIDGET_REALIZED (myfixed))
     gtk_widget_realize (widget);
 
-  if (GTK_WIDGET_MAPPED (myfixed) && !GTK_WIDGET_MAPPED (widget))
-    gtk_widget_map (widget);
-
-  if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_VISIBLE (myfixed))
-    gtk_widget_queue_resize (GTK_WIDGET (myfixed));
+  if (GTK_WIDGET_VISIBLE (myfixed) && GTK_WIDGET_VISIBLE (widget))
+    {
+      if (GTK_WIDGET_MAPPED (myfixed))
+       gtk_widget_map (widget);
+      
+      gtk_widget_queue_resize (GTK_WIDGET (myfixed));
+    }
 }
 
 void
@@ -464,8 +466,10 @@ gtk_myfixed_size_request (GtkWidget      *widget,
 
   myfixed = GTK_MYFIXED (widget);
   
-  requisition->width = widget->requisition.width;
-  requisition->height = widget->requisition.height;
+  /* request very little, I'm not sure if requesting nothing
+     will always have positive effects on stability... */
+  requisition->width = 2;
+  requisition->height = 2;
 
   children = myfixed->children;
   while (children)