X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a9a56347b84be54a9d48df2cfe08ddf761aaf491..b5fe65c81983fb99a7937592a6ddda236f7dc4d0:/src/generic/listbkg.cpp?ds=sidebyside diff --git a/src/generic/listbkg.cpp b/src/generic/listbkg.cpp index 90edce65e6..f829305777 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,12 +54,9 @@ // ---------------------------------------------------------------------------- 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 +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) @@ -105,10 +108,18 @@ wxListbook::Create(wxWindow *parent, 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,31 +134,27 @@ wxListbook::Create(wxWindow *parent, } // ---------------------------------------------------------------------------- -// wxListbook geometry management +// wxListCtrl flags // ---------------------------------------------------------------------------- -wxSize wxListbook::GetControllerSize() const +long wxListbook::GetListCtrlIconViewFlags() const { - const wxSize sizeClient = GetClientSize(), - sizeBorder = m_bookctrl->GetSize() - m_bookctrl->GetClientSize(), - sizeList = GetListView()->GetViewRect().GetSize() + sizeBorder; + return (IsVertical() ? wxLC_ALIGN_LEFT : wxLC_ALIGN_TOP) | wxLC_ICON; +} - wxSize size; +#ifdef CAN_USE_REPORT_VIEW - if ( IsVertical() ) - { - size.x = sizeClient.x; - size.y = sizeList.y; - } - else // left/right aligned - { - size.x = sizeList.x; - size.y = sizeClient.y; - } - - return size; +long wxListbook::GetListCtrlReportViewFlags() const +{ + return wxLC_REPORT | wxLC_NO_HEADER; } +#endif // CAN_USE_REPORT_VIEW + +// ---------------------------------------------------------------------------- +// wxListbook geometry management +// ---------------------------------------------------------------------------- + void wxListbook::OnSize(wxSizeEvent& event) { // arrange the icons before calling SetClientSize(), otherwise it wouldn't @@ -155,9 +162,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 @@ -199,25 +208,14 @@ int wxListbook::HitTest(const wxPoint& pt, long *flags) const return pagePos; } -wxSize wxListbook::CalcSizeFromPage(const wxSize& sizePage) const +void wxListbook::UpdateSize() { - // we need to add the size of the list control and the border between - const wxSize sizeList = GetControllerSize(); - - wxSize size = sizePage; - if ( IsVertical() ) - { - size.y += sizeList.y + GetInternalBorder(); - } - else // left/right aligned - { - size.x += sizeList.x + GetInternalBorder(); - } - - return size; + // 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 // ---------------------------------------------------------------------------- @@ -234,11 +232,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) @@ -252,7 +258,37 @@ bool wxListbook::SetPageImage(size_t n, int imageId) void wxListbook::SetImageList(wxImageList *imageList) { - GetListView()->SetImageList(imageList, wxIMAGE_LIST_NORMAL); +#ifdef CAN_USE_REPORT_VIEW + wxListView * const list = GetListView(); + + // If imageList presence has changed, we update the list control view + if ( (imageList != NULL) != (GetImageList() != NULL) ) + { + // Preserve the selection which is lost when changing the mode + const int oldSel = GetSelection(); + + // 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")); + + // Restore selection + if ( oldSel != wxNOT_FOUND ) + SetSelection(oldSel); + } + + list->SetImageList(imageList, wxIMAGE_LIST_NORMAL); +#endif // CAN_USE_REPORT_VIEW wxBookCtrlBase::SetImageList(imageList); } @@ -273,12 +309,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); } @@ -324,9 +360,8 @@ wxListbook::InsertPage(size_t n, if ( selNew != -1 ) SetSelection(selNew); - wxSizeEvent sz(GetSize(), GetId()); - GetEventHandler()->ProcessEvent(sz); - + UpdateSize(); + return true; } @@ -356,11 +391,7 @@ wxWindow *wxListbook::DoRemovePage(size_t page) } GetListView()->Arrange(); - if (GetPageCount() == 0) - { - wxSizeEvent sz(GetSize(), GetId()); - GetEventHandler()->ProcessEvent(sz); - } + UpdateSize(); } return win; @@ -375,8 +406,7 @@ bool wxListbook::DeleteAllPages() m_selection = -1; - wxSizeEvent sz(GetSize(), GetId()); - GetEventHandler()->ProcessEvent(sz); + UpdateSize(); return true; }