woodoo workaround for the bug 616803: crash when showing a dialog with notebook with wxNB_MULTILINE style
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17461 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -161,7 +161,7 @@ WXDWORD wxNotebook::MSWGetStyle(long style, WXDWORD *exstyle) const
|
||||
|
||||
tabStyle |= WS_TABSTOP | TCS_TABS;
|
||||
|
||||
if ( style & wxTC_MULTILINE )
|
||||
if ( style & wxNB_MULTILINE )
|
||||
tabStyle |= TCS_MULTILINE;
|
||||
if ( style & wxNB_FIXEDWIDTH )
|
||||
tabStyle |= TCS_FIXEDWIDTH;
|
||||
@@ -433,13 +433,6 @@ bool wxNotebook::InsertPage(int nPage,
|
||||
// this updates internal flag too - otherwise it will get out of sync
|
||||
pPage->Show(FALSE);
|
||||
|
||||
// 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);
|
||||
pPage->SetSize(rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top);
|
||||
|
||||
// some page should be selected: either this one or the first one if there is
|
||||
// still no selection
|
||||
int selNew = -1;
|
||||
|
Reference in New Issue
Block a user