AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix the wrong size of the first page when it's added to the notebook (replaces patch 728770)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20410 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2003-05-01 16:39:59 +00:00
parent a452af5e68
commit 2015f2b308
2 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/wx/msw/notebook.h
View File

@ -132,9 +132,14 @@ protected:
// remove one page from the notebook, without deleting // remove one page from the notebook, without deleting
virtual wxNotebookPage *DoRemovePage(int nPage); virtual wxNotebookPage *DoRemovePage(int nPage);
// set the size of the given page to fit in the notebook
void AdjustPageSize(wxNotebookPage *page);
// the current selection (-1 if none) // the current selection (-1 if none)
int m_nSelection; int m_nSelection;
DECLARE_DYNAMIC_CLASS(wxNotebook) DECLARE_DYNAMIC_CLASS(wxNotebook)
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
}; };

33
src/msw/notebook.cpp
View File

@ -313,6 +313,21 @@ void wxNotebook::SetTabSize(const wxSize& sz)
::SendMessage(GetHwnd(), TCM_SETITEMSIZE, 0, MAKELPARAM(sz.x, sz.y)); ::SendMessage(GetHwnd(), TCM_SETITEMSIZE, 0, MAKELPARAM(sz.x, sz.y));
} }
void wxNotebook::AdjustPageSize(wxNotebookPage *page)
{
wxCHECK_RET( page, _T("NULL page in wxNotebook::AdjustPageSize") );
RECT rc;
rc.left =
rc.top = 0;
// get the page size from the notebook size
GetSize((int *)&rc.right, (int *)&rc.bottom);
TabCtrl_AdjustRect(m_hwnd, FALSE, &rc);
page->SetSize(rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top);
}
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxNotebook operations // wxNotebook operations
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@ -423,15 +438,11 @@ bool wxNotebook::InsertPage(int nPage,
// fit the notebook page to the tab control's display area: this should be // fit the notebook page to the tab control's display area: this should be
// done before adding it to the notebook or TabCtrl_InsertItem() will // done before adding it to the notebook or TabCtrl_InsertItem() will
// change the notebooks size itself! // change the notebooks size itself!
RECT rc; AdjustPageSize(pPage);
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);
// finally do insert it // finally do insert it
if ( TabCtrl_InsertItem(m_hwnd, nPage, &tcItem) == -1 ) { if ( TabCtrl_InsertItem(m_hwnd, nPage, &tcItem) == -1 )
{
wxLogError(wxT("Can't create the notebook page '%s'."), strText.c_str()); wxLogError(wxT("Can't create the notebook page '%s'."), strText.c_str());
return FALSE; return FALSE;
@ -440,6 +451,14 @@ bool wxNotebook::InsertPage(int nPage,
// succeeded: save the pointer to the page // succeeded: save the pointer to the page
m_pages.Insert(pPage, nPage); m_pages.Insert(pPage, nPage);
// for the first page (only) we need to adjust the size again because the
// notebook size changed: the tabs which hadn't been there before are now
// shown
if ( m_pages.GetCount() == 1 )
{
AdjustPageSize(pPage);
}
// hide the page: unless it is selected, it shouldn't be shown (and if it // hide the page: unless it is selected, it shouldn't be shown (and if it
// is selected it will be shown later) // is selected it will be shown later)
HWND hwnd = GetWinHwnd(pPage); HWND hwnd = GetWinHwnd(pPage);