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

reset m_selection in DeleteAllPages() (patch 1922215); some cleanup of DoRemovePage() in trunk

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53045 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-04-06 15:14:25 +00:00
parent 6c75df8784
commit 4922c5f0dd
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/generic/choicbkg.cpp
View File

@@ -259,28 +259,28 @@ wxChoicebook::InsertPage(size_t n,
wxWindow *wxChoicebook::DoRemovePage(size_t page) wxWindow *wxChoicebook::DoRemovePage(size_t page)
{ {
const size_t page_count = GetPageCount();
wxWindow *win = wxBookCtrlBase::DoRemovePage(page); wxWindow *win = wxBookCtrlBase::DoRemovePage(page);
if ( win ) if ( win )
{ {
GetChoiceCtrl()->Delete(page); GetChoiceCtrl()->Delete(page);
if (m_selection >= (int)page) if ( m_selection >= (int)page )
{ {
// force new sel valid if possible // ensure that the selection is valid
int sel = m_selection - 1; int sel;
if (page_count == 1) if ( GetPageCount() == 0 )
sel = wxNOT_FOUND; sel = wxNOT_FOUND;
else if ((page_count == 2) || (sel == -1)) else
sel = 0; sel = m_selection ? m_selection - 1 : 0;
// force sel invalid if deleting current page - don't try to hide it // if deleting current page we shouldn't try to hide it
m_selection = (m_selection == (int)page) ? wxNOT_FOUND : m_selection - 1; m_selection = m_selection == (int)page ? wxNOT_FOUND
: m_selection - 1;
if ((sel != wxNOT_FOUND) && (sel != m_selection)) if ( sel != wxNOT_FOUND && sel != m_selection )
SetSelection(sel); SetSelection(sel);
} }
} }
return win; return win;
@@ -289,6 +289,7 @@ wxWindow *wxChoicebook::DoRemovePage(size_t page)
bool wxChoicebook::DeleteAllPages() bool wxChoicebook::DeleteAllPages()
{ {
m_selection = wxNOT_FOUND;
GetChoiceCtrl()->Clear(); GetChoiceCtrl()->Clear();
return wxBookCtrlBase::DeleteAllPages(); return wxBookCtrlBase::DeleteAllPages();
} }