X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9249d38d6e18ba24119fefa8970b6e8ce7104de3..404b319a85dadd7decf7a5a5331020520031a41c:/src/generic/listbkg.cpp?ds=inline diff --git a/src/generic/listbkg.cpp b/src/generic/listbkg.cpp index fa585a19dd..9196219b1a 100644 --- a/src/generic/listbkg.cpp +++ b/src/generic/listbkg.cpp @@ -48,17 +48,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 = wxWindow::NewControlId(); +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() // ============================================================================ @@ -69,11 +65,6 @@ END_EVENT_TABLE() // wxListbook creation // ---------------------------------------------------------------------------- -void wxListbook::Init() -{ - m_selection = wxNOT_FOUND; -} - bool wxListbook::Create(wxWindow *parent, wxWindowID id, @@ -103,13 +94,15 @@ 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) + GetListCtrlFlags() ); + if ( GetListView()->InReportView() ) + GetListView()->InsertColumn(0, wxS("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 @@ -124,31 +117,49 @@ wxListbook::Create(wxWindow *parent, } // ---------------------------------------------------------------------------- -// wxListbook geometry management +// wxListCtrl flags // ---------------------------------------------------------------------------- -wxSize wxListbook::GetControllerSize() const +long wxListbook::GetListCtrlFlags() const { - const wxSize sizeClient = GetClientSize(), - sizeBorder = m_bookctrl->GetSize() - m_bookctrl->GetClientSize(), - sizeList = GetListView()->GetViewRect().GetSize() + sizeBorder; - - wxSize size; - - if ( IsVertical() ) + // We'd like to always use wxLC_ICON mode but it doesn't work with the + // native wxListCtrl under MSW unless we do have icons for all the items, + // so we can't use it if we have no image list. In this case we'd like to + // use wxLC_LIST mode because it works correctly for both horizontally and + // vertically laid out controls, but MSW native wxListCtrl insists on + // creating multiple columns if there are too many items and there doesn't + // seem anything to do about it, so we have to use wxLC_REPORT mode in this + // case there. + + long flags = IsVertical() ? wxLC_ALIGN_LEFT : wxLC_ALIGN_TOP; + if ( GetImageList() ) { - size.x = sizeClient.x; - size.y = sizeList.y; + flags |= wxLC_ICON; } - else // left/right aligned + else // No images. { - size.x = sizeList.x; - size.y = sizeClient.y; +#ifdef __WXMSW__ + if ( !IsVertical() ) + { + // Notice that we intentionally overwrite the alignment flags here + // by not using "|=", alignment isn't used for report view. + flags = wxLC_REPORT | wxLC_NO_HEADER; + } + else +#endif // __WXMSW__ + { + flags |= wxLC_LIST; + } } - return size; + // Use single selection in any case. + return flags | wxLC_SINGLE_SEL; } +// ---------------------------------------------------------------------------- +// wxListbook geometry management +// ---------------------------------------------------------------------------- + void wxListbook::OnSize(wxSizeEvent& event) { // arrange the icons before calling SetClientSize(), otherwise it wouldn't @@ -156,9 +167,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 @@ -200,25 +213,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 // ---------------------------------------------------------------------------- @@ -235,11 +237,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,9 +263,31 @@ bool wxListbook::SetPageImage(size_t n, int imageId) void wxListbook::SetImageList(wxImageList *imageList) { - GetListView()->SetImageList(imageList, wxIMAGE_LIST_NORMAL); + const long flagsOld = GetListCtrlFlags(); wxBookCtrlBase::SetImageList(imageList); + + const long flagsNew = GetListCtrlFlags(); + + wxListView * const list = GetListView(); + + // We may need to change the list control mode if the image list presence + // has changed. + if ( flagsNew != flagsOld ) + { + // Preserve the selection which is lost when changing the mode + const int oldSel = GetSelection(); + + list->SetWindowStyleFlag(flagsNew); + if ( list->InReportView() ) + list->InsertColumn(0, wxS("Pages")); + + // Restore selection + if ( oldSel != wxNOT_FOUND ) + SetSelection(oldSel); + } + + list->SetImageList(imageList, wxIMAGE_LIST_NORMAL); } // ---------------------------------------------------------------------------- @@ -269,17 +301,12 @@ void wxListbook::UpdateSelectedPage(size_t newsel) GetListView()->Focus(newsel); } -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); } @@ -311,27 +338,11 @@ wxListbook::InsertPage(size_t n, GetListView()->Focus(m_selection); } - // 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 ) + if ( !DoSetSelectionAfterInsertion(n, bSelect) ) page->Hide(); - if ( selNew != -1 ) - SetSelection(selNew); + UpdateSize(); - GetListView()->Arrange(); - - if (GetPageCount() == 1) - { - wxSizeEvent sz(GetSize(), GetId()); - ProcessEvent(sz); - } return true; } @@ -350,7 +361,7 @@ wxWindow *wxListbook::DoRemovePage(size_t page) int sel = m_selection - 1; if (page_count == 1) sel = wxNOT_FOUND; - else if ((page_count == 2) || (sel == -1)) + else if ((page_count == 2) || (sel == wxNOT_FOUND)) sel = 0; // force sel invalid if deleting current page - don't try to hide it @@ -361,11 +372,7 @@ wxWindow *wxListbook::DoRemovePage(size_t page) } GetListView()->Arrange(); - if (GetPageCount() == 0) - { - wxSizeEvent sz(GetSize(), GetId()); - ProcessEvent(sz); - } + UpdateSize(); } return win; @@ -378,10 +385,7 @@ bool wxListbook::DeleteAllPages() if (!wxBookCtrlBase::DeleteAllPages()) return false; - m_selection = -1; - - wxSizeEvent sz(GetSize(), GetId()); - ProcessEvent(sz); + UpdateSize(); return true; } @@ -392,6 +396,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 )