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

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@19984 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2003-04-05 10:34:59 +00:00
parent 031febef4f
commit 9279e47404
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/generic/splitter.cpp
View File

@@ -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); DoSetSashPosition(0);
SizeWindows(); SizeWindows();
@@ -1062,6 +1062,8 @@ int wxSplitterWindow::OnSashPositionChanging(int newSashPosition)
// the sash if the minimum pane size is zero. // the sash if the minimum pane size is zero.
void wxSplitterWindow::OnDoubleClickSash(int x, int y) 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 // new code should handle events instead of using the virtual functions
wxSplitterEvent event(wxEVT_COMMAND_SPLITTER_DOUBLECLICKED, this); wxSplitterEvent event(wxEVT_COMMAND_SPLITTER_DOUBLECLICKED, this);
event.m_data.pt.x = x; 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