IMPLEMENT_DYNAMIC_CLASS(wxListbook, wxBookCtrlBase)
IMPLEMENT_DYNAMIC_CLASS(wxListbookEvent, wxNotifyEvent)
-#if !WXWIN_COMPATIBILITY_EVENT_TYPES
const wxEventType wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING = wxNewEventType();
const wxEventType wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED = wxNewEventType();
-#endif
-const int wxID_LISTBOOKLISTVIEW = wxNewId();
BEGIN_EVENT_TABLE(wxListbook, wxBookCtrlBase)
EVT_SIZE(wxListbook::OnSize)
- EVT_LIST_ITEM_SELECTED(wxID_LISTBOOKLISTVIEW, wxListbook::OnListSelected)
+ EVT_LIST_ITEM_SELECTED(wxID_ANY, wxListbook::OnListSelected)
END_EVENT_TABLE()
// ============================================================================
m_bookctrl = new wxListView
(
this,
- wxID_LISTBOOKLISTVIEW,
+ wxID_ANY,
wxDefaultPosition,
wxDefaultSize,
- wxLC_ICON | wxLC_SINGLE_SEL |
- (IsVertical() ? wxLC_ALIGN_LEFT : wxLC_ALIGN_TOP)
+ wxLC_SINGLE_SEL | wxLC_REPORT | wxLC_NO_HEADER
);
+ GetListView()->InsertColumn(0, wxT("Pages"));
+
#ifdef __WXMSW__
// On XP with themes enabled the GetViewRect used in GetControllerSize() to
// determine the space needed for the list view will incorrectly return
const wxPoint listPt = list->ScreenToClient(ClientToScreen(pt));
// is the point inside list control?
- if ( wxRect(list->GetSize()).Inside(listPt) )
+ if ( wxRect(list->GetSize()).Contains(listPt) )
{
int flagsList;
pagePos = list->HitTest(listPt, flagsList);
}
else // not over list control at all
{
- if ( flags && GetPageRect().Inside(pt) )
+ if ( flags && GetPageRect().Contains(pt) )
*flags |= wxBK_HITTEST_ONPAGE;
}
return GetListView()->GetItemText(n);
}
-int wxListbook::GetPageImage(size_t WXUNUSED(n)) const
+int wxListbook::GetPageImage(size_t n) const
{
- wxFAIL_MSG( _T("wxListbook::GetPageImage() not implemented") );
+ wxListItem item;
+ item.SetId(n);
- return wxNOT_FOUND;
+ if (GetListView()->GetItem(item))
+ {
+ return item.GetImage();
+ }
+ else
+ {
+ return wxNOT_FOUND;
+ }
}
bool wxListbook::SetPageImage(size_t n, int imageId)
void wxListbook::SetImageList(wxImageList *imageList)
{
- GetListView()->SetImageList(imageList, wxIMAGE_LIST_NORMAL);
+ wxListView * const list = GetListView();
+
+ // If imageList presence has changed, we update the list control view
+ if ( (imageList != NULL) != (GetImageList() != NULL) )
+ {
+ wxArrayString labels;
+ labels.Alloc(GetPageCount());
+
+ wxArrayInt imageIds;
+ imageIds.Alloc(GetPageCount());
+
+ const int oldSel = GetSelection();
+ size_t i;
+
+ // Grab snapshot of all list control items before changing the window
+ // style (which deletes the items)
+ for ( i = 0; i < GetPageCount(); i++ )
+ {
+ labels.Add(GetPageText(i));
+ imageIds.Add(GetPageImage(i));
+ }
+
+ // Update the style to use icon view for images, report view otherwise
+ long style = wxLC_SINGLE_SEL;
+ if ( imageList )
+ {
+ list->SetWindowStyleFlag(style |
+ (IsVertical() ? wxLC_ALIGN_LEFT
+ : wxLC_ALIGN_TOP) |
+ wxLC_ICON);
+ }
+ else // no image list
+ {
+ list->SetWindowStyleFlag(style | wxLC_REPORT | wxLC_NO_HEADER);
+ list->InsertColumn(0, wxT("Pages"));
+ }
+
+ // Add back the list control items
+ for ( i = 0; i < GetPageCount(); i++ )
+ {
+ list->InsertItem(i, labels[i], imageIds[i]);
+ }
+
+ // Restore selection
+ if ( oldSel != wxNOT_FOUND )
+ SetSelection(oldSel);
+ }
+
+ list->SetImageList(imageList, wxIMAGE_LIST_NORMAL);
wxBookCtrlBase::SetImageList(imageList);
}
// selection
// ----------------------------------------------------------------------------
+void wxListbook::UpdateSelectedPage(size_t newsel)
+{
+ m_selection = newsel;
+ GetListView()->Select(newsel);
+ GetListView()->Focus(newsel);
+}
+
int wxListbook::GetSelection() const
{
return m_selection;
}
-int wxListbook::SetSelection(size_t n)
+wxBookCtrlBaseEvent* wxListbook::CreatePageChangingEvent() const
{
- wxCHECK_MSG( IS_VALID_PAGE(n), wxNOT_FOUND,
- wxT("invalid page index in wxListbook::SetSelection()") );
-
- const int oldSel = m_selection;
-
- if ( int(n) != m_selection )
- {
- 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 now to ignore the selection change event
- m_selection = n;
- GetListView()->Select(n);
- GetListView()->Focus(n);
-
- // program allows the page change
- event.SetEventType(wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED);
- (void)GetEventHandler()->ProcessEvent(event);
- }
- }
+ return new wxListbookEvent(wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING, m_windowId);
+}
- return oldSel;
+void wxListbook::MakeChangedEvent(wxBookCtrlBaseEvent &event)
+{
+ event.SetEventType(wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED);
}
+
// ----------------------------------------------------------------------------
// adding/removing the pages
// ----------------------------------------------------------------------------
if ( selNew != -1 )
SetSelection(selNew);
- InvalidateBestSize();
- // GetListView()->InvalidateBestSize();
- GetListView()->Arrange();
-
- if (GetPageCount() == 1)
- {
- wxSizeEvent sz(GetSize(), GetId());
- ProcessEvent(sz);
- }
+ wxSizeEvent sz(GetSize(), GetId());
+ GetEventHandler()->ProcessEvent(sz);
+
return true;
}
if (GetPageCount() == 0)
{
wxSizeEvent sz(GetSize(), GetId());
- ProcessEvent(sz);
+ GetEventHandler()->ProcessEvent(sz);
}
}
m_selection = -1;
wxSizeEvent sz(GetSize(), GetId());
- ProcessEvent(sz);
+ GetEventHandler()->ProcessEvent(sz);
return true;
}
void wxListbook::OnListSelected(wxListEvent& eventList)
{
+ if ( eventList.GetEventObject() != m_bookctrl )
+ {
+ eventList.Skip();
+ return;
+ }
+
const int selNew = eventList.GetIndex();
if ( selNew == m_selection )
projects / wxWidgets.git / blobdiff