Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

On screens with restricted space, it's useful to be able to add controls

Browse Source 
to e.g. the wxChoice control of a wxChoicebook. GetControlSizer
allows an app to do that, and we also add a control margin which
may or may not be respected by individual book controls.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38698 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2006-04-13 14:22:32 +00:00
parent 7a9f5d5a79
commit 87cf52d8ac
4 changed files with 64 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/common/bookctrl.cpp
View File

@@ -60,6 +60,9 @@ void wxBookCtrlBase::Init()
#else
m_internalBorder = 5;
#endif
m_controlMargin = 0;
m_controlSizer = NULL;
}
bool
@@ -264,39 +267,44 @@ void wxBookCtrlBase::DoSize()
// we're not fully created yet or OnSize() should be hidden by derived class
return;
}
// resize controller and the page area to fit inside our new size
const wxSize sizeClient( GetClientSize() ),
sizeBorder( m_bookctrl->GetSize() - m_bookctrl->GetClientSize() ),
sizeCtrl( GetControllerSize() );
m_bookctrl->SetClientSize( sizeCtrl.x - sizeBorder.x, sizeCtrl.y - sizeBorder.y );
const wxSize sizeNew = m_bookctrl->GetSize();
wxPoint posCtrl;
switch ( GetWindowStyle() & wxBK_ALIGN_MASK )
if (GetSizer())
Layout();
else
{
default:
wxFAIL_MSG( _T("unexpected alignment") );
// fall through
// resize controller and the page area to fit inside our new size
const wxSize sizeClient( GetClientSize() ),
sizeBorder( m_bookctrl->GetSize() - m_bookctrl->GetClientSize() ),
sizeCtrl( GetControllerSize() );
case wxBK_TOP:
case wxBK_LEFT:
// posCtrl is already ok
break;
m_bookctrl->SetClientSize( sizeCtrl.x - sizeBorder.x, sizeCtrl.y - sizeBorder.y );
case wxBK_BOTTOM:
posCtrl.y = sizeClient.y - sizeNew.y;
break;
const wxSize sizeNew = m_bookctrl->GetSize();
wxPoint posCtrl;
switch ( GetWindowStyle() & wxBK_ALIGN_MASK )
{
default:
wxFAIL_MSG( _T("unexpected alignment") );
// fall through
case wxBK_RIGHT:
posCtrl.x = sizeClient.x - sizeNew.x;
break;
case wxBK_TOP:
case wxBK_LEFT:
// posCtrl is already ok
break;
case wxBK_BOTTOM:
posCtrl.y = sizeClient.y - sizeNew.y;
break;
case wxBK_RIGHT:
posCtrl.x = sizeClient.x - sizeNew.x;
break;
}
if ( m_bookctrl->GetPosition() != posCtrl )
m_bookctrl->Move(posCtrl);
}
if ( m_bookctrl->GetPosition() != posCtrl )
m_bookctrl->Move(posCtrl);
// resize the currently shown page
if (GetSelection() != wxNOT_FOUND )
{