make it possible to have empty lines in wxListCtrl

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

diff --git a/src/univ/framuniv.cpp b/src/univ/framuniv.cpp
index 9e9729670098a5ee77ff37eac0a33356683baae3..d4c06aa36b7a9af071988a0e2ee1fb7e1d7bad3c 100644 (file)
--- a/src/univ/framuniv.cpp
+++ b/src/univ/framuniv.cpp
@@ -96,19 +96,21 @@ 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)
+
+#if wxUSE_TOOLBAR
+        if ( m_frameToolBar )

             heightTbar = m_frameToolBar->GetSize().y;
             heightTbar = m_frameToolBar->GetSize().y;

+#endif // wxUSE_TOOLBAR

 
 

-        m_frameMenuBar->SetSize(0, 
+        m_frameMenuBar->SetSize(0,

 #ifdef __WXPM__         // FIXME -- remove this, make wxOS2/Univ behave as
                  //          the rest of the world!!!
 #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,
-#endif                         
+                                - (heightMbar + heightTbar),
+#endif

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


@@ -196,8 +198,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 )


@@ -306,7 +307,7 @@ int wxFrame::GetMinHeight() const
         height += m_frameStatusBar->GetSize().y;
     }
 #endif // wxUSE_STATUSBAR
         height += m_frameStatusBar->GetSize().y;
     }
 #endif // wxUSE_STATUSBAR

-    
+

     if ( height )
         return height + wxMax(0, wxFrameBase::GetMinHeight());
     else
     if ( height )
         return height + wxMax(0, wxFrameBase::GetMinHeight());
     else