Give wxScrolledWindow its own Layout method that takes into account

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

diff --git a/src/univ/toolbar.cpp b/src/univ/toolbar.cpp
index c995466a661ee7690afbe602cbdb5373a4b229b8..e17794b8cec44b1b56d843c242eb3f5a1e3d6510 100644 (file)
--- a/src/univ/toolbar.cpp
+++ b/src/univ/toolbar.cpp
@@ -29,6 +29,8 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_TOOLBAR
+
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/app.h"
@@ -652,7 +654,7 @@ bool wxStdToolbarInputHandler::HandleMouse(wxInputConsumer *consumer,
     wxToolBar *tbar = wxStaticCast(consumer->GetInputWindow(), wxToolBar);
     wxToolBarToolBase *tool = tbar->FindToolForPosition(event.GetX(), event.GetY());
 
-    if ( tool && !tool->IsEnabled() )
+    if ( !tool || !tool->IsEnabled() )
         return TRUE;
 
     return wxStdButtonInputHandler::HandleMouse(consumer, event);
@@ -705,3 +707,5 @@ bool wxStdToolbarInputHandler::HandleActivation(wxInputConsumer *consumer,
     return TRUE;
 }
 
+#endif // wxUSE_TOOLBAR
+