X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ed2fbeb835854c97d176f8bdfd6f06a84273f5d7..b879becf6af686ab38d1c67799d837c64fb4833d:/src/generic/choicbkg.cpp?ds=sidebyside diff --git a/src/generic/choicbkg.cpp b/src/generic/choicbkg.cpp index 445d0f575a..dc93e2b292 100644 --- a/src/generic/choicbkg.cpp +++ b/src/generic/choicbkg.cpp @@ -48,16 +48,12 @@ // ---------------------------------------------------------------------------- IMPLEMENT_DYNAMIC_CLASS(wxChoicebook, wxBookCtrlBase) -IMPLEMENT_DYNAMIC_CLASS(wxChoicebookEvent, wxNotifyEvent) -#if !WXWIN_COMPATIBILITY_EVENT_TYPES -const wxEventType wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING = wxNewEventType(); -const wxEventType wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED = wxNewEventType(); -#endif -const int wxID_CHOICEBOOKCHOICE = wxNewId(); +wxDEFINE_EVENT( wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING, wxBookCtrlEvent ); +wxDEFINE_EVENT( wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED, wxBookCtrlEvent ); BEGIN_EVENT_TABLE(wxChoicebook, wxBookCtrlBase) - EVT_CHOICE(wxID_CHOICEBOOKCHOICE, wxChoicebook::OnChoiceSelected) + EVT_CHOICE(wxID_ANY, wxChoicebook::OnChoiceSelected) END_EVENT_TABLE() // ============================================================================ @@ -98,7 +94,7 @@ wxChoicebook::Create(wxWindow *parent, m_bookctrl = new wxChoice ( this, - wxID_CHOICEBOOKCHOICE, + wxID_ANY, wxDefaultPosition, wxDefaultSize ); @@ -110,7 +106,7 @@ wxChoicebook::Create(wxWindow *parent, m_controlSizer = new wxBoxSizer(IsVertical() ? wxHORIZONTAL : wxVERTICAL); m_controlSizer->Add(m_bookctrl, 1, (IsVertical() ? wxALIGN_CENTRE_VERTICAL : wxALIGN_CENTRE) |wxGROW, 0); - mainSizer->Add(m_controlSizer, 0, wxGROW|wxALL, m_controlMargin); + mainSizer->Add(m_controlSizer, 0, (IsVertical() ? (int) wxGROW : (int) wxALIGN_CENTRE_VERTICAL)|wxALL, m_controlMargin); SetSizer(mainSizer); return true; } @@ -122,7 +118,6 @@ wxChoicebook::Create(wxWindow *parent, wxSize wxChoicebook::GetControllerSize() const { const wxSize sizeClient = GetClientSize(), - // sizeChoice = m_bookctrl->GetBestFittingSize(); sizeChoice = m_controlSizer->CalcMin(); wxSize size; @@ -148,11 +143,15 @@ wxSize wxChoicebook::CalcSizeFromPage(const wxSize& sizePage) const wxSize size = sizePage; if ( IsVertical() ) { + if ( sizeChoice.x > sizePage.x ) + size.x = sizeChoice.x; size.y += sizeChoice.y + GetInternalBorder(); } else // left/right aligned { size.x += sizeChoice.x + GetInternalBorder(); + if ( sizeChoice.y > sizePage.y ) + size.y = sizeChoice.y; } return size; @@ -190,9 +189,16 @@ bool wxChoicebook::SetPageImage(size_t WXUNUSED(n), int WXUNUSED(imageId)) } // ---------------------------------------------------------------------------- -// 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 @@ -209,39 +215,14 @@ int wxChoicebook::GetSelection() const return m_selection; } -int wxChoicebook::SetSelection(size_t n) +wxBookCtrlEvent* wxChoicebook::CreatePageChangingEvent() const { - wxCHECK_MSG( IS_VALID_PAGE(n), wxNOT_FOUND, - wxT("invalid page index in wxChoicebook::SetSelection()") ); - - const int oldSel = m_selection; - - if ( int(n) != m_selection ) - { - wxChoicebookEvent event(wxEVT_COMMAND_CHOICEBOOK_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; - GetChoiceCtrl()->Select(n); - - // program allows the page change - event.SetEventType(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED); - (void)GetEventHandler()->ProcessEvent(event); - } - } + return new wxBookCtrlEvent(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING, m_windowId); +} - return oldSel; +void wxChoicebook::MakeChangedEvent(wxBookCtrlEvent &event) +{ + event.SetEventType(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED); } // ---------------------------------------------------------------------------- @@ -283,34 +264,33 @@ wxChoicebook::InsertPage(size_t n, if ( selNew != wxNOT_FOUND ) SetSelection(selNew); - InvalidateBestSize(); return true; } wxWindow *wxChoicebook::DoRemovePage(size_t page) { - const size_t page_count = GetPageCount(); wxWindow *win = wxBookCtrlBase::DoRemovePage(page); if ( win ) { GetChoiceCtrl()->Delete(page); - if (m_selection >= (int)page) + if ( m_selection >= (int)page ) { - // force new sel valid if possible - int sel = m_selection - 1; - if (page_count == 1) + // ensure that the selection is valid + int sel; + if ( GetPageCount() == 0 ) sel = wxNOT_FOUND; - else if ((page_count == 2) || (sel == -1)) - sel = 0; + else + sel = m_selection ? m_selection - 1 : 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 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)) + if ( sel != wxNOT_FOUND && sel != m_selection ) SetSelection(sel); - } + } } return win; @@ -319,6 +299,7 @@ wxWindow *wxChoicebook::DoRemovePage(size_t page) bool wxChoicebook::DeleteAllPages() { + m_selection = wxNOT_FOUND; GetChoiceCtrl()->Clear(); return wxBookCtrlBase::DeleteAllPages(); } @@ -329,6 +310,12 @@ bool wxChoicebook::DeleteAllPages() void wxChoicebook::OnChoiceSelected(wxCommandEvent& eventChoice) { + if ( eventChoice.GetEventObject() != m_bookctrl ) + { + eventChoice.Skip(); + return; + } + const int selNew = eventChoice.GetSelection(); if ( selNew == m_selection )