Distrib corrections,

[wxWidgets.git] / src / gtk1 / notebook.cpp

diff --git a/src/gtk1/notebook.cpp b/src/gtk1/notebook.cpp
index da7f735b6bb83116d07eb49d7c3be9b43586e253..5d9d65d088bb8b090646691d27a4709db0ce6af1 100644 (file)
--- a/src/gtk1/notebook.cpp
+++ b/src/gtk1/notebook.cpp
@@ -124,21 +124,30 @@ static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation*
 
     win->SetSize( alloc->x, alloc->y, alloc->width, alloc->height );
 
 
     win->SetSize( alloc->x, alloc->y, alloc->width, alloc->height );
 

+    /* GTK 1.2 up to version 1.2.5 is broken so that we have to call allocate
+       here in order to make repositioning after resizing to take effect. */
+    if ((gtk_major_version == 1) &&
+        (gtk_minor_version == 2) &&
+       (gtk_micro_version < 6) &&
+        (win->m_wxwindow) && 
+       (GTK_WIDGET_REALIZED(win->m_wxwindow)))
+    {
+        gtk_widget_size_allocate( win->m_wxwindow, alloc );
+    }

 }
 
 //-----------------------------------------------------------------------------
 // "realize" from m_widget
 //-----------------------------------------------------------------------------
 
 }
 
 //-----------------------------------------------------------------------------
 // "realize" from m_widget
 //-----------------------------------------------------------------------------
 

-/* GTK 1.2 up to version 1.2.5 is broken so that we have to call a queue_resize
-   here in order to take repositioning before showing to take effect. */
-

 static gint
 gtk_notebook_realized_callback( GtkWidget * WXUNUSED(widget), wxWindow *win )
 {
     if (g_isIdle)
         wxapp_install_idle_handler();
 
 static gint
 gtk_notebook_realized_callback( GtkWidget * WXUNUSED(widget), wxWindow *win )
 {
     if (g_isIdle)
         wxapp_install_idle_handler();
 

+    /* GTK 1.2 up to version 1.2.5 is broken so that we have to call a queue_resize
+       here in order to make repositioning before showing to take effect. */

     gtk_widget_queue_resize( win->m_widget );
 
     return FALSE;
     gtk_widget_queue_resize( win->m_widget );
 
     return FALSE;