X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3c7789014106c9269b0f4ecc1a3071b14f351d3f..d2e66707deb10dea6f92e3e4092f8a43ef942a5d:/src/generic/listbkg.cpp diff --git a/src/generic/listbkg.cpp b/src/generic/listbkg.cpp index 0b90b6526f..0861211c0e 100644 --- a/src/generic/listbkg.cpp +++ b/src/generic/listbkg.cpp @@ -36,11 +36,25 @@ #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 +#include "wx/sysopt.h" + +namespace +{ + +// FIXME: This function exists because native OS X wxListCtrl seems to have +// problems with report view, either imperfect display or reported hanging, so +// disable it for now (but it should be fixed, and this function removed). +bool CanUseReportView() +{ +#if defined(__WXMAC__) && !defined(__WXUNIVERSAL__) && wxOSX_USE_CARBON + if (wxSystemOptions::GetOptionInt(wxMAC_ALWAYS_USE_GENERIC_LISTCTRL) == 0) + return false; + else #endif + return true; +} + +} // anonymous namespace // ---------------------------------------------------------------------------- // various wxWidgets macros @@ -55,8 +69,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxListbook, wxBookCtrlBase) -wxDEFINE_EVENT( wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING, wxBookCtrlEvent ) -wxDEFINE_EVENT( wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED, wxBookCtrlEvent ) +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) @@ -71,11 +85,6 @@ END_EVENT_TABLE() // wxListbook creation // ---------------------------------------------------------------------------- -void wxListbook::Init() -{ - m_selection = wxNOT_FOUND; -} - bool wxListbook::Create(wxWindow *parent, wxWindowID id, @@ -109,16 +118,12 @@ 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 + (CanUseReportView() ? GetListCtrlReportViewFlags() + : GetListCtrlIconViewFlags()) ); -#ifdef CAN_USE_REPORT_VIEW - GetListView()->InsertColumn(0, wxT("Pages")); -#endif // CAN_USE_REPORT_VIEW + if ( CanUseReportView() ) + GetListView()->InsertColumn(0, wxT("Pages")); #ifdef __WXMSW__ // On XP with themes enabled the GetViewRect used in GetControllerSize() to @@ -142,41 +147,15 @@ 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 @@ -230,24 +209,6 @@ int wxListbook::HitTest(const wxPoint& pt, long *flags) const return pagePos; } -wxSize wxListbook::CalcSizeFromPage(const wxSize& sizePage) const -{ - // 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; -} - void wxListbook::UpdateSize() { // we should find a more elegant way to force a layout than generating this @@ -298,58 +259,39 @@ bool wxListbook::SetPageImage(size_t n, int imageId) 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 != NULL) != (GetImageList() != NULL) ) + if ( CanUseReportView() ) { - 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)); - } + wxListView * const list = GetListView(); - // Update the style to use icon view for images, report view otherwise - long style = wxLC_SINGLE_SEL; - if ( imageList ) + // If imageList presence has changed, we update the list control view + if ( (imageList != NULL) != (GetImageList() != NULL) ) { - style |= GetListCtrlIconViewFlags(); - } - else // no image list - { - style |= GetListCtrlReportViewFlags(); + // 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->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); } - list->SetImageList(imageList, wxIMAGE_LIST_NORMAL); -#endif // CAN_USE_REPORT_VIEW - wxBookCtrlBase::SetImageList(imageList); } @@ -364,11 +306,6 @@ void wxListbook::UpdateSelectedPage(size_t newsel) GetListView()->Focus(newsel); } -int wxListbook::GetSelection() const -{ - return m_selection; -} - wxBookCtrlEvent* wxListbook::CreatePageChangingEvent() const { return new wxBookCtrlEvent(wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING, m_windowId); @@ -406,20 +343,9 @@ 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(); return true; @@ -440,7 +366,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 @@ -464,8 +390,6 @@ bool wxListbook::DeleteAllPages() if (!wxBookCtrlBase::DeleteAllPages()) return false; - m_selection = -1; - UpdateSize(); return true;