X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9b11752c4f9e1fd4b11ba3d184246267facb3ad3..5a0259e657136dad29d9f249ebc31f8e8b315ed0:/src/generic/listbkg.cpp

diff --git a/src/generic/listbkg.cpp b/src/generic/listbkg.cpp
index 855c1c71a4..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
@@ -71,11 +67,6 @@ END_EVENT_TABLE()
 // wxListbook creation
 // ----------------------------------------------------------------------------
 
-void wxListbook::Init()
-{
-    m_selection = wxNOT_FOUND;
-}
-
 bool
 wxListbook::Create(wxWindow *parent,
                    wxWindowID id,
@@ -109,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
@@ -133,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
@@ -230,24 +174,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
@@ -300,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);
 }
@@ -364,11 +266,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 +303,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 +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
@@ -464,8 +350,6 @@ bool wxListbook::DeleteAllPages()
     if (!wxBookCtrlBase::DeleteAllPages())
         return false;
 
-    m_selection = -1;
-
     UpdateSize();
 
     return true;