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

constraints handling for notebook pages improved

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@249 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1998-07-12 22:59:00 +00:00
parent e15e548b50
commit b5c3b53817
1 changed files with 29 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/msw/notebook.cpp
View File

@@ -369,6 +369,20 @@ void wxNotebook::OnSize(wxSizeEvent& event)
m_nSelection = -1; m_nSelection = -1;
SetSelection(nSel); SetSelection(nSel);
// fit the notebook page to the tab control's display area
RECT rc;
rc.left = rc.top = 0;
GetSize((int *)&rc.right, (int *)&rc.bottom);
TabCtrl_AdjustRect(m_hwnd, FALSE, &rc);
uint nCount = m_aPages.Count();
for ( uint nPage = 0; nPage < nCount; nPage++ ) {
wxNotebookPage *pPage = m_aPages[nPage];
pPage->SetSize(rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top);
if ( pPage->GetAutoLayout() )
pPage->Layout();
}
event.Skip(); event.Skip();
} }
@@ -409,6 +423,20 @@ void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event)
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxNotebook base class virtuals // wxNotebook base class virtuals
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// override these 2 functions to do nothing: everything is done in OnSize
void wxNotebook::SetConstraintSizes(bool /* recurse */)
{
// don't set the sizes of the pages - their correct size is not yet known
wxControl::SetConstraintSizes(FALSE);
}
bool wxNotebook::DoPhase(int /* nPhase */)
{
return TRUE;
}
void wxNotebook::Command(wxCommandEvent& event) void wxNotebook::Command(wxCommandEvent& event)
{ {
wxFAIL_MSG("wxNotebook::Command not implemented"); wxFAIL_MSG("wxNotebook::Command not implemented");
@@ -453,28 +481,8 @@ void wxNotebook::ChangePage(int nOldSel, int nSel)
} }
wxNotebookPage *pPage = m_aPages[nSel]; wxNotebookPage *pPage = m_aPages[nSel];
FitPage(pPage);
pPage->Show(TRUE); pPage->Show(TRUE);
pPage->SetFocus();
// set focus to the currently selected page
wxWindow *win = m_aPages[nSel];
if ( win->IsKindOf(CLASSINFO(wxPanel)) ) {
wxList *children = win->GetChildren();
if ( children->First() != NULL );
win = (wxWindow *)children->First()->Data();
}
win->SetFocus();
m_nSelection = nSel; m_nSelection = nSel;
} }
// fit the notebook page to the tab control's display area
void wxNotebook::FitPage(wxNotebookPage *pPage)
{
RECT rc;
rc.left = rc.top = 0;
GetSize((int *)&rc.right, (int *)&rc.bottom);
TabCtrl_AdjustRect(m_hwnd, FALSE, &rc);
pPage->SetSize(rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top);
}