X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3c7789014106c9269b0f4ecc1a3071b14f351d3f..6f026b5b63fe7ccb025e84509886f74772b9df13:/src/generic/choicbkg.cpp diff --git a/src/generic/choicbkg.cpp b/src/generic/choicbkg.cpp index 9ba0e545e4..e397cc0003 100644 --- a/src/generic/choicbkg.cpp +++ b/src/generic/choicbkg.cpp @@ -4,7 +4,6 @@ // Author: Vadim Zeitlin // Modified by: Wlodzimierz ABX Skiba from generic/listbkg.cpp // Created: 15.09.04 -// RCS-ID: $Id$ // Copyright: (c) Vadim Zeitlin, Wlodzimierz Skiba // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -49,8 +48,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxChoicebook, wxBookCtrlBase) -wxDEFINE_EVENT( wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING, wxBookCtrlEvent ) -wxDEFINE_EVENT( wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED, wxBookCtrlEvent ) +wxDEFINE_EVENT( wxEVT_CHOICEBOOK_PAGE_CHANGING, wxBookCtrlEvent ); +wxDEFINE_EVENT( wxEVT_CHOICEBOOK_PAGE_CHANGED, wxBookCtrlEvent ); BEGIN_EVENT_TABLE(wxChoicebook, wxBookCtrlBase) EVT_CHOICE(wxID_ANY, wxChoicebook::OnChoiceSelected) @@ -64,11 +63,6 @@ END_EVENT_TABLE() // wxChoicebook creation // ---------------------------------------------------------------------------- -void wxChoicebook::Init() -{ - m_selection = wxNOT_FOUND; -} - bool wxChoicebook::Create(wxWindow *parent, wxWindowID id, @@ -111,49 +105,6 @@ wxChoicebook::Create(wxWindow *parent, return true; } -// ---------------------------------------------------------------------------- -// wxChoicebook geometry management -// ---------------------------------------------------------------------------- - -wxSize wxChoicebook::GetControllerSize() const -{ - const wxSize sizeClient = GetClientSize(), - sizeChoice = m_controlSizer->CalcMin(); - - wxSize size; - if ( IsVertical() ) - { - size.x = sizeClient.x; - size.y = sizeChoice.y; - } - else // left/right aligned - { - size.x = sizeChoice.x; - size.y = sizeClient.y; - } - - return size; -} - -wxSize wxChoicebook::CalcSizeFromPage(const wxSize& sizePage) const -{ - // we need to add the size of the choice control and the border between - const wxSize sizeChoice = GetControllerSize(); - - wxSize size = sizePage; - if ( IsVertical() ) - { - size.y += sizeChoice.y + GetInternalBorder(); - } - else // left/right aligned - { - size.x += sizeChoice.x + GetInternalBorder(); - } - - return size; -} - - // ---------------------------------------------------------------------------- // accessing the pages // ---------------------------------------------------------------------------- @@ -172,22 +123,31 @@ wxString wxChoicebook::GetPageText(size_t n) const int wxChoicebook::GetPageImage(size_t WXUNUSED(n)) const { - wxFAIL_MSG( _T("wxChoicebook::GetPageImage() not implemented") ); - return wxNOT_FOUND; } bool wxChoicebook::SetPageImage(size_t WXUNUSED(n), int WXUNUSED(imageId)) { - wxFAIL_MSG( _T("wxChoicebook::SetPageImage() not implemented") ); + // fail silently, the code may be written to use one of several book + // classes and call SetPageImage() unconditionally, it's better to just + // ignore it (which is the best we can do short of rewriting this class to + // use wxBitmapComboBox anyhow) than complain loudly about a rather + // harmless problem return false; } // ---------------------------------------------------------------------------- -// image list stuff +// miscellaneous other stuff // ---------------------------------------------------------------------------- +void wxChoicebook::DoSetWindowVariant(wxWindowVariant variant) +{ + wxBookCtrlBase::DoSetWindowVariant(variant); + if (m_bookctrl) + m_bookctrl->SetWindowVariant(variant); +} + void wxChoicebook::SetImageList(wxImageList *imageList) { // TODO: can be implemented in form of static bitmap near choice control @@ -199,19 +159,14 @@ void wxChoicebook::SetImageList(wxImageList *imageList) // selection // ---------------------------------------------------------------------------- -int wxChoicebook::GetSelection() const -{ - return m_selection; -} - wxBookCtrlEvent* wxChoicebook::CreatePageChangingEvent() const { - return new wxBookCtrlEvent(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING, m_windowId); + return new wxBookCtrlEvent(wxEVT_CHOICEBOOK_PAGE_CHANGING, m_windowId); } void wxChoicebook::MakeChangedEvent(wxBookCtrlEvent &event) { - event.SetEventType(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED); + event.SetEventType(wxEVT_CHOICEBOOK_PAGE_CHANGED); } // ---------------------------------------------------------------------------- @@ -239,20 +194,9 @@ wxChoicebook::InsertPage(size_t n, GetChoiceCtrl()->Select(m_selection); } - // some page should be selected: either this one or the first one if there - // is still no selection - int selNew = wxNOT_FOUND; - if ( bSelect ) - selNew = n; - else if ( m_selection == wxNOT_FOUND ) - selNew = 0; - - if ( selNew != m_selection ) + if ( !DoSetSelectionAfterInsertion(n, bSelect) ) page->Hide(); - if ( selNew != wxNOT_FOUND ) - SetSelection(selNew); - return true; } @@ -264,22 +208,7 @@ wxWindow *wxChoicebook::DoRemovePage(size_t page) { GetChoiceCtrl()->Delete(page); - if ( m_selection >= (int)page ) - { - // ensure that the selection is valid - int sel; - if ( GetPageCount() == 0 ) - sel = wxNOT_FOUND; - else - sel = m_selection ? m_selection - 1 : 0; - - // if deleting current page we shouldn'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); } return win; @@ -288,7 +217,6 @@ wxWindow *wxChoicebook::DoRemovePage(size_t page) bool wxChoicebook::DeleteAllPages() { - m_selection = wxNOT_FOUND; GetChoiceCtrl()->Clear(); return wxBookCtrlBase::DeleteAllPages(); }