From 5e885a580a735716af33b47b0743b5fa04a0cb9f Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Sun, 24 Feb 2002 23:18:35 +0000
Subject: [PATCH] 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
---
 src/univ/framuniv.cpp | 3 +--
 src/univ/toolbar.cpp  | 6 ++++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/univ/framuniv.cpp b/src/univ/framuniv.cpp
index 5ee90213f6..727b476ace 100644
--- 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 0731cd04fd..83d4ad199a 100644
--- 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;
 }
-- 
2.45.2