Rename delegates to try and stop name clashes, probably with wxWebKitCtrl.

[wxWidgets.git] / src / generic / listbkg.cpp

diff --git a/src/generic/listbkg.cpp b/src/generic/listbkg.cpp
index 82a1220c32673e2406dc5c9d57885dff1fb094ce..0861211c0eeb4ab6d3d08253c9b03a0565d990db 100644 (file)
--- a/src/generic/listbkg.cpp
+++ b/src/generic/listbkg.cpp
@@ -36,11 +36,25 @@
 #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
+#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
 #endif

+        return true;
+}
+
+} // anonymous namespace

 
 // ----------------------------------------------------------------------------
 // various wxWidgets macros
 
 // ----------------------------------------------------------------------------
 // various wxWidgets macros


@@ -54,10 +68,9 @@
 // ----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxListbook, wxBookCtrlBase)
 // ----------------------------------------------------------------------------
 
 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)
 
 BEGIN_EVENT_TABLE(wxListbook, wxBookCtrlBase)
     EVT_SIZE(wxListbook::OnSize)


@@ -72,11 +85,6 @@ END_EVENT_TABLE()
 // wxListbook creation
 // ----------------------------------------------------------------------------
 
 // wxListbook creation
 // ----------------------------------------------------------------------------
 

-void wxListbook::Init()
-{
-    m_selection = wxNOT_FOUND;
-}
-

 bool
 wxListbook::Create(wxWindow *parent,
                    wxWindowID id,
 bool
 wxListbook::Create(wxWindow *parent,
                    wxWindowID id,


@@ -110,16 +118,12 @@ wxListbook::Create(wxWindow *parent,
                     wxDefaultPosition,
                     wxDefaultSize,
                     wxLC_SINGLE_SEL |
                     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
 
 #ifdef __WXMSW__
     // On XP with themes enabled the GetViewRect used in GetControllerSize() to


@@ -143,41 +147,15 @@ long wxListbook::GetListCtrlIconViewFlags() const
     return (IsVertical() ? wxLC_ALIGN_LEFT : wxLC_ALIGN_TOP) | wxLC_ICON;
 }
 
     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;
 }
 
 long wxListbook::GetListCtrlReportViewFlags() const
 {
     return wxLC_REPORT | wxLC_NO_HEADER;
 }
 

-#endif // CAN_USE_REPORT_VIEW
-

 // ----------------------------------------------------------------------------
 // wxListbook geometry management
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // 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
 void wxListbook::OnSize(wxSizeEvent& event)
 {
     // arrange the icons before calling SetClientSize(), otherwise it wouldn't


@@ -185,9 +163,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


@@ -229,25 +209,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
 // ----------------------------------------------------------------------------


@@ -290,58 +259,39 @@ bool wxListbook::SetPageImage(size_t n, int imageId)
 
 void wxListbook::SetImageList(wxImageList *imageList)
 {
 
 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;
+        wxListView * const list = GetListView();

 
 

-        // Grab snapshot of all list control items before changing the window
-        // style (which deletes the items)
-        for ( i = 0; i < GetPageCount(); i++ )
+        // If imageList presence has changed, we update the list control view
+        if ( (imageList != NULL) != (GetImageList() != NULL) )

         {
         {

-           labels.Add(GetPageText(i));
-           imageIds.Add(GetPageImage(i));
+            // 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);

         }
 
         }
 

-        // 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"));
-
-        // 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);
 }
 
     wxBookCtrlBase::SetImageList(imageList);
 }
 


@@ -356,17 +306,12 @@ void wxListbook::UpdateSelectedPage(size_t newsel)
     GetListView()->Focus(newsel);
 }
 
     GetListView()->Focus(newsel);
 }
 

-int wxListbook::GetSelection() const
+wxBookCtrlEvent* wxListbook::CreatePageChangingEvent() const

 {
 {

-    return m_selection;
+    return new wxBookCtrlEvent(wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING, m_windowId);

 }
 
 }
 

-wxBookCtrlBaseEvent* wxListbook::CreatePageChangingEvent() const
-{
-    return new wxListbookEvent(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);
 }


@@ -398,23 +343,11 @@ wxListbook::InsertPage(size_t n,
         GetListView()->Focus(m_selection);
     }
 
         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();
 
         page->Hide();
 

-    if ( selNew != -1 )
-        SetSelection(selNew);
+    UpdateSize();

 
 

-    wxSizeEvent sz(GetSize(), GetId());
-    GetEventHandler()->ProcessEvent(sz);
-    

     return true;
 }
 
     return true;
 }
 


@@ -433,7 +366,7 @@ wxWindow *wxListbook::DoRemovePage(size_t page)
             int sel = m_selection - 1;
             if (page_count == 1)
                 sel = wxNOT_FOUND;
             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
                 sel = 0;
 
             // force sel invalid if deleting current page - don't try to hide it


@@ -444,11 +377,7 @@ wxWindow *wxListbook::DoRemovePage(size_t page)
         }
 
         GetListView()->Arrange();
         }
 
         GetListView()->Arrange();

-        if (GetPageCount() == 0)
-        {
-            wxSizeEvent sz(GetSize(), GetId());
-            GetEventHandler()->ProcessEvent(sz);
-        }
+        UpdateSize();

     }
 
     return win;
     }
 
     return win;


@@ -461,10 +390,7 @@ bool wxListbook::DeleteAllPages()
     if (!wxBookCtrlBase::DeleteAllPages())
         return false;
 
     if (!wxBookCtrlBase::DeleteAllPages())
         return false;
 

-    m_selection = -1;
-
-    wxSizeEvent sz(GetSize(), GetId());
-    GetEventHandler()->ProcessEvent(sz);
+    UpdateSize();

 
     return true;
 }
 
     return true;
 }