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

diff --git a/src/univ/framuniv.cpp b/src/univ/framuniv.cpp
index 5ee90213f6bf01d01da5ac5a9d2d258db4e28a9b..727b476ace9021688878b0e6b8a3f376d87abb3e 100644 (file)
--- a/src/univ/framuniv.cpp
+++ b/src/univ/framuniv.cpp
@@ -195,8 +195,7 @@ wxPoint wxFrame::GetClientAreaOrigin() const
     }
 #endif // wxUSE_MENUS
 
-   // This is done in wxFrameBase already
-#if 0 // wxUSE_TOOLBAR
+#if wxUSE_TOOLBAR
     if ( m_frameToolBar )
     {
         if ( m_frameToolBar->GetWindowStyleFlag() & wxTB_VERTICAL )

diff --git a/src/univ/toolbar.cpp b/src/univ/toolbar.cpp
index 0731cd04fd3abc0758d0f1641e97ece8bf860e7b..83d4ad199af9cb54f0071691a99ea452066cc877 100644 (file)
--- a/src/univ/toolbar.cpp
+++ b/src/univ/toolbar.cpp
@@ -264,8 +264,10 @@ bool wxToolBar::Realize()
     {
         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;
 }