APplied patch [ 705301 ] Don't send event for wxSplitter::Unsplit

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

diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp
index 5312bf6dbaadd167cc076dd254a37ac4c1872234..dbcbfa37ea38e3cc23d645c200e280322a8764ed 100644 (file)
--- a/src/generic/filedlgg.cpp
+++ b/src/generic/filedlgg.cpp
@@ -1206,6 +1206,8 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent,
         mainsizer->Add( choicesizer, 0, wxEXPAND );
     }
 
         mainsizer->Add( choicesizer, 0, wxEXPAND );
     }
 

+    // FIXME - memory leaks!!
+    

     m_choice->Append( firstWildText, (void*) new wxString( firstWild ) );
     while (tokens.HasMoreTokens())
     {
     m_choice->Append( firstWildText, (void*) new wxString( firstWild ) );
     while (tokens.HasMoreTokens())
     {

diff --git a/src/generic/splitter.cpp b/src/generic/splitter.cpp
index db5c3c62d2b6c38cec44e4dcfc4311afdb427952..ecacc1f253008ff0ab15456915443d3d3e892e17 100644 (file)
--- a/src/generic/splitter.cpp
+++ b/src/generic/splitter.cpp
@@ -358,7 +358,7 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
             m_needUpdating = TRUE;
         }
     }
             m_needUpdating = TRUE;
         }
     }

-    else if ( event.LeftDClick() )
+    else if ( event.LeftDClick() && m_windowTwo )

     {
         OnDoubleClickSash(x, y);
     }
     {
         OnDoubleClickSash(x, y);
     }


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

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

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


@@ -1062,6 +1062,8 @@ int wxSplitterWindow::OnSashPositionChanging(int newSashPosition)
 // the sash if the minimum pane size is zero.
 void wxSplitterWindow::OnDoubleClickSash(int x, int y)
 {
 // the sash if the minimum pane size is zero.
 void wxSplitterWindow::OnDoubleClickSash(int x, int y)
 {

+    wxCHECK_RET(m_windowTwo, wxT("splitter: no window to remove"));
+

     // new code should handle events instead of using the virtual functions
     wxSplitterEvent event(wxEVT_COMMAND_SPLITTER_DOUBLECLICKED, this);
     event.m_data.pt.x = x;
     // new code should handle events instead of using the virtual functions
     wxSplitterEvent event(wxEVT_COMMAND_SPLITTER_DOUBLECLICKED, this);
     event.m_data.pt.x = x;


@@ -1070,7 +1072,9 @@ void wxSplitterWindow::OnDoubleClickSash(int x, int y)
     {
         if ( GetMinimumPaneSize() == 0 || m_permitUnsplitAlways )
         {
     {
         if ( GetMinimumPaneSize() == 0 || m_permitUnsplitAlways )
         {

-            Unsplit();
+            wxWindow* win = m_windowTwo;
+            if (Unsplit(win))
+                OnUnsplit(win);

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