[this message is for the previous commit as well]

[wxWidgets.git] / src / univ / framuniv.cpp

diff --git a/src/univ/framuniv.cpp b/src/univ/framuniv.cpp
index ae8f7cf2215844541a742efe64c9d444b716f7b6..727b476ace9021688878b0e6b8a3f376d87abb3e 100644 (file)
--- a/src/univ/framuniv.cpp
+++ b/src/univ/framuniv.cpp
@@ -97,12 +97,16 @@ void wxFrame::PositionMenuBar()
         // y coord
         wxCoord heightMbar = m_frameMenuBar->GetSize().y;
 
+        wxCoord heightTbar = 0;
+        if (m_frameToolBar)
+            heightTbar = m_frameToolBar->GetSize().y;
+
         m_frameMenuBar->SetSize(0, 
 #ifdef __WXPM__         // FIXME -- remove this, make wxOS2/Univ behave as
                  //          the rest of the world!!!
-                                GetClientSize().y - heightMbar,
+                                GetClientSize().y - heightMbar - heightTbar,
 #else
-                                -heightMbar,
+                                - (heightMbar + heightTbar),
 #endif                         
                                 GetClientSize().x, heightMbar);
     }