X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ae03fa2c9610d107a0d902622a93f17fa04aebf0..6d3ef2255e608c68954a61323176856332086368:/src/generic/listbkg.cpp diff --git a/src/generic/listbkg.cpp b/src/generic/listbkg.cpp index 88d84cee38..313205d051 100644 --- a/src/generic/listbkg.cpp +++ b/src/generic/listbkg.cpp @@ -45,7 +45,14 @@ const wxCoord MARGIN = 5; // ---------------------------------------------------------------------------- -// various wxWindows macros +// various wxWidgets macros +// ---------------------------------------------------------------------------- + +// check that the page index is valid +#define IS_VALID_PAGE(nPage) ((nPage) < GetPageCount()) + +// ---------------------------------------------------------------------------- +// event table // ---------------------------------------------------------------------------- IMPLEMENT_DYNAMIC_CLASS(wxListbook, wxControl) @@ -57,7 +64,6 @@ const int wxID_LISTBOOKLISTVIEW = wxNewId(); BEGIN_EVENT_TABLE(wxListbook, wxBookCtrl) EVT_SIZE(wxListbook::OnSize) - EVT_LIST_ITEM_SELECTED(wxID_LISTBOOKLISTVIEW, wxListbook::OnListSelected) END_EVENT_TABLE() @@ -72,7 +78,9 @@ 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; } @@ -93,6 +101,11 @@ wxListbook::Create(wxWindow *parent, #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; @@ -103,19 +116,31 @@ wxListbook::Create(wxWindow *parent, wxID_LISTBOOKLISTVIEW, wxDefaultPosition, wxDefaultSize, - wxBORDER_NONE | wxLC_ICON | wxLC_SINGLE_SEL | + wxLC_ICON | wxLC_SINGLE_SEL | (IsVertical() ? wxLC_ALIGN_LEFT : wxLC_ALIGN_TOP) ); +#if wxUSE_LINE_IN_LISTBOOK m_line = new wxStaticLine ( this, - -1, + 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 + // 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 + // 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; } @@ -212,6 +237,7 @@ void wxListbook::OnSize(wxSizeEvent& event) 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); @@ -241,24 +267,15 @@ void wxListbook::OnSize(wxSizeEvent& event) m_line->SetSize(rectLine); } +#endif // wxUSE_LINE_IN_LISTBOOK - // we should always have some selection if possible - if ( m_selection == wxNOT_FOUND && GetPageCount() ) - { - SetSelection(0); - } - - if ( m_selection != wxNOT_FOUND ) + // 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()); - if ( !page->IsShown() ) - { - page->Show(); } - } } wxSize wxListbook::CalcSizeFromPage(const wxSize& sizePage) const @@ -330,23 +347,39 @@ 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(); - m_list->Select(m_selection); - m_list->Focus(m_selection); + wxWindow *page = m_pages[n]; + page->SetSize(GetPageRect()); + page->Show(); + + m_selection = n; + m_list->Select(n); + m_list->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 // ---------------------------------------------------------------------------- @@ -363,10 +396,10 @@ wxListbook::InsertPage(size_t n, m_list->InsertItem(n, text, imageId); - if ( bSelect ) + // we should always have some selection if possible + if ( bSelect || (m_selection == wxNOT_FOUND) ) { - m_list->Select(n); - m_list->Focus(n); + SetSelection(n); } else // don't select this page { @@ -374,20 +407,46 @@ wxListbook::InsertPage(size_t n, page->Hide(); } + InvalidateBestSize(); return true; } wxWindow *wxListbook::DoRemovePage(size_t page) { + const int page_count = GetPageCount(); wxWindow *win = wxBookCtrl::DoRemovePage(page); + if ( win ) { m_list->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); + } } return win; } + +bool wxListbook::DeleteAllPages() +{ + m_list->DeleteAllItems(); + return wxBookCtrl::DeleteAllPages(); +} + // ---------------------------------------------------------------------------- // wxListbook events // ---------------------------------------------------------------------------- @@ -395,6 +454,7 @@ wxWindow *wxListbook::DoRemovePage(size_t page) void wxListbook::OnListSelected(wxListEvent& eventList) { const int selNew = eventList.GetIndex(); + const int selOld = m_selection; if ( selNew == m_selection ) { @@ -409,7 +469,7 @@ void wxListbook::OnListSelected(wxListEvent& eventList) eventIng.SetEventObject(this); eventIng.SetSelection(selNew); - eventIng.SetOldSelection(m_selection); + eventIng.SetOldSelection(selOld); if ( GetEventHandler()->ProcessEvent(eventIng) && !eventIng.IsAllowed() ) { m_list->Select(m_selection); @@ -417,17 +477,13 @@ void wxListbook::OnListSelected(wxListEvent& eventList) } // 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(); + SetSelection(selNew); wxListbookEvent eventEd(wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED, GetId()); eventEd.SetEventObject(this); eventEd.SetSelection(selNew); - eventEd.SetOldSelection(m_selection); + eventEd.SetOldSelection(selOld); (void)GetEventHandler()->ProcessEvent(eventEd); }