X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c17181221523cfedac96aff5769ee3a57976105c..9b49405777342458dc1666001865eef7309b6c30:/src/generic/listbkg.cpp

diff --git a/src/generic/listbkg.cpp b/src/generic/listbkg.cpp
index a19f3ce07d..855c1c71a4 100644
--- a/src/generic/listbkg.cpp
+++ b/src/generic/listbkg.cpp
@@ -36,6 +36,12 @@
 #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
 // ----------------------------------------------------------------------------
@@ -48,10 +54,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)
@@ -103,10 +108,17 @@ wxListbook::Create(wxWindow *parent,
                     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"));
+#endif // CAN_USE_REPORT_VIEW
 
 #ifdef __WXMSW__
     // On XP with themes enabled the GetViewRect used in GetControllerSize() to
@@ -121,6 +133,24 @@ 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
 // ----------------------------------------------------------------------------
@@ -154,9 +184,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
@@ -216,6 +248,13 @@ wxSize wxListbook::CalcSizeFromPage(const wxSize& sizePage) const
     return size;
 }
 
+void wxListbook::UpdateSize()
+{
+    // 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
@@ -261,6 +300,7 @@ 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) )
     {
@@ -285,17 +325,17 @@ void wxListbook::SetImageList(wxImageList *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
         {
-           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++ )
         {
@@ -308,6 +348,7 @@ void wxListbook::SetImageList(wxImageList *imageList)
     }
 
     list->SetImageList(imageList, wxIMAGE_LIST_NORMAL);
+#endif // CAN_USE_REPORT_VIEW
 
     wxBookCtrlBase::SetImageList(imageList);
 }
@@ -328,12 +369,12 @@ 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);
 }
@@ -379,9 +420,8 @@ wxListbook::InsertPage(size_t n,
     if ( selNew != -1 )
         SetSelection(selNew);
 
-    wxSizeEvent sz(GetSize(), GetId());
-    GetEventHandler()->ProcessEvent(sz);
-    
+    UpdateSize();
+
     return true;
 }
 
@@ -411,11 +451,7 @@ wxWindow *wxListbook::DoRemovePage(size_t page)
         }
 
         GetListView()->Arrange();
-        if (GetPageCount() == 0)
-        {
-            wxSizeEvent sz(GetSize(), GetId());
-            GetEventHandler()->ProcessEvent(sz);
-        }
+        UpdateSize();
     }
 
     return win;
@@ -430,8 +466,7 @@ bool wxListbook::DeleteAllPages()
 
     m_selection = -1;
 
-    wxSizeEvent sz(GetSize(), GetId());
-    GetEventHandler()->ProcessEvent(sz);
+    UpdateSize();
 
     return true;
 }