]> git.saurik.com Git - wxWidgets.git/blobdiff - src/generic/listbkg.cpp
signed/unsigned comparison warning fixed
[wxWidgets.git] / src / generic / listbkg.cpp
index c334b3d0120437f3bb48305098a5721a275b24e3..1985558dfab29b3b799830fbfc1d3bff3f63e688 100644 (file)
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        generic/listbkg.cpp
+// Name:        src/generic/listbkg.cpp
 // Purpose:     generic implementation of wxListbook
 // Author:      Vadim Zeitlin
 // Modified by:
 // headers
 // ----------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "listbook.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #include "wx/statline.h"
 #include "wx/listbook.h"
 #include "wx/imaglist.h"
+#include "wx/settings.h"
 
 // ----------------------------------------------------------------------------
-// constants
+// various wxWidgets macros
 // ----------------------------------------------------------------------------
 
-// margin between the list and the page, should be bigger than wxStaticLine
-// size
-const wxCoord MARGIN = 5;
+// check that the page index is valid
+#define IS_VALID_PAGE(nPage) ((nPage) < GetPageCount())
 
 // ----------------------------------------------------------------------------
-// various wxWindows macros
+// event table
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxListbook, wxControl)
+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();
 
-BEGIN_EVENT_TABLE(wxListbook, wxBookCtrl)
+BEGIN_EVENT_TABLE(wxListbook, wxBookCtrlBase)
     EVT_SIZE(wxListbook::OnSize)
-
-    EVT_LIST_ITEM_SELECTED(wxID_ANY, wxListbook::OnListSelected)
+    EVT_LIST_ITEM_SELECTED(wxID_LISTBOOKLISTVIEW, wxListbook::OnListSelected)
 END_EVENT_TABLE()
 
 // ============================================================================
@@ -69,8 +65,6 @@ END_EVENT_TABLE()
 
 void wxListbook::Init()
 {
-    m_list = NULL;
-    m_line = NULL;
     m_selection = wxNOT_FOUND;
 }
 
@@ -82,37 +76,44 @@ wxListbook::Create(wxWindow *parent,
                    long style,
                    const wxString& name)
 {
-    if ( (style & wxLB_ALIGN_MASK) == wxLB_DEFAULT )
+    if ( (style & wxBK_ALIGN_MASK) == wxBK_DEFAULT )
     {
 #ifdef __WXMAC__
-        style |= wxLB_TOP;
+        style |= wxBK_TOP;
 #else // !__WXMAC__
-        style |= wxLB_LEFT;
+        style |= wxBK_LEFT;
 #endif // __WXMAC__/!__WXMAC__
     }
 
+    // no border for this control, it doesn't look nice together with
+    // wxListCtrl border
+    style &= ~wxBORDER_MASK;
+    style |= wxBORDER_NONE;
+
     if ( !wxControl::Create(parent, id, pos, size, style,
                             wxDefaultValidator, name) )
         return false;
 
-    m_list = new wxListView
+    m_bookctrl = new wxListView
                  (
                     this,
-                    -1,
+                    wxID_LISTBOOKLISTVIEW,
                     wxDefaultPosition,
                     wxDefaultSize,
-                    wxLC_ICON | wxLC_SINGLE_SEL
-                 );
-
-    m_line = new wxStaticLine
-                 (
-                    this,
-                    -1,
-                    wxDefaultPosition,
-                    wxDefaultSize,
-                    IsVertical() ? wxLI_HORIZONTAL : wxLI_VERTICAL
+                    wxLC_ICON | wxLC_SINGLE_SEL |
+                        (IsVertical() ? wxLC_ALIGN_LEFT : wxLC_ALIGN_TOP)
                  );
 
+#ifdef __WXMSW__
+    // On XP with themes enabled the GetViewRect used in GetControllerSize() to
+    // determine the space needed for the list view will incorrectly return
+    // (0,0,0,0) the first time.  So send a pending event so OnSize will be
+    // called again after the window is ready to go.  Technically we don't
+    // need to do this on non-XP windows, but if things are already sized
+    // correctly then nothing changes and so there is no harm.
+    wxSizeEvent evt;
+    GetEventHandler()->AddPendingEvent(evt);
+#endif
     return true;
 }
 
@@ -120,170 +121,53 @@ wxListbook::Create(wxWindow *parent,
 // wxListbook geometry management
 // ----------------------------------------------------------------------------
 
-wxSize wxListbook::GetListSize() const
+wxSize wxListbook::GetControllerSize() const
 {
-    const wxSize sizeClient = GetClientSize();
-
-    // we need to find the longest/tallest label
-    wxCoord widthMax = 0,
-            heightMax = 0;
-    const int count = m_list->GetItemCount();
-    if ( count )
-    {
-        for ( int i = 0; i < count; i++ )
-        {
-            wxRect r;
-            m_list->GetItemRect(i, r);
-
-            wxCoord w = r.x + r.width,
-                    h = r.y + r.height;
-
-            if ( w > widthMax )
-                widthMax = w;
-            if ( h > heightMax )
-                heightMax = h;
-        }
-    }
+    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 = heightMax;
+        size.y = sizeList.y;
     }
     else // left/right aligned
     {
-        size.x = widthMax + 10;
+        size.x = sizeList.x;
         size.y = sizeClient.y;
     }
 
     return size;
 }
 
