Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Applied patch [ 743471 ] wxSplitter::Unsplit fix

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20804 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2003-06-01 13:19:56 +00:00
parent 32923e21c7
commit 0e4cfcdd77
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/generic/splitter.cpp
View File

@@ -253,6 +253,9 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
m_windowOne = m_windowTwo; m_windowOne = m_windowTwo;
m_windowTwo = (wxWindow *) NULL; m_windowTwo = (wxWindow *) NULL;
OnUnsplit(removedWindow); OnUnsplit(removedWindow);
wxSplitterEvent event(wxEVT_COMMAND_SPLITTER_UNSPLIT, this);
event.m_data.win = removedWindow;
(void)DoSendEvent(event);
SetSashPositionAndNotify(0); SetSashPositionAndNotify(0);
} }
else if ( posSashNew == GetWindowSize() ) else if ( posSashNew == GetWindowSize() )
@@ -261,6 +264,9 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
wxWindow *removedWindow = m_windowTwo; wxWindow *removedWindow = m_windowTwo;
m_windowTwo = (wxWindow *) NULL; m_windowTwo = (wxWindow *) NULL;
OnUnsplit(removedWindow); OnUnsplit(removedWindow);
wxSplitterEvent event(wxEVT_COMMAND_SPLITTER_UNSPLIT, this);
event.m_data.win = removedWindow;
(void)DoSendEvent(event);
SetSashPositionAndNotify(0); SetSashPositionAndNotify(0);
} }
else else
@@ -878,7 +884,7 @@ bool wxSplitterWindow::Unsplit(wxWindow *toRemove)
return FALSE; return FALSE;
} }
win->Show(FALSE); OnUnsplit(win);
DoSetSashPosition(0); DoSetSashPosition(0);
SizeWindows(); SizeWindows();
@@ -1059,8 +1065,12 @@ void wxSplitterWindow::OnDoubleClickSash(int x, int y)
if ( GetMinimumPaneSize() == 0 || m_permitUnsplitAlways ) if ( GetMinimumPaneSize() == 0 || m_permitUnsplitAlways )
{ {
wxWindow* win = m_windowTwo; wxWindow* win = m_windowTwo;
if (Unsplit(win)) if ( Unsplit(win) )
OnUnsplit(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__)