Applied patch [ 743471 ] wxSplitter::Unsplit fix

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

diff --git a/src/generic/splitter.cpp b/src/generic/splitter.cpp
index f9860b78752ac55e6330d8058b056592d1ce8879..98b0c13ce35d9d438a0b3e237fd2e3bd43f6e75a 100644 (file)
--- a/src/generic/splitter.cpp
+++ b/src/generic/splitter.cpp
@@ -253,6 +253,9 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
                 m_windowOne = m_windowTwo;
                 m_windowTwo = (wxWindow *) NULL;
                 OnUnsplit(removedWindow);
                 m_windowOne = m_windowTwo;
                 m_windowTwo = (wxWindow *) NULL;
                 OnUnsplit(removedWindow);

+                wxSplitterEvent event(wxEVT_COMMAND_SPLITTER_UNSPLIT, this);
+                event.m_data.win = removedWindow;
+                (void)DoSendEvent(event);

                 SetSashPositionAndNotify(0);
             }
             else if ( posSashNew == GetWindowSize() )
                 SetSashPositionAndNotify(0);
             }
             else if ( posSashNew == GetWindowSize() )


@@ -261,6 +264,9 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
                 wxWindow *removedWindow = m_windowTwo;
                 m_windowTwo = (wxWindow *) NULL;
                 OnUnsplit(removedWindow);
                 wxWindow *removedWindow = m_windowTwo;
                 m_windowTwo = (wxWindow *) NULL;
                 OnUnsplit(removedWindow);

+                wxSplitterEvent event(wxEVT_COMMAND_SPLITTER_UNSPLIT, this);
+                event.m_data.win = removedWindow;
+                (void)DoSendEvent(event);

                 SetSashPositionAndNotify(0);
             }
             else
                 SetSashPositionAndNotify(0);
             }
             else


@@ -878,7 +884,7 @@ bool wxSplitterWindow::Unsplit(wxWindow *toRemove)
         return FALSE;
     }
 
         return FALSE;
     }
 

-    win->Show(FALSE);
+    OnUnsplit(win);

     DoSetSashPosition(0);
     SizeWindows();
 
     DoSetSashPosition(0);
     SizeWindows();
 


@@ -1059,8 +1065,12 @@ void wxSplitterWindow::OnDoubleClickSash(int x, int y)
         if ( GetMinimumPaneSize() == 0 || m_permitUnsplitAlways )
         {
             wxWindow* win = m_windowTwo;
         if ( GetMinimumPaneSize() == 0 || m_permitUnsplitAlways )
         {
             wxWindow* win = m_windowTwo;

-            if (Unsplit(win))
-                OnUnsplit(win);
+            if ( Unsplit(win) )
+            {
+                wxSplitterEvent unsplitEvent(wxEVT_COMMAND_SPLITTER_UNSPLIT, this);
+                unsplitEvent.m_data.win = win;
+                (void)DoSendEvent(unsplitEvent);
+            }

         }
     }
     //else: blocked by user
         }
     }
     //else: blocked by user


@@ -1068,13 +1078,8 @@ void wxSplitterWindow::OnDoubleClickSash(int x, int y)
 
 void wxSplitterWindow::OnUnsplit(wxWindow *winRemoved)
 {
 
 void wxSplitterWindow::OnUnsplit(wxWindow *winRemoved)
 {

-    // do it before calling the event handler which may delete the window
+    // call this before calling the event handler which may delete the window

     winRemoved->Show(FALSE);
     winRemoved->Show(FALSE);

-
-    wxSplitterEvent event(wxEVT_COMMAND_SPLITTER_UNSPLIT, this);
-    event.m_data.win = winRemoved;
-
-    (void)DoSendEvent(event);

 }
 
 #if defined( __WXMSW__ ) || defined( __WXMAC__)
 }
 
 #if defined( __WXMSW__ ) || defined( __WXMAC__)