-wxRect wxListbook::GetPageRect() const
-{
-    const wxSize sizeList = GetListSize();
-
-    wxRect rectPage(wxPoint(0, 0), GetClientSize());
-    switch ( GetWindowStyle() & wxLB_ALIGN_MASK )
-    {
-        default:
-            wxFAIL_MSG( _T("unexpected wxListbook alignment") );
-            // fall through
-
-        case wxLB_TOP:
-            rectPage.y = sizeList.y + MARGIN;
-            // fall through
-
-        case wxLB_BOTTOM:
-            rectPage.height -= sizeList.y + MARGIN;
-            break;
-
-        case wxLB_LEFT:
-            rectPage.x = sizeList.x + MARGIN;
-            // fall through
-
-        case wxLB_RIGHT:
-            rectPage.width -= sizeList.x + MARGIN;
-            break;
-    }
-
-    return rectPage;
-}
-
 void wxListbook::OnSize(wxSizeEvent& event)
 {
-    // resize the list control and the page area to fit inside our new size
-    const wxSize sizeClient = GetClientSize(),
-                 sizeList = GetListSize();
-
-    wxPoint posList;
-    switch ( GetWindowStyle() & wxLB_ALIGN_MASK )
-    {
-        default:
-            wxFAIL_MSG( _T("unexpected wxListbook alignment") );
-            // fall through
-
-        case wxLB_TOP:
-        case wxLB_LEFT:
-            // posList is already ok
-            break;
-
-        case wxLB_BOTTOM:
-            posList.y = sizeClient.y - sizeList.y;
-            break;
-
-        case wxLB_RIGHT:
-            posList.x = sizeClient.x - sizeList.x;
-            break;
-    }
-
-    m_list->SetSize(posList.x, posList.y, sizeList.x, sizeList.y);
-
-    if ( m_line )
-    {
-        wxRect rectLine(wxPoint(0, 0), sizeClient);
-
-        switch ( GetWindowStyle() & wxLB_ALIGN_MASK )
-        {
-            case wxLB_TOP:
-                rectLine.y = sizeList.y + 1;
-                rectLine.height = MARGIN - 2;
-                break;
-
-            case wxLB_BOTTOM:
-                rectLine.height = MARGIN - 2;
-                rectLine.y = sizeClient.y - sizeList.y - rectLine.height;
-                break;
-
-            case wxLB_LEFT:
-                rectLine.x = sizeList.x + 1;
-                rectLine.width = MARGIN - 2;
-                break;
-
-            case wxLB_RIGHT:
-                rectLine.width = MARGIN - 2;
-                rectLine.x = sizeClient.x - sizeList.x - rectLine.width;
-                break;
-        }
-
-        m_line->SetSize(rectLine);
-    }
-
-    // we should always have some selection if possible
-    if ( m_selection == wxNOT_FOUND && GetPageCount() )
-    {
-        SetSelection(0);
-    }
-
-    if ( m_selection != wxNOT_FOUND )
-    {
-        wxWindow *page = m_pages[m_selection];
-        wxCHECK_RET( page, _T("NULL page in wxListbook?") );
-
-        page->SetSize(GetPageRect());
-        if ( !page->IsShown() )
-        {
-            page->Show();
-        }
-    }
-
-    event.Skip();
+    // arrange the icons before calling SetClientSize(), otherwise it wouldn't
+    // account for the scrollbars the list control might need and, at least
+    // 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);
 }
 
 wxSize wxListbook::CalcSizeFromPage(const wxSize& sizePage) const
 {
-    // we need to add the size of the list control and the margin
-    const wxSize sizeList = GetListSize();
+    // 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 + MARGIN;
+        size.y += sizeList.y + GetInternalBorder();
     }
     else // left/right aligned
     {
-        size.x += sizeList.x + MARGIN;
+        size.x += sizeList.x + GetInternalBorder();
     }
 
     return size;
@@ -296,26 +180,26 @@ wxSize wxListbook::CalcSizeFromPage(const wxSize& sizePage) const
 
 bool wxListbook::SetPageText(size_t n, const wxString& strText)
 {
-    m_list->SetItemText(n, strText);
+    GetListView()->SetItemText(n, strText);
 
     return true;
 }
 
 wxString wxListbook::GetPageText(size_t n) const
 {
-    return m_list->GetItemText(n);
+    return GetListView()->GetItemText(n);
 }
 
 int wxListbook::GetPageImage(size_t WXUNUSED(n)) const
 {
     wxFAIL_MSG( _T("wxListbook::GetPageImage() not implemented") );
 
-    return -1;
+    return wxNOT_FOUND;
 }
 
 bool wxListbook::SetPageImage(size_t n, int imageId)
 {
-    return m_list->SetItemImage(n, imageId, imageId);
+    return GetListView()->SetItemImage(n, imageId);
 }
 
 // ----------------------------------------------------------------------------
