changes to make wxGTK compile with GTK+ 2.0: now it does but the minimal

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

diff --git a/src/univ/framuniv.cpp b/src/univ/framuniv.cpp
index 2ea330be1d8ba4602a2f383828e0a343106d02fa..727b476ace9021688878b0e6b8a3f376d87abb3e 100644 (file)
--- a/src/univ/framuniv.cpp
+++ b/src/univ/framuniv.cpp
@@ -96,12 +96,17 @@ void wxFrame::PositionMenuBar()
         // the menubar is positioned above the client size, hence the negative
         // 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);
     }