X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/81d66cf39f810503baed79213bc3122fda0ccc7b..a4294b7832a5aed3c1cccc06aecd227d43da8830:/include/wx/tbarbase.h

diff --git a/include/wx/tbarbase.h b/include/wx/tbarbase.h
index 78d0ab10fd..260b2526a0 100644
--- a/include/wx/tbarbase.h
+++ b/include/wx/tbarbase.h
@@ -9,17 +9,16 @@
 // Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __TBARBASEH__
-#define __TBARBASEH__
+#ifndef _WX_TBARBASE_H_
+#define _WX_TBARBASE_H_
 
 #ifdef __GNUG__
 #pragma interface "tbarbase.h"
 #endif
 
+#include "wx/setup.h"
 #include "wx/defs.h"
 
-#if USE_TOOLBAR
-
 #include "wx/bitmap.h"
 #include "wx/list.h"
 #include "wx/control.h"
@@ -194,7 +193,7 @@ class WXDLLEXPORT wxToolBarBase : public wxControl
 
   // Required to force normal cursor-setting behaviour in Windows
 #ifdef __WXMSW__
-  virtual void MSWOnMouseMove(int x, int y, const WXUINT flags);
+  virtual void MSWOnMouseMove(int x, int y, WXUINT flags);
 #endif
 
  protected:
@@ -239,7 +238,6 @@ public:
     DECLARE_EVENT_TABLE()
 };
 
-#endif // USE_TOOLBAR
 #endif
-    // __TBARBASEH__
+    // _WX_TBARBASE_H_