]> git.saurik.com Git - wxWidgets.git/blobdiff - src/generic/listbkg.cpp
Fix compilation of wxIconBundle in some particular minimal builds.
[wxWidgets.git] / src / generic / listbkg.cpp
index fa585a19ddf6dbb12fa6e67b6cf2aad514ac8b23..f829305777dc29fb0311fd3a2ccf3ddb6280a6c2 100644 (file)
 #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
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxListbook, wxBookCtrlBase)
 // ----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxListbook, wxBookCtrlBase)
-IMPLEMENT_DYNAMIC_CLASS(wxListbookEvent, wxNotifyEvent)
 
 
-#if !WXWIN_COMPATIBILITY_EVENT_TYPES
-const wxEventType wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING = wxNewEventType();
-const wxEventType wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED = wxNewEventType();
-#endif
-const int wxID_LISTBOOKLISTVIEW = wxWindow::NewControlId();
+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)
 
 BEGIN_EVENT_TABLE(wxListbook, wxBookCtrlBase)
     EVT_SIZE(wxListbook::OnSize)
-    EVT_LIST_ITEM_SELECTED(wxID_LISTBOOKLISTVIEW, wxListbook::OnListSelected)
+    EVT_LIST_ITEM_SELECTED(wxID_ANY, wxListbook::OnListSelected)
 END_EVENT_TABLE()
 
 // ============================================================================
 END_EVENT_TABLE()
 
 // ============================================================================
@@ -103,13 +105,21 @@ wxListbook::Create(wxWindow *parent,
     m_bookctrl = new wxListView
                  (
                     this,
     m_bookctrl = new wxListView
                  (
                     this,
-                    wxID_LISTBOOKLISTVIEW,
+                    wxID_ANY,
                     wxDefaultPosition,
                     wxDefaultSize,
                     wxDefaultPosition,
                     wxDefaultSize,
-                    wxLC_ICON | wxLC_SINGLE_SEL |
-                        (IsVertical() ? wxLC_ALIGN_LEFT : wxLC_ALIGN_TOP)
+                    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
     // determine the space needed for the list view will incorrectly return
 #ifdef __WXMSW__
     // On XP with themes enabled the GetViewRect used in GetControllerSize() to
     // determine the space needed for the list view will incorrectly return
@@ -124,31 +134,27 @@ wxListbook::Create(wxWindow *parent,
 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------
-// wxListbook geometry management
+// wxListCtrl flags
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 
-wxSize wxListbook::GetControllerSize() const
+long wxListbook::GetListCtrlIconViewFlags() const
 {
 {
-    const wxSize sizeClient = GetClientSize(),
-                 sizeBorder = m_bookctrl->GetSize() - m_bookctrl->GetClientSize(),
-                 sizeList = GetListView()->GetViewRect().GetSize() + sizeBorder;
+    return (IsVertical() ? wxLC_ALIGN_LEFT : wxLC_ALIGN_TOP) | wxLC_ICON;
+}
 
 
-    wxSize size;
+#ifdef CAN_USE_REPORT_VIEW
 
 
-    if ( IsVertical() )
-    {
-        size.x = sizeClient.x;
-        size.y = sizeList.y;
-    }
-    else // left/right aligned
-    {
-        size.x = sizeList.x;
-        size.y = sizeClient.y;
-    }
-
-    return size;
+long wxListbook::GetListCtrlReportViewFlags() const
+{
+    return wxLC_REPORT | wxLC_NO_HEADER;
 }
 
 }
 
+#endif // CAN_USE_REPORT_VIEW
+
+// ----------------------------------------------------------------------------
+// wxListbook geometry management
+// ----------------------------------------------------------------------------
+
 void wxListbook::OnSize(wxSizeEvent& event)
 {
     // arrange the icons before calling SetClientSize(), otherwise it wouldn't
 void wxListbook::OnSize(wxSizeEvent& event)
 {
     // arrange the icons before calling SetClientSize(), otherwise it wouldn't
@@ -156,9 +162,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)
     // 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
 }
 
 int wxListbook::HitTest(const wxPoint& pt, long *flags) const
@@ -200,25 +208,14 @@ int wxListbook::HitTest(const wxPoint& pt, long *flags) const
     return pagePos;
 }
 
     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
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // accessing the pages
 // ----------------------------------------------------------------------------
@@ -235,11 +232,19 @@ wxString wxListbook::GetPageText(size_t n) const
     return GetListView()->GetItemText(n);
 }
 
     return GetListView()->GetItemText(n);
 }
 
-int wxListbook::GetPageImage(size_t WXUNUSED(n)) const
+int wxListbook::GetPageImage(size_t n) const
 {
 {
-    wxFAIL_MSG( _T("wxListbook::GetPageImage() not implemented") );
+    wxListItem item;
+    item.SetId(n);
 
 
-    return wxNOT_FOUND;
+    if (GetListView()->GetItem(item))
+    {
+       return item.GetImage();
+    }
+    else
+    {
+       return wxNOT_FOUND;
+    }
 }
 
 bool wxListbook::SetPageImage(size_t n, int imageId)
 }
 
 bool wxListbook::SetPageImage(size_t n, int imageId)
@@ -253,7 +258,37 @@ bool wxListbook::SetPageImage(size_t n, int imageId)
 
 void wxListbook::SetImageList(wxImageList *imageList)
 {
 
 void wxListbook::SetImageList(wxImageList *imageList)
 {
-    GetListView()->SetImageList(imageList, wxIMAGE_LIST_NORMAL);
+#ifdef CAN_USE_REPORT_VIEW
+    wxListView * const list = GetListView();
+
+    // If imageList presence has changed, we update the list control view
+    if ( (imageList != NULL) != (GetImageList() != NULL) )
+    {
+        // 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->SetImageList(imageList, wxIMAGE_LIST_NORMAL);
+#endif // CAN_USE_REPORT_VIEW
 
     wxBookCtrlBase::SetImageList(imageList);
 }
 
     wxBookCtrlBase::SetImageList(imageList);
 }
@@ -274,12 +309,12 @@ int wxListbook::GetSelection() const
     return m_selection;
 }
 
     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);
 }
 {
     event.SetEventType(wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED);
 }
