Add wxHAS_BITMAPTOGGLEBUTTON and test for it in the unit test.

[wxWidgets.git] / include / wx / univ / scrtimer.h

diff --git a/include/wx/univ/scrtimer.h b/include/wx/univ/scrtimer.h
index 35e3505ab477f8d381203224b9b753b3d033f18d..d73aada0b65e4255dcd1b1968452b6e3b9f08482 100644 (file)
--- a/include/wx/univ/scrtimer.h
+++ b/include/wx/univ/scrtimer.h
@@ -9,8 +9,15 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
+#ifndef _WX_UNIV_SCRTIMER_H
+#define _WX_UNIV_SCRTIMER_H
+
 // NB: this class is implemented in scrolbar.cpp
 
+#include "wx/defs.h"
+
+#if wxUSE_TIMER
+
 #include "wx/timer.h"
 
 // ----------------------------------------------------------------------------
@@ -18,7 +25,7 @@
 // pressed
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxScrollTimer : public wxTimer
+class WXDLLIMPEXP_CORE wxScrollTimer : public wxTimer
 {
 public:
     // default ctor
@@ -32,10 +39,13 @@ public:
 
 protected:
     // to implement in derived classes: perform the scroll action and return
-    // TRUE to continue scrolling or FALSE to stop
+    // true to continue scrolling or false to stop
     virtual bool DoNotify() = 0;
 
     // should we skip the next timer event?
     bool m_skipNext;
 };
 
+#endif // wxUSE_TIMER
+
+#endif // _WX_UNIV_SCRTIMER_H