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

update the sizes of all pages when the control size changes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38981 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-05-03 00:43:44 +00:00
parent 26e95a246b
commit a717bd116a
1 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/common/bookctrl.cpp
View File

@@ -147,7 +147,7 @@ wxSize wxBookCtrlBase::DoGetBestSize() const
bestSize.y = childBestSize.y; bestSize.y = childBestSize.y;
} }
} }
if (m_fitToCurrentPage && GetCurrentPage()) if (m_fitToCurrentPage && GetCurrentPage())
bestSize = GetCurrentPage()->GetBestSize(); bestSize = GetCurrentPage()->GetBestSize();
@@ -175,6 +175,9 @@ wxBookCtrlBase::InsertPage(size_t nPage,
_T("invalid page index in wxBookCtrlBase::InsertPage()") ); _T("invalid page index in wxBookCtrlBase::InsertPage()") );
m_pages.Insert(page, nPage); m_pages.Insert(page, nPage);
if ( page )
page->SetSize(GetPageRect());
InvalidateBestSize(); InvalidateBestSize();
return true; return true;
@@ -267,7 +270,7 @@ void wxBookCtrlBase::DoSize()
// we're not fully created yet or OnSize() should be hidden by derived class // we're not fully created yet or OnSize() should be hidden by derived class
return; return;
} }
if (GetSizer()) if (GetSizer())
Layout(); Layout();
else else
@@ -305,19 +308,27 @@ void wxBookCtrlBase::DoSize()
m_bookctrl->Move(posCtrl); m_bookctrl->Move(posCtrl);
} }
// resize the currently shown page // resize all pages to fit the new control size
if (GetSelection() != wxNOT_FOUND ) const wxRect pageRect = GetPageRect();
const unsigned pagesCount = m_pages.Count();
for ( unsigned int i = 0; i < pagesCount; ++i )
{ {
wxWindow *page = m_pages[GetSelection()]; wxWindow * const page = m_pages[i];
wxCHECK_RET( page, _T("NULL page?") ); if ( !page )
page->SetSize(GetPageRect()); {
wxASSERT_MSG( AllowNullPage(),
_T("Null page in a control that does not allow null pages?") );
continue;
}
page->SetSize(pageRect);
} }
} }
void wxBookCtrlBase::OnSize(wxSizeEvent& event) void wxBookCtrlBase::OnSize(wxSizeEvent& event)
{ {
event.Skip(); event.Skip();
DoSize(); DoSize();
} }