// various wxWidgets macros
// ----------------------------------------------------------------------------
+// check that the page index is valid
+#define IS_VALID_PAGE(nPage) ((nPage) < GetPageCount())
+
+// ----------------------------------------------------------------------------
+// event table
+// ----------------------------------------------------------------------------
+
IMPLEMENT_DYNAMIC_CLASS(wxListbook, wxControl)
IMPLEMENT_DYNAMIC_CLASS(wxListbookEvent, wxNotifyEvent)
const wxEventType wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED = wxNewEventType();
const int wxID_LISTBOOKLISTVIEW = wxNewId();
-BEGIN_EVENT_TABLE(wxListbook, wxBookCtrl)
+BEGIN_EVENT_TABLE(wxListbook, wxBookCtrlBase)
EVT_SIZE(wxListbook::OnSize)
EVT_LIST_ITEM_SELECTED(wxID_LISTBOOKLISTVIEW, wxListbook::OnListSelected)
END_EVENT_TABLE()
#ifdef __WXMSW__
// On XP with themes enabled the GetViewRect used in GetListSize to
// determine the space needed for the list view will incorrectly return
- // (0,0,0,0) the first time. So send a pending event so OnSize wiull be
+ // (0,0,0,0) the first time. So send a pending event so OnSize will be
// called again after the window is ready to go. Technically we don't
// need to do this on non-XP windows, but if things are already sized
// correctly then nothing changes and so there is no harm.
{
const wxSize sizeList = m_list->GetSize();
- wxRect rectPage(wxPoint(0, 0), GetClientSize());
+ wxPoint pt;
+ wxRect rectPage(pt, GetClientSize());
switch ( GetWindowStyle() & wxLB_ALIGN_MASK )
{
default:
#if wxUSE_LINE_IN_LISTBOOK
if ( m_line )
{
- wxRect rectLine(wxPoint(0, 0), sizeClient);
+ wxRect rectLine(sizeClient);
switch ( GetWindowStyle() & wxLB_ALIGN_MASK )
{
bool wxListbook::SetPageImage(size_t n, int imageId)
{
- return m_list->SetItemImage(n, imageId, imageId);
+ return m_list->SetItemImage(n, imageId);
}
// ----------------------------------------------------------------------------
{
m_list->SetImageList(imageList, wxIMAGE_LIST_NORMAL);
- wxBookCtrl::SetImageList(imageList);
+ wxBookCtrlBase::SetImageList(imageList);
}
// ----------------------------------------------------------------------------
int wxListbook::SetSelection(size_t n)
{
- wxCHECK_MSG( n < GetPageCount(), wxNOT_FOUND,
- _T("invalid page index in wxListbook::SetSelection()") );
+ wxCHECK_MSG( IS_VALID_PAGE(n), wxNOT_FOUND,
+ wxT("invalid page index in wxListbook::SetSelection()") );
- const int selOld = m_selection;
+ const int oldSel = m_selection;
- if ( (int)n != m_selection )
+ if ( int(n) != m_selection )
{
- if ( m_selection != wxNOT_FOUND )
- m_pages[m_selection]->Hide();
- wxWindow *page = m_pages[n];
- page->SetSize(GetPageRect());
- page->Show();
+ wxListbookEvent event(wxEVT_COMMAND_LISTBOOK_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();
+
+ wxWindow *page = m_pages[n];
+ page->SetSize(GetPageRect());
+ page->Show();
- // change m_selection only now to ignore the selection change event
- m_selection = n;
-
- m_list->Select(n);
- m_list->Focus(n);
+ // change m_selection now to ignore the selection change event
+ m_selection = n;
+ m_list->Select(n);
+ m_list->Focus(n);
+
+ // program allows the page change
+ event.SetEventType(wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED);
+ (void)GetEventHandler()->ProcessEvent(event);
+ }
}
- return selOld;
+ return oldSel;
}
// ----------------------------------------------------------------------------
bool bSelect,
int imageId)
{
- if ( !wxBookCtrl::InsertPage(n, page, text, bSelect, imageId) )
+ if ( !wxBookCtrlBase::InsertPage(n, page, text, bSelect, imageId) )
return false;
m_list->InsertItem(n, text, imageId);
- // we should always have some selection if possible
- if ( bSelect || (m_selection == wxNOT_FOUND) )
+ // if the inserted page is before the selected one, we must update the
+ // index of the selected page
+ if ( int(n) <= m_selection )
{
- SetSelection(n);
+ // one extra page added
+ m_selection++;
+ m_list->Select(m_selection);
+ m_list->Focus(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 *wxListbook::DoRemovePage(size_t page)
{
const int page_count = GetPageCount();
- wxWindow *win = wxBookCtrl::DoRemovePage(page);
-
+ wxWindow *win = wxBookCtrlBase::DoRemovePage(page);
+
if ( win )
{
m_list->DeleteItem(page);
// force new sel valid if possible
int sel = m_selection - 1;
if (page_count == 1)
- sel = -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) ? -1 : m_selection - 1;
-
- if ((sel != -1) && (sel != m_selection))
+ m_selection = (m_selection == (int)page) ? wxNOT_FOUND : m_selection - 1;
+
+ if ((sel != wxNOT_FOUND) && (sel != m_selection))
SetSelection(sel);
}
}
bool wxListbook::DeleteAllPages()
{
m_list->DeleteAllItems();
- return wxBookCtrl::DeleteAllPages();
+ return wxBookCtrlBase::DeleteAllPages();
}
// ----------------------------------------------------------------------------
void wxListbook::OnListSelected(wxListEvent& eventList)
{
const int selNew = eventList.GetIndex();
- const int selOld = m_selection;
if ( selNew == m_selection )
{
return;
}
- // first send "change in progress" event which may be vetoed by user
- wxListbookEvent eventIng(wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING, GetId());
+ SetSelection(selNew);
- eventIng.SetEventObject(this);
- eventIng.SetSelection(selNew);
- eventIng.SetOldSelection(selOld);
- if ( GetEventHandler()->ProcessEvent(eventIng) && !eventIng.IsAllowed() )
+ // change wasn't allowed, return to previous state
+ if (m_selection != selNew)
{
m_list->Select(m_selection);
- return;
+ m_list->Focus(m_selection);
}
-
- // change allowed: do change the page and notify the user about it
- SetSelection(selNew);
-
- wxListbookEvent eventEd(wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED, GetId());
-
- eventEd.SetEventObject(this);
- eventEd.SetSelection(selNew);
- eventEd.SetOldSelection(selOld);
-
- (void)GetEventHandler()->ProcessEvent(eventEd);
}
#endif // wxUSE_LISTBOOK
projects / wxWidgets.git / blobdiff