@@ -325,13 +360,8 @@ wxListbook::InsertPage(size_t n,
     if ( selNew != -1 )
         SetSelection(selNew);
 
     if ( selNew != -1 )
         SetSelection(selNew);
 
-    GetListView()->Arrange();
+    UpdateSize();
 
 
-    if (GetPageCount() == 1)
-    {
-        wxSizeEvent sz(GetSize(), GetId());
-        ProcessEvent(sz);
-    }
     return true;
 }
 
     return true;
 }
 
@@ -361,11 +391,7 @@ wxWindow *wxListbook::DoRemovePage(size_t page)
         }
 
         GetListView()->Arrange();
         }
 
         GetListView()->Arrange();
-        if (GetPageCount() == 0)
-        {
-            wxSizeEvent sz(GetSize(), GetId());
-            ProcessEvent(sz);
-        }
+        UpdateSize();
     }
 
     return win;
     }
 
     return win;
@@ -380,8 +406,7 @@ bool wxListbook::DeleteAllPages()
 
     m_selection = -1;
 
 
     m_selection = -1;
 
-    wxSizeEvent sz(GetSize(), GetId());
-    ProcessEvent(sz);
+    UpdateSize();
 
     return true;
 }
 
     return true;
 }
@@ -392,6 +417,12 @@ bool wxListbook::DeleteAllPages()
 
 void wxListbook::OnListSelected(wxListEvent& eventList)
 {
 
 void wxListbook::OnListSelected(wxListEvent& eventList)
 {
+    if ( eventList.GetEventObject() != m_bookctrl )
+    {
+        eventList.Skip();
+        return;
+    }
+
     const int selNew = eventList.GetIndex();
 
     if ( selNew == m_selection )
     const int selNew = eventList.GetIndex();
 
     if ( selNew == m_selection )