// 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"
wxSize wxChoicebook::GetChoiceSize() const
{
const wxSize sizeClient = GetClientSize(),
- sizeChoice = m_choice->GetBestSize();
+ sizeChoice = m_choice->GetBestFittingSize();
wxSize size;
if ( IsVertical() )
wxRect wxChoicebook::GetPageRect() const
{
- const wxSize sizeChoice = m_choice->GetSize();
+ const wxSize sizeChoice = m_choice->GetBestFittingSize();
wxPoint pt;
wxRect rectPage(pt, GetClientSize());
break;
}
- m_choice->Move(posChoice.x, posChoice.y);
- m_choice->SetSize(sizeChoice.x, sizeChoice.y);
+ m_choice->Move(posChoice);
+ m_choice->SetSize(sizeChoice);
// resize the currently shown page
if ( m_selection != wxNOT_FOUND )
{
wxFAIL_MSG( _T("wxChoicebook::GetPageImage() not implemented") );
- return -1;
+ return wxNOT_FOUND;
}
bool wxChoicebook::SetPageImage(size_t WXUNUSED(n), int WXUNUSED(imageId))