This weeks interface and compile catchup

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

diff --git a/src/univ/framuniv.cpp b/src/univ/framuniv.cpp
index 9e9729670098a5ee77ff37eac0a33356683baae3..727b476ace9021688878b0e6b8a3f376d87abb3e 100644 (file)
--- a/src/univ/framuniv.cpp
+++ b/src/univ/framuniv.cpp
@@ -96,18 +96,17 @@ void wxFrame::PositionMenuBar()
         // the menubar is positioned above the client size, hence the negative
         // y coord
         wxCoord heightMbar = m_frameMenuBar->GetSize().y;
         // the menubar is positioned above the client size, hence the negative
         // y coord
         wxCoord heightMbar = m_frameMenuBar->GetSize().y;

-        
+

         wxCoord heightTbar = 0;
         wxCoord heightTbar = 0;

-        // In between sits the toolbar

         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!!!
         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
 #else

-                                - heightMbar - heightTbar,
+                                - (heightMbar + heightTbar),

 #endif                         
                                 GetClientSize().x, heightMbar);
     }
 #endif                         
                                 GetClientSize().x, heightMbar);
     }


@@ -196,8 +195,7 @@ wxPoint wxFrame::GetClientAreaOrigin() const
     }
 #endif // wxUSE_MENUS
 
     }
 #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 )
     if ( m_frameToolBar )
     {
         if ( m_frameToolBar->GetWindowStyleFlag() & wxTB_VERTICAL )