X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1a9a6eed360bc9a263f2ea7c0d470953397de531..7d6a4d96961eac84d05db8bb24c64d39003f6e54:/src/generic/listbkg.cpp?ds=inline diff --git a/src/generic/listbkg.cpp b/src/generic/listbkg.cpp index 82a1220c32..88a3c4a7ff 100644 --- a/src/generic/listbkg.cpp +++ b/src/generic/listbkg.cpp @@ -36,11 +36,7 @@ #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 +#include "wx/sysopt.h" // ---------------------------------------------------------------------------- // various wxWidgets macros @@ -54,10 +50,9 @@ // ---------------------------------------------------------------------------- IMPLEMENT_DYNAMIC_CLASS(wxListbook, wxBookCtrlBase) -IMPLEMENT_DYNAMIC_CLASS(wxListbookEvent, wxNotifyEvent) -const wxEventType wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING = wxNewEventType(); -const wxEventType wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED = wxNewEventType(); +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) @@ -72,11 +67,6 @@ END_EVENT_TABLE() // wxListbook creation // ---------------------------------------------------------------------------- -void wxListbook::Init() -{ - m_selection = wxNOT_FOUND; -} - bool wxListbook::Create(wxWindow *parent, wxWindowID id, @@ -110,17 +100,10 @@ wxListbook::Create(wxWindow *parent, wxDefaultPosition, wxDefaultSize, wxLC_SINGLE_SEL | -#ifdef CAN_USE_REPORT_VIEW - GetListCtrlReportViewFlags() -#else // !CAN_USE_REPORT_VIEW - GetListCtrlIconViewFlags() -#endif // CAN_USE_REPORT_VIEW/!CAN_USE_REPORT_VIEW + (IsVertical() ? wxLC_ALIGN_LEFT : wxLC_ALIGN_TOP) | + wxLC_LIST ); -#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 @@ -134,50 +117,10 @@ 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 // ---------------------------------------------------------------------------- -wxSize wxListbook::GetControllerSize() const -{ - const wxSize sizeClient = GetClientSize(), - sizeBorder = m_bookctrl->GetSize() - m_bookctrl->GetClientSize(), - sizeList = GetListView()->GetViewRect().GetSize() + sizeBorder; - - wxSize size; - - if ( IsVertical() ) - { - size.x = sizeClient.x; - size.y = sizeList.y; - } - else // left/right aligned - { - size.x = sizeList.x; - size.y = sizeClient.y; - } - - return size; -} - void wxListbook::OnSize(wxSizeEvent& event) { // arrange the icons before calling SetClientSize(), otherwise it wouldn't @@ -185,9 +128,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 @@ -229,25 +174,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 // ---------------------------------------------------------------------------- @@ -292,55 +226,31 @@ void wxListbook::SetImageList(wxImageList *imageList) { wxListView * const list = GetListView(); -#ifdef CAN_USE_REPORT_VIEW - // If imageList presence has changed, we update the list control view + // If imageList presence has changed, we update the list control style if ( (imageList != NULL) != (GetImageList() != NULL) ) { - wxArrayString labels; - labels.Alloc(GetPageCount()); - - wxArrayInt imageIds; - imageIds.Alloc(GetPageCount()); - + // Preserve the selection which is lost when changing the mode 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; + // Update the style to use icon view for images, list view otherwise + long style = list->GetWindowStyle() & ~wxLC_MASK_TYPE; if ( imageList ) { - style |= GetListCtrlIconViewFlags(); + style |= wxLC_ICON; } else // no image list { - style |= GetListCtrlReportViewFlags(); + style |= wxLC_LIST; } 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); + SetSelection(oldSel); } list->SetImageList(imageList, wxIMAGE_LIST_NORMAL); -#endif // CAN_USE_REPORT_VIEW wxBookCtrlBase::SetImageList(imageList); } @@ -356,17 +266,12 @@ void wxListbook::UpdateSelectedPage(size_t newsel) GetListView()->Focus(newsel); } -int wxListbook::GetSelection() const +wxBookCtrlEvent* wxListbook::CreatePageChangingEvent() const { - return m_selection; + return new wxBookCtrlEvent(wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING, m_windowId); } -wxBookCtrlBaseEvent* wxListbook::CreatePageChangingEvent() const -{ - return new wxListbookEvent(wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING, m_windowId); -} - -void wxListbook::MakeChangedEvent(wxBookCtrlBaseEvent &event) +void wxListbook::MakeChangedEvent(wxBookCtrlEvent &event) { event.SetEventType(wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED); } @@ -398,23 +303,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(); - wxSizeEvent sz(GetSize(), GetId()); - GetEventHandler()->ProcessEvent(sz); - return true; } @@ -433,7 +326,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 @@ -444,11 +337,7 @@ wxWindow *wxListbook::DoRemovePage(size_t page) } GetListView()->Arrange(); - if (GetPageCount() == 0) - { - wxSizeEvent sz(GetSize(), GetId()); - GetEventHandler()->ProcessEvent(sz); - } + UpdateSize(); } return win; @@ -461,10 +350,7 @@ bool wxListbook::DeleteAllPages() if (!wxBookCtrlBase::DeleteAllPages()) return false; - m_selection = -1; - - wxSizeEvent sz(GetSize(), GetId()); - GetEventHandler()->ProcessEvent(sz); + UpdateSize(); return true; }