wxGTK's built-in dockable menu now give their

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

diff --git a/src/gtk/win_gtk.c b/src/gtk/win_gtk.c
index 31b638fb6fa48e0ee5488b836d959c8f82e01aed..c199d05b9b188cb67ad10ef60193262de91cba5e 100644 (file)
--- a/src/gtk/win_gtk.c
+++ b/src/gtk/win_gtk.c
@@ -413,10 +413,14 @@ gtk_myfixed_size_allocate (GtkWidget     *widget,
 
   myfixed = GTK_MYFIXED (widget);
 
 
   myfixed = GTK_MYFIXED (widget);
 

+#if (GTK_MINOR_VERSION > 0)

   if (myfixed->shadow_type == GTK_SHADOW_NONE)
     border = 0;
   else
     border = 2;
   if (myfixed->shadow_type == GTK_SHADOW_NONE)
     border = 0;
   else
     border = 2;

+#else
+  border = 0;
+#endif

 
   widget->allocation = *allocation;
   if (GTK_WIDGET_REALIZED (widget))
 
   widget->allocation = *allocation;
   if (GTK_WIDGET_REALIZED (widget))


@@ -424,10 +428,11 @@ gtk_myfixed_size_allocate (GtkWidget     *widget,
     gdk_window_move_resize( widget->window, 
                             allocation->x+border, allocation->y+border, 
 #if (GTK_MINOR_VERSION > 0)
     gdk_window_move_resize( widget->window, 
                             allocation->x+border, allocation->y+border, 
 #if (GTK_MINOR_VERSION > 0)

-                           allocation->width-border*2, allocation->height-border*2 );
+                           allocation->width-border*2, allocation->height-border*2

 #else
 #else

-                           32000, 32000 );
+                           32000, 32000

 #endif
 #endif

+                           );

   }
 
   children = myfixed->children;
   }
 
   children = myfixed->children;