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

fix crash with repeated split horizontal/vertical and replace window, #11002

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61458 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2009-07-18 22:46:26 +00:00
parent 461cd115f2
commit 52ada3cdeb
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
samples/splitter/splitter.cpp
View File

@@ -286,14 +286,13 @@ MyFrame::MyFrame()
SetStatusText(_T("Min pane size = 0"), 1);
#endif // wxUSE_STATUSBAR
m_replacewindow = (wxWindow *)0;
m_replacewindow = NULL;
}
MyFrame::~MyFrame()
{
if (m_replacewindow) {
m_replacewindow->Destroy();
m_replacewindow = (wxWindow *)0;
}
}
@@ -311,6 +310,7 @@ void MyFrame::OnSplitHorizontal(wxCommandEvent& WXUNUSED(event) )
m_left->Show(true);
m_right->Show(true);
m_splitter->SplitHorizontally( m_left, m_right );
m_replacewindow = NULL;
#if wxUSE_STATUSBAR
SetStatusText(_T("Splitter split horizontally"), 1);
@@ -324,6 +324,7 @@ void MyFrame::OnSplitVertical(wxCommandEvent& WXUNUSED(event) )
m_left->Show(true);
m_right->Show(true);
m_splitter->SplitVertically( m_left, m_right );
m_replacewindow = NULL;
#if wxUSE_STATUSBAR
SetStatusText(_T("Splitter split vertically"), 1);
@@ -415,15 +416,16 @@ void MyFrame::OnSetGravity(wxCommandEvent& WXUNUSED(event) )
void MyFrame::OnReplace(wxCommandEvent& WXUNUSED(event) )
{
if (m_replacewindow == 0) {
if (m_replacewindow == NULL) {
m_replacewindow = m_splitter->GetWindow2();
m_splitter->ReplaceWindow(m_replacewindow, new wxPanel(m_splitter, wxID_ANY));
m_replacewindow->Hide();
} else {
wxWindow *empty = m_splitter->GetWindow2();
wxASSERT(empty != m_replacewindow);
m_splitter->ReplaceWindow(empty, m_replacewindow);
m_replacewindow->Show();
m_replacewindow = 0;
m_replacewindow = NULL;
empty->Destroy();
}
}