wxSplitterWindow::ReplaceWindow() function added and documented
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1666 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -587,22 +587,17 @@ bool wxSplitterWindow::Unsplit(wxWindow *toRemove)
|
||||
if ( ! IsSplit() )
|
||||
return FALSE;
|
||||
|
||||
wxWindow *win = NULL;
|
||||
if ( toRemove == NULL || toRemove == m_windowTwo)
|
||||
{
|
||||
wxWindow *win = m_windowTwo ;
|
||||
win = m_windowTwo ;
|
||||
m_windowTwo = (wxWindow *) NULL;
|
||||
OnUnsplit(win);
|
||||
m_sashPosition = 0;
|
||||
SizeWindows();
|
||||
}
|
||||
else if ( toRemove == m_windowOne )
|
||||
{
|
||||
wxWindow *win = m_windowOne ;
|
||||
win = m_windowOne ;
|
||||
m_windowOne = m_windowTwo;
|
||||
m_windowTwo = (wxWindow *) NULL;
|
||||
OnUnsplit(win);
|
||||
m_sashPosition = 0;
|
||||
SizeWindows();
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -611,6 +606,36 @@ bool wxSplitterWindow::Unsplit(wxWindow *toRemove)
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
OnUnsplit(win);
|
||||
m_sashPosition = 0;
|
||||
SizeWindows();
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
// Replace a window with another one
|
||||
bool wxSplitterWindow::ReplaceWindow(wxWindow *winOld, wxWindow *winNew)
|
||||
{
|
||||
wxCHECK_MSG( winOld, FALSE, "use one of Split() functions instead" );
|
||||
wxCHECK_MSG( winNew, FALSE, "use Unsplit() functions instead" );
|
||||
|
||||
if ( winOld == m_windowTwo )
|
||||
{
|
||||
m_windowTwo = winNew;
|
||||
}
|
||||
else if ( winOld == m_windowOne )
|
||||
{
|
||||
m_windowOne = winNew;
|
||||
}
|
||||
else
|
||||
{
|
||||
wxFAIL_MSG("splitter: attempt to replace a non-existent window");
|
||||
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
SizeWindows();
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user