fixed loading of GNOME2 mime icons (still not working as desired)

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

diff --git a/src/univ/framuniv.cpp b/src/univ/framuniv.cpp
index 5ee90213f6bf01d01da5ac5a9d2d258db4e28a9b..d4c06aa36b7a9af071988a0e2ee1fb7e1d7bad3c 100644 (file)
--- a/src/univ/framuniv.cpp
+++ b/src/univ/framuniv.cpp
@@ -98,16 +98,19 @@ void wxFrame::PositionMenuBar()
         wxCoord heightMbar = m_frameMenuBar->GetSize().y;
 
         wxCoord heightTbar = 0;
-        if (m_frameToolBar)
+
+#if wxUSE_TOOLBAR
+        if ( m_frameToolBar )
             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!!!
                                 GetClientSize().y - heightMbar - heightTbar,
 #else
                                 - (heightMbar + heightTbar),
-#endif                         
+#endif
                                 GetClientSize().x, heightMbar);
     }
 }
@@ -195,8 +198,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 )
@@ -305,7 +307,7 @@ int wxFrame::GetMinHeight() const
         height += m_frameStatusBar->GetSize().y;
     }
 #endif // wxUSE_STATUSBAR
-    
+
     if ( height )
         return height + wxMax(0, wxFrameBase::GetMinHeight());
     else