// various wxWidgets macros
// ----------------------------------------------------------------------------
+// check that the page index is valid
+#define IS_VALID_PAGE(nPage) ((nPage) < GetPageCount())
+
+// ----------------------------------------------------------------------------
+// event table
+// ----------------------------------------------------------------------------
+
IMPLEMENT_DYNAMIC_CLASS(wxChoicebook, wxControl)
IMPLEMENT_DYNAMIC_CLASS(wxChoicebookEvent, wxNotifyEvent)
const wxEventType wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED = wxNewEventType();
const int wxID_CHOICEBOOKCHOICE = wxNewId();
-BEGIN_EVENT_TABLE(wxChoicebook, wxBookCtrl)
+BEGIN_EVENT_TABLE(wxChoicebook, wxBookCtrlBase)
EVT_SIZE(wxChoicebook::OnSize)
EVT_CHOICE(wxID_CHOICEBOOKCHOICE, wxChoicebook::OnChoiceSelected)
END_EVENT_TABLE()
{
const wxSize sizeChoice = m_choice->GetSize();
- wxRect rectPage(wxPoint(0, 0), GetClientSize());
+ wxPoint pt(0, 0);
+ wxRect rectPage(pt, GetClientSize());
switch ( GetWindowStyle() & wxCHB_ALIGN_MASK )
{
default:
m_choice->Move(posChoice.x, posChoice.y);
m_choice->SetSize(sizeChoice.x, sizeChoice.y);
- // we should always have some selection if possible
- if ( m_selection == wxNOT_FOUND && GetPageCount() )
- {
- SetSelection(0);
- }
-
+ // resize the currently shown page
if ( m_selection != wxNOT_FOUND )
{
wxWindow *page = m_pages[m_selection];
wxCHECK_RET( page, _T("NULL page in wxChoicebook?") );
-
page->SetSize(GetPageRect());
- if ( !page->IsShown() )
- {
- page->Show();
- }
}
}
{
// TODO: can be implemented in form of static bitmap near choice control
- wxBookCtrl::SetImageList(imageList);
+ wxBookCtrlBase::SetImageList(imageList);
}
// ----------------------------------------------------------------------------
int wxChoicebook::SetSelection(size_t n)
{
- wxCHECK_MSG( n < GetPageCount(), wxNOT_FOUND,
- _T("invalid page index in wxChoicebook::SetSelection()") );
+ wxCHECK_MSG( IS_VALID_PAGE(n), wxNOT_FOUND,
+ wxT("invalid page index in wxChoicebook::SetSelection()") );
- int selOld = m_selection;
+ const int oldSel = m_selection;
- if ( (int)n != m_selection )
+ if ( int(n) != m_selection )
{
- m_choice->Select(n);
+ wxChoicebookEvent event(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING, m_windowId);
+ event.SetSelection(n);
+ event.SetOldSelection(m_selection);
+ event.SetEventObject(this);
+ if ( !GetEventHandler()->ProcessEvent(event) || event.IsAllowed() )
+ {
+ if ( m_selection != wxNOT_FOUND )
+ m_pages[m_selection]->Hide();
- // change m_selection only now, otherwise OnChoiceSelected() would ignore
- // the selection change event
+ wxWindow *page = m_pages[n];
+ page->SetSize(GetPageRect());
+ page->Show();
- if ( m_selection != wxNOT_FOUND )
- m_pages[m_selection]->Hide();
- wxWindow *page = m_pages[m_selection = n];
- page->SetSize(GetPageRect());
- page->Show();
+ // change m_selection now to ignore the selection change event
+ m_selection = n;
+ m_choice->Select(n);
+
+ // program allows the page change
+ event.SetEventType(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED);
+ (void)GetEventHandler()->ProcessEvent(event);
+ }
}
- return selOld;
+ return oldSel;
}
-
// ----------------------------------------------------------------------------
// adding/removing the pages
// ----------------------------------------------------------------------------
bool bSelect,
int imageId)
{
- if ( !wxBookCtrl::InsertPage(n, page, text, bSelect, imageId) )
+ if ( !wxBookCtrlBase::InsertPage(n, page, text, bSelect, imageId) )
return false;
m_choice->Insert(text, n);
- if ( bSelect )
+ // if the inserted page is before the selected one, we must update the
+ // index of the selected page
+ if ( int(n) <= m_selection )
{
- m_choice->Select(n);
+ // one extra page added
+ m_selection++;
+ m_choice->Select(m_selection);
}
- else // don't select this page
- {
- // it will be shown only when selected
+
+ // some page should be selected: either this one or the first one if there
+ // is still no selection
+ int selNew = -1;
+ if ( bSelect )
+ selNew = n;
+ else if ( m_selection == -1 )
+ selNew = 0;
+
+ if ( selNew != m_selection )
page->Hide();
- }
+
+ if ( selNew != -1 )
+ SetSelection(selNew);
InvalidateBestSize();
return true;
wxWindow *wxChoicebook::DoRemovePage(size_t page)
{
- wxWindow *win = wxBookCtrl::DoRemovePage(page);
+ const int page_count = GetPageCount();
+ wxWindow *win = wxBookCtrlBase::DoRemovePage(page);
+
if ( win )
{
m_choice->Delete(page);
+
+ if (m_selection >= (int)page)
+ {
+ // force new sel valid if possible
+ int sel = m_selection - 1;
+ if (page_count == 1)
+ sel = wxNOT_FOUND;
+ else if ((page_count == 2) || (sel == -1))
+ sel = 0;
+
+ // force sel invalid if deleting current page - don't try to hide it
+ m_selection = (m_selection == (int)page) ? wxNOT_FOUND : m_selection - 1;
+
+ if ((sel != wxNOT_FOUND) && (sel != m_selection))
+ SetSelection(sel);
+ }
}
return win;
bool wxChoicebook::DeleteAllPages()
{
m_choice->Clear();
- return wxBookCtrl::DeleteAllPages();
+ return wxBookCtrlBase::DeleteAllPages();
}
// ----------------------------------------------------------------------------
return;
}
- // first send "change in progress" event which may be vetoed by user
- wxChoicebookEvent eventIng(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING, GetId());
+ SetSelection(selNew);
- eventIng.SetEventObject(this);
- eventIng.SetSelection(selNew);
- eventIng.SetOldSelection(m_selection);
- if ( GetEventHandler()->ProcessEvent(eventIng) && !eventIng.IsAllowed() )
- {
+ // change wasn't allowed, return to previous state
+ if (m_selection != selNew)
m_choice->Select(m_selection);
- return;
- }
-
- // change allowed: do change the page and notify the user about it
- if ( m_selection != wxNOT_FOUND )
- m_pages[m_selection]->Hide();
- wxWindow *page = m_pages[m_selection = selNew];
- page->SetSize(GetPageRect());
- page->Show();
-
- wxChoicebookEvent eventEd(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED, GetId());
-
- eventEd.SetEventObject(this);
- eventEd.SetSelection(selNew);
- eventEd.SetOldSelection(m_selection);
-
- (void)GetEventHandler()->ProcessEvent(eventEd);
}
#endif // wxUSE_CHOICEBOOK
projects / wxWidgets.git / blobdiff