Fixed a bug which sometimes lead to windows

    showing up at the size of 20x20 (default).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2333 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp
index be9f51d5d455cac0c0a08cdcb1a45da67bdb80a7..91ed541378e17894c9929c9dba55bb468e8c782f 100644 (file)
--- a/src/gtk/combobox.cpp
+++ b/src/gtk/combobox.cpp
@@ -584,11 +584,13 @@ void wxComboBox::OnSize( wxSizeEvent &event )
 {
     wxControl::OnSize( event );
 
+/*
     int w = 21;
     gtk_widget_set_usize( GTK_COMBO(m_widget)->entry, m_width-w-1, m_height );
 
     gtk_widget_set_uposition( GTK_COMBO(m_widget)->button, m_x+m_width-w, m_y );
     gtk_widget_set_usize( GTK_COMBO(m_widget)->button, w, m_height );
+*/
 }
 
 void wxComboBox::ApplyWidgetStyle()

diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp
index 637c62ff6ea505bfba5c7252f04bc41d21404201..04a8523505105063cdfe964c567b5bd2a32d0974 100644 (file)
--- a/src/gtk/frame.cpp
+++ b/src/gtk/frame.cpp
@@ -667,6 +667,9 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
             m_frameMenuBar->m_height = hh;
 
             gtk_myfixed_move( GTK_MYFIXED(m_mainWidget), m_frameMenuBar->m_widget, xx, yy );
+           
+//         m_frameMenuBar->m_widget->requisition.width = ww;
+//         m_frameMenuBar->m_widget->requisition.height = hh;
             gtk_widget_set_usize( m_frameMenuBar->m_widget, ww, hh );
        
            client_area_y_offset += hh;
@@ -692,6 +695,9 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
             m_frameToolBar->m_width = ww;
 
             gtk_myfixed_move( GTK_MYFIXED(m_mainWidget), m_frameToolBar->m_widget, xx, yy );
+           
+//         m_frameToolBar->m_widget->requisition.width = ww;
+//         m_frameToolBar->m_widget->requisition.height = hh;
             gtk_widget_set_usize( m_frameToolBar->m_widget, ww, hh );
        
            client_area_y_offset += hh;
@@ -703,7 +709,10 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
 
         int client_w = m_width - 2*m_miniEdge;
        int client_h = m_height - client_area_y_offset- 2*m_miniEdge - m_miniTitle;
+//     m_wxwindow->requisition.width = client_w;
+//     m_wxwindow->requisition.height = client_h;
         gtk_widget_set_usize( m_wxwindow, client_w, client_h );
+
     }
     else
     {
@@ -724,12 +733,15 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
         m_frameStatusBar->m_height = hh;
 
         gtk_myfixed_move( GTK_MYFIXED(m_wxwindow), m_frameStatusBar->m_widget, xx, yy );
+       
+//     m_frameStatusBar->m_widget->requisition.width = ww;
+//     m_frameStatusBar->m_widget->requisition.height = hh;
         gtk_widget_set_usize( m_frameStatusBar->m_widget, ww, hh );
     }
 
     /* we actually set the size of a frame here and no-where else */
     gtk_widget_set_usize( m_widget, m_width, m_height );
-
+    
     m_sizeSet = TRUE;
 
     /* send size event to frame */

