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

change the selection appropriately (and refresh it as needed) after deleting a notebook page

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16533 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-08-16 00:48:45 +00:00
parent 5c36387841
commit df7145da50
2 changed files with 23 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/msw/notebook.h
View File

@@ -89,8 +89,6 @@ public:
// operations // operations
// ---------- // ----------
// remove one page from the notebook
bool DeletePage(int nPage);
// remove all pages // remove all pages
bool DeleteAllPages(); bool DeleteAllPages();
// adds a new page to the notebook (it will be deleted ny the notebook, // adds a new page to the notebook (it will be deleted ny the notebook,

59
src/msw/notebook.cpp
View File

@@ -304,48 +304,35 @@ void wxNotebook::SetTabSize(const wxSize& sz)
// wxNotebook operations // wxNotebook operations
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// remove one page from the notebook
bool wxNotebook::DeletePage(int nPage)
{
wxCHECK_MSG( IS_VALID_PAGE(nPage), FALSE, wxT("notebook page out of range") );
if ( m_nSelection == nPage ) {
// advance selection backwards - the page being deleted shouldn't be left
// selected
AdvanceSelection(FALSE);
}
TabCtrl_DeleteItem(m_hwnd, nPage);
delete m_pages[nPage];
m_pages.RemoveAt(nPage);
if ( m_pages.IsEmpty() ) {
// no selection if the notebook became empty
m_nSelection = -1;
}
else
m_nSelection = TabCtrl_GetCurSel(m_hwnd);
return TRUE;
}
// remove one page from the notebook, without deleting // remove one page from the notebook, without deleting
wxNotebookPage *wxNotebook::DoRemovePage(int nPage) wxNotebookPage *wxNotebook::DoRemovePage(int nPage)
{ {
wxNotebookPage *pageRemoved = wxNotebookBase::DoRemovePage(nPage); wxNotebookPage *pageRemoved = wxNotebookBase::DoRemovePage(nPage);
if ( !pageRemoved ) if ( !pageRemoved )
return NULL; return NULL;
TabCtrl_DeleteItem(m_hwnd, nPage); TabCtrl_DeleteItem(m_hwnd, nPage);
if ( m_pages.IsEmpty() ) if ( m_pages.IsEmpty() )
m_nSelection = -1; {
else // no selection any more, the notebook becamse empty
m_nSelection = TabCtrl_GetCurSel(m_hwnd); m_nSelection = -1;
}
else // notebook still not empty
{
// refresh the selected page and change it if it became invalid
if ( m_nSelection == GetPageCount() )
{
m_nSelection--;
}
return pageRemoved; // force ChangePage() to really do something
int sel = m_nSelection;
m_nSelection = -1;
SetSelection(sel);
}
return pageRemoved;
} }
// remove all pages // remove all pages