///////////////////////////////////////////////////////////////////////////////
-// 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
#include "wx/imaglist.h"
#include "wx/settings.h"
-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-
-// margin between the choice and the page
-#if defined(__WXWINCE__)
-const wxCoord MARGIN = 1;
-#else
-const wxCoord MARGIN = 5;
-#endif
-
// ----------------------------------------------------------------------------
// various wxWidgets macros
// ----------------------------------------------------------------------------
// event table
// ----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxChoicebook, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxChoicebook, wxBookCtrlBase)
IMPLEMENT_DYNAMIC_CLASS(wxChoicebookEvent, wxNotifyEvent)
const wxEventType wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING = wxNewEventType();
const int wxID_CHOICEBOOKCHOICE = wxNewId();
BEGIN_EVENT_TABLE(wxChoicebook, wxBookCtrlBase)
- EVT_SIZE(wxChoicebook::OnSize)
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,
// wxChoicebook geometry management
// ----------------------------------------------------------------------------
-wxSize wxChoicebook::GetChoiceSize() const
+wxSize wxChoicebook::GetControllerSize() const
{
const wxSize sizeClient = GetClientSize(),
- sizeChoice = m_choice->GetBestFittingSize();
+ sizeChoice = m_bookctrl->GetBestFittingSize();
wxSize size;
if ( IsVertical() )
return size;
}
-wxRect wxChoicebook::GetPageRect() const
-{
- const wxSize sizeChoice = m_choice->GetBestFittingSize();
-
- wxPoint pt;
- wxRect rectPage(pt, 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);
- m_choice->SetSize(sizeChoice);
-
- // resize the currently shown page
- if ( m_selection != wxNOT_FOUND )
- {
- wxWindow *page = m_pages[m_selection];
- wxCHECK_RET( page, _T("NULL page in wxChoicebook?") );
- page->SetSize(GetPageRect());
- }
-}
-
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
// change m_selection now to ignore the selection change event
m_selection = n;
- m_choice->Select(n);
+ GetChoiceCtrl()->Select(n);
// program allows the page change
event.SetEventType(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED);
if ( !wxBookCtrlBase::InsertPage(n, page, text, bSelect, imageId) )
return false;
- m_choice->Insert(text, n);
+ GetChoiceCtrl()->Insert(text, n);
// if the inserted page is before the selected one, we must update the
// index of the selected page
{
// one extra page added
m_selection++;
- m_choice->Select(m_selection);
+ GetChoiceCtrl()->Select(m_selection);
}
// some page should be selected: either this one or the first one if there
// is still no selection
- int selNew = -1;
+ int selNew = wxNOT_FOUND;
if ( bSelect )
selNew = n;
- else if ( m_selection == -1 )
+ else if ( m_selection == wxNOT_FOUND )
selNew = 0;
if ( selNew != m_selection )
page->Hide();
- if ( selNew != -1 )
+ if ( selNew != wxNOT_FOUND )
SetSelection(selNew);
InvalidateBestSize();
wxWindow *wxChoicebook::DoRemovePage(size_t page)
{
- const int page_count = GetPageCount();
+ 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)
{
bool wxChoicebook::DeleteAllPages()
{
- m_choice->Clear();
+ GetChoiceCtrl()->Clear();
return wxBookCtrlBase::DeleteAllPages();
}
// change wasn't allowed, return to previous state
if (m_selection != selNew)
- m_choice->Select(m_selection);
+ GetChoiceCtrl()->Select(m_selection);
}
#endif // wxUSE_CHOICEBOOK
projects / wxWidgets.git / blobdiff