///////////////////////////////////////////////////////////////////////////////
-// Name: generic/choicbkg.cpp
+// Name: src/generic/choicbkg.cpp
// Purpose: generic implementation of wxChoicebook
// Author: Vadim Zeitlin
// Modified by: Wlodzimierz ABX Skiba from generic/listbkg.cpp
// headers
// ----------------------------------------------------------------------------
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma implementation "choicebook.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#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"
// ----------------------------------------------------------------------------
-// constants
+// various wxWidgets macros
// ----------------------------------------------------------------------------
-// margin between the choice and the page
-#if defined(__WXWINCE__)
-const wxCoord MARGIN = 1;
-#else
-const wxCoord MARGIN = 5;
-#endif
+// check that the page index is valid
+#define IS_VALID_PAGE(nPage) ((nPage) < GetPageCount())
// ----------------------------------------------------------------------------
-// various wxWidgets macros
+// event table
// ----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxChoicebook, wxControl)
+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();
-BEGIN_EVENT_TABLE(wxChoicebook, wxBookCtrl)
- EVT_SIZE(wxChoicebook::OnSize)
+BEGIN_EVENT_TABLE(wxChoicebook, wxBookCtrlBase)
EVT_CHOICE(wxID_CHOICEBOOKCHOICE, wxChoicebook::OnChoiceSelected)
END_EVENT_TABLE()
void wxChoicebook::Init()
{
- m_choice = NULL;
m_selection = wxNOT_FOUND;
}
long style,
const wxString& name)
{
- if ( (style & wxCHB_ALIGN_MASK) == wxCHB_DEFAULT )
+ if ( (style & wxBK_ALIGN_MASK) == wxBK_DEFAULT )
{
- style |= wxCHB_TOP;
+ style |= wxBK_TOP;
}
// no border for this control, it doesn't look nice together with
wxDefaultValidator, name) )
return false;
- m_choice = new wxChoice
+ m_bookctrl = new wxChoice
(
this,
wxID_CHOICEBOOKCHOICE,
wxDefaultSize
);
+ wxSizer* mainSizer = new wxBoxSizer(IsVertical() ? wxVERTICAL : wxHORIZONTAL);
+
+ if (style & wxBK_RIGHT || style & wxBK_BOTTOM)
+ mainSizer->Add(0, 0, 1, wxEXPAND, 0);
+
+ 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);
+ SetSizer(mainSizer);
return true;
}
// wxChoicebook geometry management
// ----------------------------------------------------------------------------
-wxSize wxChoicebook::GetChoiceSize() const
+wxSize wxChoicebook::GetControllerSize() const
{
const wxSize sizeClient = GetClientSize(),
- sizeChoice = m_choice->GetBestSize();
+ // sizeChoice = m_bookctrl->GetBestFittingSize();
+ sizeChoice = m_controlSizer->CalcMin();
wxSize size;
if ( IsVertical() )
return size;
}
-wxRect wxChoicebook::GetPageRect() const
-{
- const wxSize sizeChoice = m_choice->GetSize();
-
- wxRect rectPage(wxPoint(0, 0), GetClientSize());
- switch ( GetWindowStyle() & wxCHB_ALIGN_MASK )
- {
- default:
- wxFAIL_MSG( _T("unexpected wxChoicebook alignment") );
- // fall through
-
- case wxCHB_TOP:
- rectPage.y = sizeChoice.y + MARGIN;
- // fall through
-
- case wxCHB_BOTTOM:
- rectPage.height -= sizeChoice.y + MARGIN;
- break;
-
- case wxCHB_LEFT:
- rectPage.x = sizeChoice.x + MARGIN;
- // fall through
-
- case wxCHB_RIGHT:
- rectPage.width -= sizeChoice.x + MARGIN;
- break;
- }
-
- return rectPage;
-}
-
-void wxChoicebook::OnSize(wxSizeEvent& event)
-{
- event.Skip();
-
- if ( !m_choice )
- {
- // we're not fully created yet
- return;
- }
-
- // resize the choice control and the page area to fit inside our new size
- const wxSize sizeClient = GetClientSize(),
- sizeChoice = GetChoiceSize();
-
- wxPoint posChoice;
- switch ( GetWindowStyle() & wxCHB_ALIGN_MASK )
- {
- default:
- wxFAIL_MSG( _T("unexpected wxChoicebook alignment") );
- // fall through
-
- case wxCHB_TOP:
- case wxCHB_LEFT:
- // posChoice is already ok
- break;
-
- case wxCHB_BOTTOM:
- posChoice.y = sizeClient.y - sizeChoice.y;
- break;
-
- case wxCHB_RIGHT:
- posChoice.x = sizeClient.x - sizeChoice.x;
- break;
- }
-
- m_choice->Move(posChoice.x, posChoice.y);
- m_choice->SetSize(sizeChoice.x, sizeChoice.y);
-
- // we should always have some selection if possible
- if ( m_selection == wxNOT_FOUND && GetPageCount() )
- {
- SetSelection(0);
- }
-
- if ( m_selection != wxNOT_FOUND )
- {
- wxWindow *page = m_pages[m_selection];
- wxCHECK_RET( page, _T("NULL page in wxChoicebook?") );
-
- page->SetSize(GetPageRect());
- if ( !page->IsShown() )
- {
- page->Show();
- }
- }
-}
-
wxSize wxChoicebook::CalcSizeFromPage(const wxSize& sizePage) const
{
- // we need to add the size of the choice control and the margin
- const wxSize sizeChoice = GetChoiceSize();
+ // 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 + MARGIN;
+ size.y += sizeChoice.y + GetInternalBorder();
}
else // left/right aligned
{
- size.x += sizeChoice.x + MARGIN;
+ size.x += sizeChoice.x + GetInternalBorder();
}
return size;
bool wxChoicebook::SetPageText(size_t n, const wxString& strText)
{
- m_choice->SetString(n, strText);
+ GetChoiceCtrl()->SetString(n, strText);
return true;
}
wxString wxChoicebook::GetPageText(size_t n) const
{
- return m_choice->GetString(n);
+ return GetChoiceCtrl()->GetString(n);
}
int wxChoicebook::GetPageImage(size_t WXUNUSED(n)) const
{
wxFAIL_MSG( _T("wxChoicebook::GetPageImage() not implemented") );
- return -1;
+ return wxNOT_FOUND;
}
bool wxChoicebook::SetPageImage(size_t WXUNUSED(n), int WXUNUSED(imageId))
{
// TODO: can be implemented in form of static bitmap near choice control
- wxBookCtrl::SetImageList(imageList);
+ wxBookCtrlBase::SetImageList(imageList);
}
// ----------------------------------------------------------------------------
return m_selection;
}
-int wxChoicebook::SetSelection(size_t n)
+wxBookCtrlBaseEvent* wxChoicebook::CreatePageChangingEvent() const
{
- wxCHECK_MSG( n < GetPageCount(), wxNOT_FOUND,
- _T("invalid page index in wxChoicebook::SetSelection()") );
-
- int selOld = m_selection;
-
- if ( (int)n != m_selection )
- {
- m_choice->Select(n);
-
- // change m_selection only now, otherwise OnChoiceSelected() would ignore
- // the selection change event
-
- if ( m_selection != wxNOT_FOUND )
- m_pages[m_selection]->Hide();
- wxWindow *page = m_pages[m_selection = n];
- page->SetSize(GetPageRect());
- page->Show();
- }
-
- return selOld;
+ return new wxChoicebookEvent(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING, m_windowId);
}
+void wxChoicebook::MakeChangedEvent(wxBookCtrlBaseEvent &event)
+{
+ event.SetEventType(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED);
+}
// ----------------------------------------------------------------------------
// adding/removing the pages
bool bSelect,
int imageId)
{
- if ( !wxBookCtrl::InsertPage(n, page, text, bSelect, imageId) )
+ if ( !wxBookCtrlBase::InsertPage(n, page, text, bSelect, imageId) )
return false;
- m_choice->Insert(text, n);
+ GetChoiceCtrl()->Insert(text, n);
- if ( bSelect )
+ // if the inserted page is before the selected one, we must update the
+ // index of the selected page
+ if ( int(n) <= m_selection )
{
- m_choice->Select(n);
+ // one extra page added
+ m_selection++;
+ GetChoiceCtrl()->Select(m_selection);
}
- else // don't select this page
- {
- // it will be shown only when selected
+
+ // 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 )
page->Hide();
- }
+
+ if ( selNew != wxNOT_FOUND )
+ SetSelection(selNew);
InvalidateBestSize();
return true;
wxWindow *wxChoicebook::DoRemovePage(size_t page)
{
- wxWindow *win = wxBookCtrl::DoRemovePage(page);
+ const size_t page_count = GetPageCount();
+ wxWindow *win = wxBookCtrlBase::DoRemovePage(page);
+
if ( win )
{
- m_choice->Delete(page);
+ 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);
+ }
}
return win;
bool wxChoicebook::DeleteAllPages()
{
- m_choice->Clear();
- return wxBookCtrl::DeleteAllPages();
+ GetChoiceCtrl()->Clear();
+ return wxBookCtrlBase::DeleteAllPages();
}
// ----------------------------------------------------------------------------
return;
}
- // first send "change in progress" event which may be vetoed by user
- wxChoicebookEvent eventIng(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING, GetId());
-
- eventIng.SetEventObject(this);
- eventIng.SetSelection(selNew);
- eventIng.SetOldSelection(m_selection);
- if ( GetEventHandler()->ProcessEvent(eventIng) && !eventIng.IsAllowed() )
- {
- m_choice->Select(m_selection);
- return;
- }
-
- // 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();
-
- wxChoicebookEvent eventEd(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED, GetId());
-
- eventEd.SetEventObject(this);
- eventEd.SetSelection(selNew);
- eventEd.SetOldSelection(m_selection);
+ SetSelection(selNew);
- (void)GetEventHandler()->ProcessEvent(eventEd);
+ // change wasn't allowed, return to previous state
+ if (m_selection != selNew)
+ GetChoiceCtrl()->Select(m_selection);
}
#endif // wxUSE_CHOICEBOOK
projects / wxWidgets.git / blobdiff