@@ -324,9 +208,9 @@ bool wxListbook::SetPageImage(size_t n, int imageId)
 
 void wxListbook::SetImageList(wxImageList *imageList)
 {
-    m_list->SetImageList(imageList, wxIMAGE_LIST_NORMAL);
+    GetListView()->SetImageList(imageList, wxIMAGE_LIST_NORMAL);
 
-    wxBookCtrl::SetImageList(imageList);
+    wxBookCtrlBase::SetImageList(imageList);
 }
 
 // ----------------------------------------------------------------------------
@@ -340,23 +224,40 @@ int wxListbook::GetSelection() const
 
 int wxListbook::SetSelection(size_t n)
 {
-    wxCHECK_MSG( n < GetPageCount(), wxNOT_FOUND,
-                 _T("invalid page index in wxListbook::SetSelection()") );
+    wxCHECK_MSG( IS_VALID_PAGE(n), wxNOT_FOUND,
+                 wxT("invalid page index in wxListbook::SetSelection()") );
 
-    int selOld = m_selection;
+    const int oldSel = m_selection;
 
-    if ( (int)n != m_selection )
+    if ( int(n) != m_selection )
     {
-        m_selection = n;
+        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();
 
-        m_list->Select(m_selection);
-        m_list->Focus(m_selection);
+            // 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 selOld;
+    return oldSel;
 }
 
-
 // ----------------------------------------------------------------------------
 // adding/removing the pages
 // ----------------------------------------------------------------------------
@@ -368,36 +269,78 @@ wxListbook::InsertPage(size_t n,
                        bool bSelect,
                        int imageId)
 {
-    if ( !wxBookCtrl::InsertPage(n, page, text, bSelect, imageId) )
+    if ( !wxBookCtrlBase::InsertPage(n, page, text, bSelect, imageId) )
         return false;
 
-    m_list->InsertItem(n, text, imageId);
+    GetListView()->InsertItem(n, text, imageId);
 
-    if ( bSelect )
+    // if the inserted page is before the selected one, we must update the
+    // index of the selected page
+    if ( int(n) <= m_selection )
     {
-        m_list->Select(n);
-        m_list->Focus(n);
+        // one extra page added
+        m_selection++;
+        GetListView()->Select(m_selection);
+        GetListView()->Focus(m_selection);
     }
-    else // don't select this page
-    {
-        // it will be shown only when selected
+
+    // 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 )
         page->Hide();
-    }
 
+    if ( selNew != -1 )
+        SetSelection(selNew);
+
+    InvalidateBestSize();
+    GetListView()->Arrange();
     return true;
 }
 
 wxWindow *wxListbook::DoRemovePage(size_t page)
 {
-    wxWindow *win = wxBookCtrl::DoRemovePage(page);
+    const size_t page_count = GetPageCount();
+    wxWindow *win = wxBookCtrlBase::DoRemovePage(page);
+
     if ( win )
     {
-        m_list->DeleteItem(page);
+        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);
+        }
+
+        GetListView()->Arrange();
     }
 
     return win;
 }
 
+
+bool wxListbook::DeleteAllPages()
+{
+    GetListView()->DeleteAllItems();
+    return wxBookCtrlBase::DeleteAllPages();
+}
+
 // ----------------------------------------------------------------------------
 // wxListbook events
 // ----------------------------------------------------------------------------
@@ -414,33 +357,14 @@ void wxListbook::OnListSelected(wxListEvent& eventList)
         return;
     }
 
-    // first send "change in progress" event which may be vetoed by user
-    wxListbookEvent eventIng(wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING, GetId());
+    SetSelection(selNew);
 
-    eventIng.SetEventObject(this);
-    eventIng.SetSelection(selNew);
-    eventIng.SetOldSelection(m_selection);
-    if ( GetEventHandler()->ProcessEvent(eventIng) && !eventIng.IsAllowed() )
+    // change wasn't allowed, return to previous state
+    if (m_selection != selNew)
     {
-        m_list->Select(m_selection);
-        return;
+        GetListView()->Select(m_selection);
+        GetListView()->Focus(m_selection);
     }
-
-    // change allowed: do change the page and notify the user about it
-    if ( m_selection != wxNOT_FOUND )
-        m_pages[m_selection]->Hide();
-    wxWindow *page = m_pages[m_selection = selNew];
-    page->SetSize(GetPageRect());
-    page->Show();
-
-    wxListbookEvent eventEd(wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED, GetId());
-
-    eventEd.SetEventObject(this);
-    eventEd.SetSelection(selNew);
-    eventEd.SetOldSelection(m_selection);
-
-    (void)GetEventHandler()->ProcessEvent(eventEd);
 }
 
 #endif // wxUSE_LISTBOOK
-