reset m_sashPosition to 0 after calling OnUnsplit(), not before

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

diff --git a/src/generic/splitter.cpp b/src/generic/splitter.cpp
index b3591976b0bb36ade17e8d0626c7036ecca9e749..9486d9425e39f41bcb15e1b8fd658a7fe53d53db 100644 (file)
--- a/src/generic/splitter.cpp
+++ b/src/generic/splitter.cpp
@@ -165,7 +165,7 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
         // We can stop dragging now and see what we've got.
         m_dragMode = wxSPLIT_DRAG_NONE;
         ReleaseMouse();
         // We can stop dragging now and see what we've got.
         m_dragMode = wxSPLIT_DRAG_NONE;
         ReleaseMouse();

-       
+

         // Erase old tracker
         DrawSashTracker(m_oldX, m_oldY);
 
         // Erase old tracker
         DrawSashTracker(m_oldX, m_oldY);
 


@@ -255,7 +255,7 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
 
         // Draw new one
         DrawSashTracker(x, y);
 
         // Draw new one
         DrawSashTracker(x, y);

-           
+

         m_oldX = x;
         m_oldY = y;
     }
         m_oldX = x;
         m_oldY = y;
     }


@@ -591,8 +591,8 @@ bool wxSplitterWindow::Unsplit(wxWindow *toRemove)
     {
         wxWindow *win = m_windowTwo ;
         m_windowTwo = (wxWindow *) NULL;
     {
         wxWindow *win = m_windowTwo ;
         m_windowTwo = (wxWindow *) NULL;

-        m_sashPosition = 0;

         OnUnsplit(win);
         OnUnsplit(win);

+        m_sashPosition = 0;

         SizeWindows();
     }
     else if ( toRemove == m_windowOne )
         SizeWindows();
     }
     else if ( toRemove == m_windowOne )


@@ -600,12 +600,16 @@ bool wxSplitterWindow::Unsplit(wxWindow *toRemove)
         wxWindow *win = m_windowOne ;
         m_windowOne = m_windowTwo;
         m_windowTwo = (wxWindow *) NULL;
         wxWindow *win = m_windowOne ;
         m_windowOne = m_windowTwo;
         m_windowTwo = (wxWindow *) NULL;

-        m_sashPosition = 0;

         OnUnsplit(win);
         OnUnsplit(win);

+        m_sashPosition = 0;

         SizeWindows();
     }
     else
         SizeWindows();
     }
     else

+    {
+        wxFAIL_MSG("splitter: attempt to remove a non-existent window");
+

         return FALSE;
         return FALSE;

+    }

 
     return TRUE;
 }
 
     return TRUE;
 }