disable report view mode under Mac as it hangs the native wxListCtrl implementation...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54318 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/listbook.h b/include/wx/listbook.h
index 13c86119326c2b54418f0a6f54087f3f2090a898..c6a78fc706cafab307aa8fc4926d97a35a4e1ce4 100644 (file)
--- a/include/wx/listbook.h
+++ b/include/wx/listbook.h
@@ -97,6 +97,10 @@ protected:
     wxBookCtrlBaseEvent* CreatePageChangingEvent() const;
     void MakeChangedEvent(wxBookCtrlBaseEvent &event);
 
     wxBookCtrlBaseEvent* CreatePageChangingEvent() const;
     void MakeChangedEvent(wxBookCtrlBaseEvent &event);
 

+    // get flags for different list control modes
+    long GetListCtrlIconViewFlags() const;
+    long GetListCtrlReportViewFlags() const;
+

     // event handlers
     void OnListSelected(wxListEvent& event);
     void OnSize(wxSizeEvent& event);
     // event handlers
     void OnListSelected(wxListEvent& event);
     void OnSize(wxSizeEvent& event);

diff --git a/src/generic/listbkg.cpp b/src/generic/listbkg.cpp
index a19f3ce07d3ed317cf533901a436c872cef3f0ee..82a1220c32673e2406dc5c9d57885dff1fb094ce 100644 (file)
--- a/src/generic/listbkg.cpp
+++ b/src/generic/listbkg.cpp
@@ -36,6 +36,12 @@
 #include "wx/statline.h"
 #include "wx/imaglist.h"
 
 #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
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // various wxWidgets macros
 // ----------------------------------------------------------------------------


@@ -103,10 +109,17 @@ wxListbook::Create(wxWindow *parent,
                     wxID_ANY,
                     wxDefaultPosition,
                     wxDefaultSize,
                     wxID_ANY,
                     wxDefaultPosition,
                     wxDefaultSize,

-                    wxLC_SINGLE_SEL | wxLC_REPORT | wxLC_NO_HEADER
+                    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"));
     GetListView()->InsertColumn(0, wxT("Pages"));

+#endif // CAN_USE_REPORT_VIEW

 
 #ifdef __WXMSW__
     // On XP with themes enabled the GetViewRect used in GetControllerSize() to
 
 #ifdef __WXMSW__
     // On XP with themes enabled the GetViewRect used in GetControllerSize() to


@@ -121,6 +134,24 @@ wxListbook::Create(wxWindow *parent,
     return true;
 }
 
     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
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxListbook geometry management
 // ----------------------------------------------------------------------------


@@ -261,6 +292,7 @@ void wxListbook::SetImageList(wxImageList *imageList)
 {
     wxListView * const list = GetListView();
 
 {
     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 imageList presence has changed, we update the list control view
     if ( (imageList != NULL) != (GetImageList() != NULL) )
     {


@@ -285,17 +317,17 @@ void wxListbook::SetImageList(wxImageList *imageList)
         long style = wxLC_SINGLE_SEL;
         if ( imageList )
         {
         long style = wxLC_SINGLE_SEL;
         if ( imageList )
         {

-           list->SetWindowStyleFlag(style |
-                                    (IsVertical() ? wxLC_ALIGN_LEFT
-                                                  : wxLC_ALIGN_TOP) |
-                                    wxLC_ICON);
+            style |= GetListCtrlIconViewFlags();

         }
         else // no image list
         {
         }
         else // no image list
         {

-           list->SetWindowStyleFlag(style | wxLC_REPORT | wxLC_NO_HEADER);
-           list->InsertColumn(0, wxT("Pages"));
+            style |= GetListCtrlReportViewFlags();

         }
 
         }
 

+        list->SetWindowStyleFlag(style);
+        if ( !imageList )
+            list->InsertColumn(0, wxT("Pages"));
+

         // Add back the list control items
         for ( i = 0; i < GetPageCount(); i++ )
         {
         // Add back the list control items
         for ( i = 0; i < GetPageCount(); i++ )
         {


@@ -308,6 +340,7 @@ void wxListbook::SetImageList(wxImageList *imageList)
     }
 
     list->SetImageList(imageList, wxIMAGE_LIST_NORMAL);
     }
 
     list->SetImageList(imageList, wxIMAGE_LIST_NORMAL);

+#endif // CAN_USE_REPORT_VIEW

 
     wxBookCtrlBase::SetImageList(imageList);
 }
 
     wxBookCtrlBase::SetImageList(imageList);
 }