diff --git a/src/gtk/notebook.cpp b/src/gtk/notebook.cpp
index 60df767b8f74f0fead9e955d680801734cd69f62..56ef149e825c694cf07c86514175de76401586a3 100644 (file)
--- a/src/gtk/notebook.cpp
+++ b/src/gtk/notebook.cpp
@@ -124,7 +124,7 @@ static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget),
 static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxWindow *win )
 {
     if (g_isIdle) wxapp_install_idle_handler();
-
+    
     if ((win->m_x == alloc->x) &&
         (win->m_y == alloc->y) &&
         (win->m_width == alloc->width) &&

diff --git a/src/gtk/win_gtk.c b/src/gtk/win_gtk.c
index 8dfde26e72c51fc24cb5399be73bcbf03f9b31fa..3aeb79f5b38a9132c9443e26851880207fb87654 100644 (file)
--- a/src/gtk/win_gtk.c
+++ b/src/gtk/win_gtk.c
@@ -384,8 +384,12 @@ gtk_myfixed_size_request (GtkWidget      *widget,
 
   myfixed = GTK_MYFIXED (widget);
   
+/*
   requisition->width = 0;
   requisition->height = 0;
+*/
+  requisition->width = widget->requisition.width;
+  requisition->height = widget->requisition.height;
 
   children = myfixed->children;
   while (children)
@@ -415,7 +419,7 @@ gtk_myfixed_size_allocate (GtkWidget     *widget,
   g_return_if_fail (allocation != NULL);
 
   myfixed = GTK_MYFIXED (widget);
-
+  
     widget->allocation = *allocation;
 #if (GTK_MINOR_VERSION > 0)
   if (myfixed->shadow_type == GTK_SHADOW_NONE)

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 004495d7baff0d8e850b3fdcc0e8641329a1a4f0..a67dfa0df7a72f214e398ab666adc96d646507a2 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -1443,13 +1443,13 @@ static void wxInsertChildInWindow( wxWindow* parent, wxWindow* child )
 {
     gtk_myfixed_put( GTK_MYFIXED(parent->m_wxwindow),
                      GTK_WIDGET(child->m_widget),
-                       child->m_x,
+                     child->m_x,
                      child->m_y );
 
-    gtk_widget_set_usize( GTK_WIDGET(child->m_widget),
+    gtk_widget_set_usize( child->m_widget,
                           child->m_width,
                           child->m_height );
-
+    
     if (parent->m_windowStyle & wxTAB_TRAVERSAL)
     {
         /* we now allow a window to get the focus as long as it
@@ -1994,7 +1994,7 @@ void wxWindow::DoSetSize( int x, int y, int width, int height, int sizeFlags )
     if (m_resizing) return; /* I don't like recursions */
     m_resizing = TRUE;
 
-    if (m_parent->m_wxwindow == NULL) /* i.e. wxNotebook */
+    if (m_parent->m_wxwindow == NULL) /* i.e. wxNotebook page */
     {
         /* don't set the size for children of wxNotebook, just take the values. */
         m_x = x;
@@ -2053,15 +2053,27 @@ void wxWindow::DoSetSize( int x, int y, int width, int height, int sizeFlags )
             if ((old_width != m_width) || (old_height != m_height))
            {
 /*
-               GtkAllocation alloc;
-               alloc.x = m_x;
-               alloc.y = m_y;
-               alloc.width = m_width;
-               alloc.height = m_height;
-               gtk_widget_size_allocate( m_widget, &alloc );
-*/
+                wxPrintf( _T("On DoSetSize from ") );
+                wxPrintf( GetClassInfo()->GetClassName() );
+                wxPrintf( _T(": %d %d.\n"), m_width, m_height );
+*/     
+           
                 gtk_widget_set_usize( m_widget, m_width, m_height );
+               
+               /* this is the result of hours of debugging: the followomg code
+                  means that if we have a m_wxwindow and we set the size of
+                  m_widget, m_widget (which is a GtkScrolledWindow) does NOT
+                  automatically propagate its size down to its m_wxwindow,
+                  which is its client area. therefore, we have to tell the
+                  client area directly that it has to get resize itself */
+               GtkAllocation alloc;
+               alloc.x = m_x;
+               alloc.y = m_y;
+               alloc.width = m_width;
+               alloc.height = m_height;
+               gtk_widget_size_allocate( m_widget, &alloc );
            }
+           
        }
     }
 

diff --git a/src/gtk1/combobox.cpp b/src/gtk1/combobox.cpp
index be9f51d5d455cac0c0a08cdcb1a45da67bdb80a7..91ed541378e17894c9929c9dba55bb468e8c782f 100644 (file)
--- a/src/gtk1/combobox.cpp
+++ b/src/gtk1/combobox.cpp
@@ -584,11 +584,13 @@ void wxComboBox::OnSize( wxSizeEvent &event )
 {
     wxControl::OnSize( event );
 
+/*
     int w = 21;
     gtk_widget_set_usize( GTK_COMBO(m_widget)->entry, m_width-w-1, m_height );
 
     gtk_widget_set_uposition( GTK_COMBO(m_widget)->button, m_x+m_width-w, m_y );
     gtk_widget_set_usize( GTK_COMBO(m_widget)->button, w, m_height );
+*/
 }
 
 void wxComboBox::ApplyWidgetStyle()

diff --git a/src/gtk1/frame.cpp b/src/gtk1/frame.cpp
index 637c62ff6ea505bfba5c7252f04bc41d21404201..04a8523505105063cdfe964c567b5bd2a32d0974 100644 (file)
--- a/src/gtk1/frame.cpp
+++ b/src/gtk1/frame.cpp
@@ -667,6 +667,9 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
             m_frameMenuBar->m_height = hh;
 
             gtk_myfixed_move( GTK_MYFIXED(m_mainWidget), m_frameMenuBar->m_widget, xx, yy );
+           
+//         m_frameMenuBar->m_widget->requisition.width = ww;
+//         m_frameMenuBar->m_widget->requisition.height = hh;
             gtk_widget_set_usize( m_frameMenuBar->m_widget, ww, hh );
        
            client_area_y_offset += hh;
@@ -692,6 +695,9 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
             m_frameToolBar->m_width = ww;
 
             gtk_myfixed_move( GTK_MYFIXED(m_mainWidget), m_frameToolBar->m_widget, xx, yy );
+           
+//         m_frameToolBar->m_widget->requisition.width = ww;
+//         m_frameToolBar->m_widget->requisition.height = hh;
             gtk_widget_set_usize( m_frameToolBar->m_widget, ww, hh );
        
            client_area_y_offset += hh;
@@ -703,7 +709,10 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
 
         int client_w = m_width - 2*m_miniEdge;
        int client_h = m_height - client_area_y_offset- 2*m_miniEdge - m_miniTitle;
+//     m_wxwindow->requisition.width = client_w;
+//     m_wxwindow->requisition.height = client_h;
         gtk_widget_set_usize( m_wxwindow, client_w, client_h );
+
     }
     else
     {
@@ -724,12 +733,15 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
         m_frameStatusBar->m_height = hh;
 
         gtk_myfixed_move( GTK_MYFIXED(m_wxwindow), m_frameStatusBar->m_widget, xx, yy );
+       
+//     m_frameStatusBar->m_widget->requisition.width = ww;
+//     m_frameStatusBar->m_widget->requisition.height = hh;
         gtk_widget_set_usize( m_frameStatusBar->m_widget, ww, hh );
     }
 
     /* we actually set the size of a frame here and no-where else */
     gtk_widget_set_usize( m_widget, m_width, m_height );
-
+    
     m_sizeSet = TRUE;
 
     /* send size event to frame */

diff --git a/src/gtk1/notebook.cpp b/src/gtk1/notebook.cpp
index 60df767b8f74f0fead9e955d680801734cd69f62..56ef149e825c694cf07c86514175de76401586a3 100644 (file)
--- a/src/gtk1/notebook.cpp
+++ b/src/gtk1/notebook.cpp
@@ -124,7 +124,7 @@ static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget),
 static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxWindow *win )
 {
     if (g_isIdle) wxapp_install_idle_handler();
-
+    
     if ((win->m_x == alloc->x) &&
         (win->m_y == alloc->y) &&
         (win->m_width == alloc->width) &&

diff --git a/src/gtk1/win_gtk.c b/src/gtk1/win_gtk.c
index 8dfde26e72c51fc24cb5399be73bcbf03f9b31fa..3aeb79f5b38a9132c9443e26851880207fb87654 100644 (file)
--- a/src/gtk1/win_gtk.c
+++ b/src/gtk1/win_gtk.c
@@ -384,8 +384,12 @@ gtk_myfixed_size_request (GtkWidget      *widget,
 
   myfixed = GTK_MYFIXED (widget);
   
+/*
   requisition->width = 0;
   requisition->height = 0;
+*/
+  requisition->width = widget->requisition.width;
+  requisition->height = widget->requisition.height;
 
   children = myfixed->children;
   while (children)
@@ -415,7 +419,7 @@ gtk_myfixed_size_allocate (GtkWidget     *widget,
   g_return_if_fail (allocation != NULL);
 
   myfixed = GTK_MYFIXED (widget);
-
+  
     widget->allocation = *allocation;
 #if (GTK_MINOR_VERSION > 0)
   if (myfixed->shadow_type == GTK_SHADOW_NONE)

diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index 004495d7baff0d8e850b3fdcc0e8641329a1a4f0..a67dfa0df7a72f214e398ab666adc96d646507a2 100644 (file)
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -1443,13 +1443,13 @@ static void wxInsertChildInWindow( wxWindow* parent, wxWindow* child )
 {
     gtk_myfixed_put( GTK_MYFIXED(parent->m_wxwindow),
                      GTK_WIDGET(child->m_widget),
-                       child->m_x,
+                     child->m_x,
                      child->m_y );
 
-    gtk_widget_set_usize( GTK_WIDGET(child->m_widget),
+    gtk_widget_set_usize( child->m_widget,
                           child->m_width,
                           child->m_height );
-
+    
     if (parent->m_windowStyle & wxTAB_TRAVERSAL)
     {
         /* we now allow a window to get the focus as long as it
@@ -1994,7 +1994,7 @@ void wxWindow::DoSetSize( int x, int y, int width, int height, int sizeFlags )
     if (m_resizing) return; /* I don't like recursions */
     m_resizing = TRUE;
 
-    if (m_parent->m_wxwindow == NULL) /* i.e. wxNotebook */
+    if (m_parent->m_wxwindow == NULL) /* i.e. wxNotebook page */
     {
         /* don't set the size for children of wxNotebook, just take the values. */
         m_x = x;
@@ -2053,15 +2053,27 @@ void wxWindow::DoSetSize( int x, int y, int width, int height, int sizeFlags )
             if ((old_width != m_width) || (old_height != m_height))
            {
 /*
-               GtkAllocation alloc;
-               alloc.x = m_x;
-               alloc.y = m_y;
-               alloc.width = m_width;
-               alloc.height = m_height;
-               gtk_widget_size_allocate( m_widget, &alloc );
-*/
+                wxPrintf( _T("On DoSetSize from ") );
+                wxPrintf( GetClassInfo()->GetClassName() );
+                wxPrintf( _T(": %d %d.\n"), m_width, m_height );
+*/     
+           
                 gtk_widget_set_usize( m_widget, m_width, m_height );
+               
+               /* this is the result of hours of debugging: the followomg code
+                  means that if we have a m_wxwindow and we set the size of
+                  m_widget, m_widget (which is a GtkScrolledWindow) does NOT
+                  automatically propagate its size down to its m_wxwindow,
+                  which is its client area. therefore, we have to tell the
+                  client area directly that it has to get resize itself */
+               GtkAllocation alloc;
+               alloc.x = m_x;
+               alloc.y = m_y;
+               alloc.width = m_width;
+               alloc.height = m_height;
+               gtk_widget_size_allocate( m_widget, &alloc );
            }
+           
        }
     }