#if wxUSE_CHOICEBOOK
-#include "wx/choice.h"
#include "wx/choicebk.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/settings.h"
+ #include "wx/choice.h"
+ #include "wx/sizer.h"
+#endif
+
#include "wx/imaglist.h"
-#include "wx/settings.h"
-#include "wx/sizer.h"
// ----------------------------------------------------------------------------
// various wxWidgets macros
// ----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxChoicebook, wxBookCtrlBase)
-IMPLEMENT_DYNAMIC_CLASS(wxChoicebookEvent, wxNotifyEvent)
-const wxEventType wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING = wxNewEventType();
-const wxEventType wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED = wxNewEventType();
-const int wxID_CHOICEBOOKCHOICE = wxNewId();
+wxDEFINE_EVENT( wxEVT_CHOICEBOOK_PAGE_CHANGING, wxBookCtrlEvent );
+wxDEFINE_EVENT( wxEVT_CHOICEBOOK_PAGE_CHANGED, wxBookCtrlEvent );
BEGIN_EVENT_TABLE(wxChoicebook, wxBookCtrlBase)
- EVT_CHOICE(wxID_CHOICEBOOKCHOICE, wxChoicebook::OnChoiceSelected)
+ EVT_CHOICE(wxID_ANY, wxChoicebook::OnChoiceSelected)
END_EVENT_TABLE()
// ============================================================================
// wxChoicebook creation
// ----------------------------------------------------------------------------
-void wxChoicebook::Init()
-{
- m_selection = wxNOT_FOUND;
-}
-
bool
wxChoicebook::Create(wxWindow *parent,
wxWindowID id,
m_bookctrl = new wxChoice
(
this,
- wxID_CHOICEBOOKCHOICE,
+ wxID_ANY,
wxDefaultPosition,
wxDefaultSize
);
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;
}
-// ----------------------------------------------------------------------------
-// wxChoicebook geometry management
-// ----------------------------------------------------------------------------
-
-wxSize wxChoicebook::GetControllerSize() const
-{
- const wxSize sizeClient = GetClientSize(),
- // sizeChoice = m_bookctrl->GetBestFittingSize();
- 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
// ----------------------------------------------------------------------------
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
// selection
// ----------------------------------------------------------------------------
-int wxChoicebook::GetSelection() const
+wxBookCtrlEvent* wxChoicebook::CreatePageChangingEvent() const
{
- return m_selection;
+ return new wxBookCtrlEvent(wxEVT_CHOICEBOOK_PAGE_CHANGING, m_windowId);
}
-int wxChoicebook::SetSelection(size_t n)
+void wxChoicebook::MakeChangedEvent(wxBookCtrlEvent &event)
{
- 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 oldSel;
+ event.SetEventType(wxEVT_CHOICEBOOK_PAGE_CHANGED);
}
// ----------------------------------------------------------------------------
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);
-
- 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)
- {
- // 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);
- }
+ DoSetSelectionAfterRemoval(page);
}
return win;
void wxChoicebook::OnChoiceSelected(wxCommandEvent& eventChoice)
{
+ if ( eventChoice.GetEventObject() != m_bookctrl )
+ {
+ eventChoice.Skip();
+ return;
+ }
+
const int selNew = eventChoice.GetSelection();
if ( selNew == m_selection )
projects / wxWidgets.git / blobdiff