X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/716dc24570f542fd68df9edf5c54e178a7c58bdd..533544f2ea53be44a511dfd795db61c15a596e85:/src/generic/listbkg.cpp?ds=sidebyside diff --git a/src/generic/listbkg.cpp b/src/generic/listbkg.cpp index 34d726efe7..1985558dfa 100644 --- a/src/generic/listbkg.cpp +++ b/src/generic/listbkg.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: generic/listbkg.cpp +// Name: src/generic/listbkg.cpp // Purpose: generic implementation of wxListbook // Author: Vadim Zeitlin // Modified by: @@ -17,10 +17,6 @@ // 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" @@ -36,14 +32,6 @@ #include "wx/imaglist.h" #include "wx/settings.h" -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -// margin between the list and the page, should be bigger than wxStaticLine -// size -const wxCoord MARGIN = 5; - // ---------------------------------------------------------------------------- // various wxWidgets macros // ---------------------------------------------------------------------------- @@ -55,14 +43,14 @@ const wxCoord MARGIN = 5; // 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_LISTBOOKLISTVIEW, wxListbook::OnListSelected) END_EVENT_TABLE() @@ -77,10 +65,6 @@ END_EVENT_TABLE() void wxListbook::Init() { - m_list = NULL; -#if wxUSE_LINE_IN_LISTBOOK - m_line = NULL; -#endif // wxUSE_LINE_IN_LISTBOOK m_selection = wxNOT_FOUND; } @@ -92,12 +76,12 @@ 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__ } @@ -110,7 +94,7 @@ wxListbook::Create(wxWindow *parent, wxDefaultValidator, name) ) return false; - m_list = new wxListView + m_bookctrl = new wxListView ( this, wxID_LISTBOOKLISTVIEW, @@ -120,21 +104,10 @@ wxListbook::Create(wxWindow *parent, (IsVertical() ? wxLC_ALIGN_LEFT : wxLC_ALIGN_TOP) ); -#if wxUSE_LINE_IN_LISTBOOK - m_line = new wxStaticLine - ( - this, - wxID_ANY, - wxDefaultPosition, - wxDefaultSize, - IsVertical() ? wxLI_HORIZONTAL : wxLI_VERTICAL - ); -#endif // wxUSE_LINE_IN_LISTBOOK - #ifdef __WXMSW__ - // On XP with themes enabled the GetViewRect used in GetListSize to + // 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 wiull be + // (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. @@ -148,12 +121,14 @@ wxListbook::Create(wxWindow *parent, // wxListbook geometry management // ---------------------------------------------------------------------------- -wxSize wxListbook::GetListSize() const +wxSize wxListbook::GetControllerSize() const { const wxSize sizeClient = GetClientSize(), - sizeList = m_list->GetViewRect().GetSize(); + sizeBorder = m_bookctrl->GetSize() - m_bookctrl->GetClientSize(), + sizeList = GetListView()->GetViewRect().GetSize() + sizeBorder; wxSize size; + if ( IsVertical() ) { size.x = sizeClient.x; @@ -168,129 +143,31 @@ wxSize wxListbook::GetListSize() const return size; } -wxRect wxListbook::GetPageRect() const -{ - const wxSize sizeList = m_list->GetSize(); - - 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) { - event.Skip(); - - if ( !m_list ) - { - // we're not fully created yet - return; - } - - // 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->Move(posList.x, posList.y); - m_list->SetClientSize(sizeList.x, sizeList.y); - -#if wxUSE_LINE_IN_LISTBOOK - 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); - } -#endif // wxUSE_LINE_IN_LISTBOOK - - // resize the currently shown page - if (m_selection != wxNOT_FOUND ) - { - wxWindow *page = m_pages[m_selection]; - wxCHECK_RET( page, _T("NULL page in wxListbook?") ); - page->SetSize(GetPageRect()); - } + // 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; @@ -303,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); + return GetListView()->SetItemImage(n, imageId); } // ---------------------------------------------------------------------------- @@ -331,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); } // ---------------------------------------------------------------------------- @@ -369,8 +246,8 @@ int wxListbook::SetSelection(size_t n) // change m_selection now to ignore the selection change event m_selection = n; - m_list->Select(n); - m_list->Focus(n); + GetListView()->Select(n); + GetListView()->Focus(n); // program allows the page change event.SetEventType(wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED); @@ -392,19 +269,19 @@ 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 the inserted page is before the selected one, we must update the // index of the selected page if ( int(n) <= m_selection ) { - // one extra page added + // one extra page added m_selection++; - m_list->Select(m_selection); - m_list->Focus(m_selection); + GetListView()->Select(m_selection); + GetListView()->Focus(m_selection); } // some page should be selected: either this one or the first one if there @@ -422,17 +299,18 @@ wxListbook::InsertPage(size_t n, SetSelection(selNew); InvalidateBestSize(); + GetListView()->Arrange(); return true; } wxWindow *wxListbook::DoRemovePage(size_t page) { - const int page_count = GetPageCount(); - 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) { @@ -449,6 +327,8 @@ wxWindow *wxListbook::DoRemovePage(size_t page) if ((sel != wxNOT_FOUND) && (sel != m_selection)) SetSelection(sel); } + + GetListView()->Arrange(); } return win; @@ -457,8 +337,8 @@ wxWindow *wxListbook::DoRemovePage(size_t page) bool wxListbook::DeleteAllPages() { - m_list->DeleteAllItems(); - return wxBookCtrl::DeleteAllPages(); + GetListView()->DeleteAllItems(); + return wxBookCtrlBase::DeleteAllPages(); } // ---------------------------------------------------------------------------- @@ -482,10 +362,9 @@ void wxListbook::OnListSelected(wxListEvent& eventList) // change wasn't allowed, return to previous state if (m_selection != selNew) { - m_list->Select(m_selection); - m_list->Focus(m_selection); + GetListView()->Select(m_selection); + GetListView()->Focus(m_selection); } } #endif // wxUSE_LISTBOOK -