1. fixed Maximise() mismatch between wxFrame and wxMDIFrame

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

diff --git a/src/gtk/win_gtk.c b/src/gtk/win_gtk.c
index dcd694df3fd1261b2dc65a40234456485e595fac..a9552bd63b6cf7afa7feae898b9137c291905fc4 100644 (file)
--- a/src/gtk/win_gtk.c
+++ b/src/gtk/win_gtk.c
@@ -10,7 +10,7 @@
 #include "wx/gtk/win_gtk.h"
 #include "gtk/gtksignal.h"
 #include "gtk/gtknotebook.h"
 #include "wx/gtk/win_gtk.h"
 #include "gtk/gtksignal.h"
 #include "gtk/gtknotebook.h"

-#include "gtk/gtktable.h"
+#include "gtk/gtkscrolledwindow.h"

 
 #ifdef __cplusplus
 extern "C" {
 
 #ifdef __cplusplus
 extern "C" {


@@ -328,9 +328,9 @@ gtk_myfixed_set_size (GtkMyFixed    *myfixed,
 
             if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_VISIBLE (myfixed))
            {
 
             if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_VISIBLE (myfixed))
            {

-                if ( ((child->width > 1) && (child->height > 1) && (GTK_WIDGET_REALIZED(widget))) ||
-                    /* I don't know why GtkTable is different */
-                    GTK_IS_TABLE(widget))
+                if ( (child->width > 1) && 
+                    (child->height > 1) && 
+                   !(GTK_WIDGET_REALIZED(widget) && GTK_IS_NOTEBOOK(widget)) )

                {
                     child_allocation.x = child->x;
                     child_allocation.y = child->y;
                {
                     child_allocation.x = child->x;
                     child_allocation.y = child->y;


@@ -537,15 +537,15 @@ gtk_myfixed_size_allocate (GtkWidget     *widget,
         child = children->data;
         children = children->next;
  
         child = children->data;
         children = children->next;
  

-        /* please look at the text in wxWindow::DoSetSize() on why the
-           test GTK_WIDGET_REALIZED() has to be here */

         if (GTK_WIDGET_VISIBLE (child->widget))
         { 
         if (GTK_WIDGET_VISIBLE (child->widget))
         { 

+/*          please look at the text in wxWindow::DoSetSize() on why the
+            test GTK_WIDGET_REALIZED() has to be here   */

 /*          if (GTK_IS_NOTEBOOK(child->widget) && !GTK_WIDGET_REALIZED(child->widget))
             {
                gtk_widget_queue_resize( child->widget );
            }
 /*          if (GTK_IS_NOTEBOOK(child->widget) && !GTK_WIDGET_REALIZED(child->widget))
             {
                gtk_widget_queue_resize( child->widget );
            }

-           else */
+           else  */

            {
                child_allocation.x = child->x;
                child_allocation.y = child->y;
            {
                child_allocation.x = child->x;
                child_allocation.y = child->y;