compilation fixes for !wxUSE_TOOLBAR

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14595 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/univ/framuniv.cpp b/src/univ/framuniv.cpp
index 727b476ace9021688878b0e6b8a3f376d87abb3e..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;
         wxCoord heightMbar = m_frameMenuBar->GetSize().y;
 
         wxCoord heightTbar = 0;

-        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!!!
                                 GetClientSize().y - heightMbar - heightTbar,
 #else
                                 - (heightMbar + heightTbar),
 #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);
     }
 }
                                 GetClientSize().x, heightMbar);
     }
 }


@@ -304,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

diff --git a/src/univ/toolbar.cpp b/src/univ/toolbar.cpp
index 774c5d5a75047e000daa4e8a733a3f5927a94567..e17794b8cec44b1b56d843c242eb3f5a1e3d6510 100644 (file)
--- a/src/univ/toolbar.cpp
+++ b/src/univ/toolbar.cpp
@@ -29,6 +29,8 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_TOOLBAR
+

 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/app.h"
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/app.h"


@@ -705,3 +707,5 @@ bool wxStdToolbarInputHandler::HandleActivation(wxInputConsumer *consumer,
     return TRUE;
 }
 
     return TRUE;
 }
 

+#endif // wxUSE_TOOLBAR
+