[ 1559550 ] Fix wxVariant wxDateTime conversion from time string

[wxWidgets.git] / src / gtk / toplevel.cpp

diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp
index 614a4dce0af589ef047dc9a46706445c01da08e1..33ef92100e65caacc22ca1fcc194efee4c346fc3 100644 (file)
--- a/src/gtk/toplevel.cpp
+++ b/src/gtk/toplevel.cpp
@@ -237,8 +237,13 @@ static void gtk_frame_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation*
                                 (int)alloc->height );
 */
 
                                 (int)alloc->height );
 */
 

+        // Tell the wxWindow class about the new size

         win->m_width = alloc->width;
         win->m_height = alloc->height;
         win->m_width = alloc->width;
         win->m_height = alloc->height;

+        
+        if (win->m_mainWidget)
+            GTK_PIZZA(win->m_mainWidget)->m_width = win->m_width;
+        

         win->GtkUpdateSize();
     }
 }
         win->GtkUpdateSize();
     }
 }


@@ -559,6 +564,8 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent,
     GTK_WIDGET_UNSET_FLAGS( m_mainWidget, GTK_CAN_FOCUS );
     gtk_container_add( GTK_CONTAINER(m_widget), m_mainWidget );
 
     GTK_WIDGET_UNSET_FLAGS( m_mainWidget, GTK_CAN_FOCUS );
     gtk_container_add( GTK_CONTAINER(m_widget), m_mainWidget );
 

+    GTK_PIZZA(m_mainWidget)->m_width = m_width;
+        

     if (m_miniEdge == 0) // wxMiniFrame has its own version.
     {
        // For m_mainWidget themes
     if (m_miniEdge == 0) // wxMiniFrame has its own version.
     {
        // For m_mainWidget themes


@@ -852,6 +859,9 @@ void wxTopLevelWindowGTK::DoSetSize( int x, int y, int width, int height, int si
     }
     if (width != -1) m_width = width;
     if (height != -1) m_height = height;
     }
     if (width != -1) m_width = width;
     if (height != -1) m_height = height;

+    
+    if (m_mainWidget)
+        GTK_PIZZA(m_mainWidget)->m_width = m_width;

 
 /*
     if ((sizeFlags & wxSIZE_AUTO_WIDTH) == wxSIZE_AUTO_WIDTH)
 
 /*
     if ((sizeFlags & wxSIZE_AUTO_WIDTH) == wxSIZE_AUTO_WIDTH)


@@ -1024,6 +1034,7 @@ void wxTopLevelWindowGTK::GtkOnSize()
         if (client_h < 0)
             client_h = 0;
 
         if (client_h < 0)
             client_h = 0;
 

+        // Let the parent perform the resize

         gtk_pizza_set_size( GTK_PIZZA(m_mainWidget),
                               m_wxwindow,
                               client_x, client_y, client_w, client_h );
         gtk_pizza_set_size( GTK_PIZZA(m_mainWidget),
                               m_wxwindow,
                               client_x, client_y, client_w, client_h );