Somehow, setting a tint color makes gauge work :/.

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

diff --git a/src/generic/listbkg.cpp b/src/generic/listbkg.cpp
index 82a1220c32673e2406dc5c9d57885dff1fb094ce..c9584d1ff30f74a2f6a5b923231d375a17bb62e3 100644 (file)
--- a/src/generic/listbkg.cpp
+++ b/src/generic/listbkg.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     19.08.03
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     19.08.03

-// RCS-ID:      $Id$

 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -36,12 +35,6 @@
 #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
 // ----------------------------------------------------------------------------


@@ -54,10 +47,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_LISTBOOK_PAGE_CHANGING, wxBookCtrlEvent );
+wxDEFINE_EVENT( wxEVT_LISTBOOK_PAGE_CHANGED,  wxBookCtrlEvent );

 
 BEGIN_EVENT_TABLE(wxListbook, wxBookCtrlBase)
     EVT_SIZE(wxListbook::OnSize)
 
 BEGIN_EVENT_TABLE(wxListbook, wxBookCtrlBase)
     EVT_SIZE(wxListbook::OnSize)


@@ -72,11 +64,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,


@@ -109,17 +96,11 @@ wxListbook::Create(wxWindow *parent,
                     wxID_ANY,
                     wxDefaultPosition,
                     wxDefaultSize,
                     wxID_ANY,
                     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
+                    GetListCtrlFlags()

                  );
 
                  );
 

-#ifdef CAN_USE_REPORT_VIEW
-    GetListView()->InsertColumn(0, wxT("Pages"));
-#endif // CAN_USE_REPORT_VIEW
+    if ( GetListView()->InReportView() )
+        GetListView()->InsertColumn(0, wxS("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


@@ -138,46 +119,46 @@ wxListbook::Create(wxWindow *parent,
 // wxListCtrl flags
 // ----------------------------------------------------------------------------
 
 // 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
+long wxListbook::GetListCtrlFlags() const

 {
 {

-    const wxSize sizeClient = GetClientSize(),
-                 sizeBorder = m_bookctrl->GetSize() - m_bookctrl->GetClientSize(),
-                 sizeList = GetListView()->GetViewRect().GetSize() + sizeBorder;
-
-    wxSize size;
-
-    if ( IsVertical() )
+    // We'd like to always use wxLC_ICON mode but it doesn't work with the
+    // native wxListCtrl under MSW unless we do have icons for all the items,
+    // so we can't use it if we have no image list. In this case we'd like to
+    // use wxLC_LIST mode because it works correctly for both horizontally and
+    // vertically laid out controls, but MSW native wxListCtrl insists on
+    // creating multiple columns if there are too many items and there doesn't
+    // seem anything to do about it, so we have to use wxLC_REPORT mode in this
+    // case there.
+
+    long flags = IsVertical() ? wxLC_ALIGN_LEFT : wxLC_ALIGN_TOP;
+    if ( GetImageList() )

     {
     {

-        size.x = sizeClient.x;
-        size.y = sizeList.y;
+        flags |= wxLC_ICON;

     }
     }

-    else // left/right aligned
+    else // No images.

     {
     {

-        size.x = sizeList.x;
-        size.y = sizeClient.y;
+#ifdef __WXMSW__
+        if ( !IsVertical() )
+        {
+            // Notice that we intentionally overwrite the alignment flags here
+            // by not using "|=", alignment isn't used for report view.
+            flags = wxLC_REPORT | wxLC_NO_HEADER;
+        }
+        else
+#endif // __WXMSW__
+        {
+            flags |= wxLC_LIST;
+        }

     }
 
     }
 

-    return size;
+    // Use single selection in any case.
+    return flags | wxLC_SINGLE_SEL;

 }
 
 }
 

+// ----------------------------------------------------------------------------
+// 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


@@ -185,9 +166,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 +212,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,59 +262,31 @@ bool wxListbook::SetPageImage(size_t n, int imageId)
 
 void wxListbook::SetImageList(wxImageList *imageList)
 {
 
 void wxListbook::SetImageList(wxImageList *imageList)
 {

-    wxListView * const list = GetListView();
+    const long flagsOld = GetListCtrlFlags();

 
 

-#ifdef CAN_USE_REPORT_VIEW
-    // If imageList presence has changed, we update the list control view
-    if ( (imageList != NULL) != (GetImageList() != NULL) )
-    {
-        wxArrayString labels;
-        labels.Alloc(GetPageCount());
-
-        wxArrayInt imageIds;
-        imageIds.Alloc(GetPageCount());
+    wxBookCtrlBase::SetImageList(imageList);

 
 

-        const int oldSel = GetSelection();
-        size_t i;
+    const long flagsNew = GetListCtrlFlags();

 
 

-        // 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));
-        }
+    wxListView * const list = GetListView();

 
 

-        // 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();
-        }
+    // We may need to change the list control mode if the image list presence
+    // has changed.
+    if ( flagsNew != flagsOld )
+    {
+        // Preserve the selection which is lost when changing the mode
+        const int oldSel = GetSelection();

 
 

-        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]);
-        }
+        list->SetWindowStyleFlag(flagsNew);
+        if ( list->InReportView() )
+            list->InsertColumn(0, wxS("Pages"));

 
         // Restore selection
         if ( oldSel != wxNOT_FOUND )
 
         // Restore selection
         if ( oldSel != wxNOT_FOUND )

-           SetSelection(oldSel);
+            SetSelection(oldSel);

     }
 
     list->SetImageList(imageList, wxIMAGE_LIST_NORMAL);
     }
 
     list->SetImageList(imageList, wxIMAGE_LIST_NORMAL);

