Reverted to my own solution; I think it's better because it distinguishes

between Universal and non-Universal solutions where menubars are
built in and don't affect client origin


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14397 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2002-02-24 23:18:35 +00:00
parent 16c9a4258f
commit 5e885a580a
2 changed files with 5 additions and 4 deletions

View File

@@ -195,8 +195,7 @@ wxPoint wxFrame::GetClientAreaOrigin() const
} }
#endif // wxUSE_MENUS #endif // wxUSE_MENUS
// This is done in wxFrameBase already #if wxUSE_TOOLBAR
#if 0 // wxUSE_TOOLBAR
if ( m_frameToolBar ) if ( m_frameToolBar )
{ {
if ( m_frameToolBar->GetWindowStyleFlag() & wxTB_VERTICAL ) if ( m_frameToolBar->GetWindowStyleFlag() & wxTB_VERTICAL )

View File

@@ -265,7 +265,9 @@ bool wxToolBar::Realize()
SetSize(sz.x, m_maxHeight); SetSize(sz.x, m_maxHeight);
} }
SetSize( x+16, m_defaultHeight + 14 ); // Commenting out Robert's fix since the above should be
// more general
// SetSize( x+16, m_defaultHeight + 14 );
return TRUE; return TRUE;
} }