Fixed conflicts with Robert's similar fixes; fixed toolbar size calculation

and allowed for vertical toolbar git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14396 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-02-24 23:04:46 +00:00
parent d1017acfc3
commit 16c9a4258f
5 changed files with 76 additions and 16 deletions
--- a/src/common/framecmn.cpp
+++ b/src/common/framecmn.cpp
@@ -152,7 +152,7 @@ wxPoint wxFrameBase::GetClientAreaOrigin() const
 {
    wxPoint pt = wxTopLevelWindow::GetClientAreaOrigin();

-#if wxUSE_TOOLBAR
+#if wxUSE_TOOLBAR && !defined(__WXUNIVERSAL__)
    wxToolBar *toolbar = GetToolBar();
    if ( toolbar && toolbar->IsShown() )
    {