-#endif // CAN_USE_REPORT_VIEW
-
-    wxBookCtrlBase::SetImageList(imageList);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -356,19 +300,14 @@ 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_LISTBOOK_PAGE_CHANGING, m_windowId);

 }
 
 }
 

-wxBookCtrlBaseEvent* wxListbook::CreatePageChangingEvent() const
+void wxListbook::MakeChangedEvent(wxBookCtrlEvent &event)

 {
 {

-    return new wxListbookEvent(wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING, m_windowId);
-}
-
-void wxListbook::MakeChangedEvent(wxBookCtrlBaseEvent &event)
-{
-    event.SetEventType(wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED);
+    event.SetEventType(wxEVT_LISTBOOK_PAGE_CHANGED);

 }
 
 
 }
 
 


@@ -398,57 +337,26 @@ 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;
 }
 
 wxWindow *wxListbook::DoRemovePage(size_t page)
 {
     return true;
 }
 
 wxWindow *wxListbook::DoRemovePage(size_t page)
 {

-    const size_t page_count = GetPageCount();

     wxWindow *win = wxBookCtrlBase::DoRemovePage(page);
 
     if ( win )
     {
         GetListView()->DeleteItem(page);
 
     wxWindow *win = wxBookCtrlBase::DoRemovePage(page);
 
     if ( win )
     {
         GetListView()->DeleteItem(page);
 

-        if (m_selection >= (int)page)
-        {
-            // force new sel valid if possible
-            int sel = m_selection - 1;
-            if (page_count == 1)
-                sel = wxNOT_FOUND;
-            else if ((page_count == 2) || (sel == -1))
-                sel = 0;
-
-            // force sel invalid if deleting current page - don't try to hide it
-            m_selection = (m_selection == (int)page) ? wxNOT_FOUND : m_selection - 1;
-
-            if ((sel != wxNOT_FOUND) && (sel != m_selection))
-                SetSelection(sel);
-        }
+        DoSetSelectionAfterRemoval(page);

 
         GetListView()->Arrange();
 
         GetListView()->Arrange();

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

     }
 
     return win;
     }
 
     return win;


@@ -461,10 +369,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;
 }