fixed wxXmlResource::Load's detection of filenames to be done as early as possible

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

diff --git a/src/generic/listbkg.cpp b/src/generic/listbkg.cpp
index 1985558dfab29b3b799830fbfc1d3bff3f63e688..855c1c71a4a6d9d82eab631f6e9eb39aef3a4f85 100644 (file)
--- a/src/generic/listbkg.cpp
+++ b/src/generic/listbkg.cpp
@@ -26,11 +26,21 @@
 
 #if wxUSE_LISTBOOK
 
 
 #if wxUSE_LISTBOOK
 

+#include "wx/listbook.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/settings.h"
+#endif
+

 #include "wx/listctrl.h"
 #include "wx/statline.h"
 #include "wx/listctrl.h"
 #include "wx/statline.h"

-#include "wx/listbook.h"

 #include "wx/imaglist.h"
 #include "wx/imaglist.h"

-#include "wx/settings.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


@@ -44,15 +54,13 @@
 // ----------------------------------------------------------------------------
 
 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();
-const int wxID_LISTBOOKLISTVIEW = wxNewId();
+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()
 
 // ============================================================================


@@ -97,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


@@ -117,6 +133,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
 // ----------------------------------------------------------------------------


@@ -150,9 +184,50 @@ 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 pagePos = wxNOT_FOUND;
+
+    if ( flags )
+        *flags = wxBK_HITTEST_NOWHERE;
+
+    // convert from listbook control coordinates to list control coordinates
+    const wxListView * const list = GetListView();
+    const wxPoint listPt = list->ScreenToClient(ClientToScreen(pt));
+
+    // is the point inside list control?
+    if ( wxRect(list->GetSize()).Contains(listPt) )
+    {
+        int flagsList;
+        pagePos = list->HitTest(listPt, flagsList);
+
+        if ( flags )
+        {
+            if ( pagePos != wxNOT_FOUND )
+                *flags = 0;
+
+            if ( flagsList & (wxLIST_HITTEST_ONITEMICON |
+                              wxLIST_HITTEST_ONITEMSTATEICON ) )
+                *flags |= wxBK_HITTEST_ONICON;
+
+            if ( flagsList & wxLIST_HITTEST_ONITEMLABEL )
+                *flags |= wxBK_HITTEST_ONLABEL;
+        }
+    }
+    else // not over list control at all
+    {
+        if ( flags && GetPageRect().Contains(pt) )
+            *flags |= wxBK_HITTEST_ONPAGE;
+    }
+
+    return pagePos;

 }
 
 wxSize wxListbook::CalcSizeFromPage(const wxSize& sizePage) const
 }
 
 wxSize wxListbook::CalcSizeFromPage(const wxSize& sizePage) const


@@ -173,6 +248,13 @@ wxSize wxListbook::CalcSizeFromPage(const wxSize& sizePage) const
     return size;
 }
 
     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
 
 // ----------------------------------------------------------------------------
 // accessing the pages


@@ -190,11 +272,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)


@@ -208,7 +298,57 @@ bool wxListbook::SetPageImage(size_t n, int imageId)
 
 void wxListbook::SetImageList(wxImageList *imageList)
 {
 
 void wxListbook::SetImageList(wxImageList *imageList)
 {

-    GetListView()->SetImageList(imageList, wxIMAGE_LIST_NORMAL);
+    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) )
+    {
+        wxArrayString labels;
+        labels.Alloc(GetPageCount());
+
+        wxArrayInt imageIds;
+        imageIds.Alloc(GetPageCount());
+
+        const int oldSel = GetSelection();
+        size_t i;
+
+        // 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));
+        }
+
+        // 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);
+#endif // CAN_USE_REPORT_VIEW

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


@@ -217,47 +357,29 @@ void wxListbook::SetImageList(wxImageList *imageList)
 // selection
 // ----------------------------------------------------------------------------
 
 // selection
 // ----------------------------------------------------------------------------
 

+void wxListbook::UpdateSelectedPage(size_t newsel)
+{
+    m_selection = newsel;
+    GetListView()->Select(newsel);
+    GetListView()->Focus(newsel);
+}
+

 int wxListbook::GetSelection() const
 {
     return m_selection;
 }
 
 int wxListbook::GetSelection() const
 {
     return m_selection;
 }
 

-int wxListbook::SetSelection(size_t n)
+wxBookCtrlEvent* wxListbook::CreatePageChangingEvent() const

 {
 {

-    wxCHECK_MSG( IS_VALID_PAGE(n), wxNOT_FOUND,
-                 wxT("invalid page index in wxListbook::SetSelection()") );
-
-    const int oldSel = m_selection;
-
-    if ( int(n) != m_selection )
-    {
-        wxListbookEvent event(wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING, m_windowId);
-        event.SetSelection(n);
-        event.SetOldSelection(m_selection);
-        event.SetEventObject(this);
-        if ( !GetEventHandler()->ProcessEvent(event) || event.IsAllowed() )
-        {
-            if ( m_selection != wxNOT_FOUND )
-                m_pages[m_selection]->Hide();
-
-            wxWindow *page = m_pages[n];
-            page->SetSize(GetPageRect());
-            page->Show();
-
-            // change m_selection now to ignore the selection change event
-            m_selection = n;
-            GetListView()->Select(n);
-            GetListView()->Focus(n);
-
-            // program allows the page change
-            event.SetEventType(wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED);
-            (void)GetEventHandler()->ProcessEvent(event);
-        }
-    }
+    return new wxBookCtrlEvent(wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING, m_windowId);
+}

 
 

-    return oldSel;
+void wxListbook::MakeChangedEvent(wxBookCtrlEvent &event)
+{
+    event.SetEventType(wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED);

 }
 
 }
 

+

 // ----------------------------------------------------------------------------
 // adding/removing the pages
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // adding/removing the pages
 // ----------------------------------------------------------------------------


@@ -298,8 +420,8 @@ wxListbook::InsertPage(size_t n,
     if ( selNew != -1 )
         SetSelection(selNew);
 
     if ( selNew != -1 )
         SetSelection(selNew);
 

-    InvalidateBestSize();
-    GetListView()->Arrange();
+    UpdateSize();
+

     return true;
 }
 
     return true;
 }
 


@@ -329,6 +451,7 @@ wxWindow *wxListbook::DoRemovePage(size_t page)
         }
 
         GetListView()->Arrange();
         }
 
         GetListView()->Arrange();

+        UpdateSize();

     }
 
     return win;
     }
 
     return win;


@@ -338,7 +461,14 @@ wxWindow *wxListbook::DoRemovePage(size_t page)
 bool wxListbook::DeleteAllPages()
 {
     GetListView()->DeleteAllItems();
 bool wxListbook::DeleteAllPages()
 {
     GetListView()->DeleteAllItems();

-    return wxBookCtrlBase::DeleteAllPages();
+    if (!wxBookCtrlBase::DeleteAllPages())
+        return false;
+
+    m_selection = -1;
+
+    UpdateSize();
+
+    return true;

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


@@ -347,6 +477,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 )