X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/deb325e3b21d956705214520b172ae8bf898a1ae..9b49405777342458dc1666001865eef7309b6c30:/src/generic/listbkg.cpp diff --git a/src/generic/listbkg.cpp b/src/generic/listbkg.cpp index a9498bdf3c..855c1c71a4 100644 --- a/src/generic/listbkg.cpp +++ b/src/generic/listbkg.cpp @@ -36,6 +36,12 @@ #include "wx/statline.h" #include "wx/imaglist.h" +// FIXME: native OS X wxListCtrl hangs if this code is used for it so disable +// it for now +#if !defined(__WXMAC__) + #define CAN_USE_REPORT_VIEW +#endif + // ---------------------------------------------------------------------------- // various wxWidgets macros // ---------------------------------------------------------------------------- @@ -48,17 +54,13 @@ // ---------------------------------------------------------------------------- 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(); +wxDEFINE_EVENT( wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING, wxBookCtrlEvent ); +wxDEFINE_EVENT( wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED, wxBookCtrlEvent ); 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() // ============================================================================ @@ -103,13 +105,21 @@ wxListbook::Create(wxWindow *parent, 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 | +#ifdef CAN_USE_REPORT_VIEW + GetListCtrlReportViewFlags() +#else // !CAN_USE_REPORT_VIEW + GetListCtrlIconViewFlags() +#endif // CAN_USE_REPORT_VIEW/!CAN_USE_REPORT_VIEW ); +#ifdef CAN_USE_REPORT_VIEW + GetListView()->InsertColumn(0, wxT("Pages")); +#endif // CAN_USE_REPORT_VIEW + #ifdef __WXMSW__ // On XP with themes enabled the GetViewRect used in GetControllerSize() to // determine the space needed for the list view will incorrectly return @@ -123,6 +133,24 @@ wxListbook::Create(wxWindow *parent, return true; } +// ---------------------------------------------------------------------------- +// wxListCtrl flags +// ---------------------------------------------------------------------------- + +long wxListbook::GetListCtrlIconViewFlags() const +{ + return (IsVertical() ? wxLC_ALIGN_LEFT : wxLC_ALIGN_TOP) | wxLC_ICON; +} + +#ifdef CAN_USE_REPORT_VIEW + +long wxListbook::GetListCtrlReportViewFlags() const +{ + return wxLC_REPORT | wxLC_NO_HEADER; +} + +#endif // CAN_USE_REPORT_VIEW + // ---------------------------------------------------------------------------- // wxListbook geometry management // ---------------------------------------------------------------------------- @@ -156,9 +184,11 @@ void wxListbook::OnSize(wxSizeEvent& event) // under MSW, we'd finish with an ugly looking list control with both // vertical and horizontal scrollbar (with one of them being added because // the other one is not accounted for in client size computations) - wxListView *list = GetListView(); - if (list) list->Arrange(); - wxBookCtrlBase::OnSize(event); + wxListView * const list = GetListView(); + if ( list ) + list->Arrange(); + + event.Skip(); } int wxListbook::HitTest(const wxPoint& pt, long *flags) const @@ -218,6 +248,13 @@ wxSize wxListbook::CalcSizeFromPage(const wxSize& sizePage) const return size; } +void wxListbook::UpdateSize() +{ + // we should find a more elegant way to force a layout than generating this + // dummy event + wxSizeEvent sz(GetSize(), GetId()); + GetEventHandler()->ProcessEvent(sz); +} // ---------------------------------------------------------------------------- // accessing the pages @@ -235,11 +272,19 @@ wxString wxListbook::GetPageText(size_t n) const 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) @@ -253,7 +298,57 @@ bool wxListbook::SetPageImage(size_t n, int imageId) void wxListbook::SetImageList(wxImageList *imageList) { - GetListView()->SetImageList(imageList, wxIMAGE_LIST_NORMAL); + wxListView * const list = GetListView(); + +#ifdef CAN_USE_REPORT_VIEW + // 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 ) + { + style |= GetListCtrlIconViewFlags(); + } + else // no image list + { + style |= GetListCtrlReportViewFlags(); + } + + list->SetWindowStyleFlag(style); + if ( !imageList ) + 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); +#endif // CAN_USE_REPORT_VIEW wxBookCtrlBase::SetImageList(imageList); } @@ -274,12 +369,12 @@ int wxListbook::GetSelection() const return m_selection; } -wxBookCtrlBaseEvent* wxListbook::CreatePageChangingEvent() const +wxBookCtrlEvent* wxListbook::CreatePageChangingEvent() const { - return new wxListbookEvent(wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING, m_windowId); + return new wxBookCtrlEvent(wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING, m_windowId); } -void wxListbook::MakeChangedEvent(wxBookCtrlBaseEvent &event) +void wxListbook::MakeChangedEvent(wxBookCtrlEvent &event) { event.SetEventType(wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED); } @@ -325,15 +420,8 @@ wxListbook::InsertPage(size_t n, if ( selNew != -1 ) SetSelection(selNew); - InvalidateBestSize(); - // GetListView()->InvalidateBestSize(); - GetListView()->Arrange(); + UpdateSize(); - if (GetPageCount() == 1) - { - wxSizeEvent sz(GetSize(), GetId()); - ProcessEvent(sz); - } return true; } @@ -363,11 +451,7 @@ wxWindow *wxListbook::DoRemovePage(size_t page) } GetListView()->Arrange(); - if (GetPageCount() == 0) - { - wxSizeEvent sz(GetSize(), GetId()); - ProcessEvent(sz); - } + UpdateSize(); } return win; @@ -382,8 +466,7 @@ bool wxListbook::DeleteAllPages() m_selection = -1; - wxSizeEvent sz(GetSize(), GetId()); - ProcessEvent(sz); + UpdateSize(); return true; } @@ -394,6 +477,12 @@ bool wxListbook::DeleteAllPages() void wxListbook::OnListSelected(wxListEvent& eventList) { + if ( eventList.GetEventObject() != m_bookctrl ) + { + eventList.Skip(); + return; + } + const int selNew = eventList.GetIndex(); if ( selNew == m_selection )