Applied [ 1223134 ] [wxMSW] Proper repainting when resizing - take 2, part 2

Jamie Gadd
Applied [ 1223491 ] splitter sizes not initialized on wx2.6.1
Aron Pongo

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

diff --git a/src/generic/splitter.cpp b/src/generic/splitter.cpp
index 1573dd7a0481428a9469ff0a45a74d900341ceaa..9a60c67422e026f31aaadcd4c652cb8f3d882e24 100644 (file)
--- a/src/generic/splitter.cpp
+++ b/src/generic/splitter.cpp
@@ -94,6 +94,11 @@ bool wxSplitterWindow::Create(wxWindow *parent, wxWindowID id,
     if ( !wxWindow::Create(parent, id, pos, size, style, name) )
         return false;
 
     if ( !wxWindow::Create(parent, id, pos, size, style, name) )
         return false;
 

+    if (size.x >= 0)
+        m_lastSize.x = size.x;
+    if (size.y >= 0)
+        m_lastSize.y = size.y;
+    

     m_permitUnsplitAlways = (style & wxSP_PERMIT_UNSPLIT) != 0;
 
     // FIXME: with this line the background is not erased at all under GTK1,
     m_permitUnsplitAlways = (style & wxSP_PERMIT_UNSPLIT) != 0;
 
     // FIXME: with this line the background is not erased at all under GTK1,


@@ -700,8 +705,8 @@ void wxSplitterWindow::SizeWindows()
             y2 = size2;
         }
 
             y2 = size2;
         }
 

-        GetWindow1()->SetSize(border, border, w1, h1);

         GetWindow2()->SetSize(x2, y2, w2, h2);
         GetWindow2()->SetSize(x2, y2, w2, h2);

+        GetWindow1()->SetSize(border, border, w1, h1);

     }
 
     wxClientDC dc(this);
     }
 
     wxClientDC dc(this);