wrong move

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

diff --git a/include/wx/univ/scrtimer.h b/include/wx/univ/scrtimer.h
index 9203e8b22715291bad35c85b709261b24eb2fe93..d73aada0b65e4255dcd1b1968452b6e3b9f08482 100644 (file)
--- a/include/wx/univ/scrtimer.h
+++ b/include/wx/univ/scrtimer.h
@@ -9,8 +9,15 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 

+#ifndef _WX_UNIV_SCRTIMER_H
+#define _WX_UNIV_SCRTIMER_H
+

 // NB: this class is implemented in scrolbar.cpp
 
 // NB: this class is implemented in scrolbar.cpp
 

+#include "wx/defs.h"
+
+#if wxUSE_TIMER
+

 #include "wx/timer.h"
 
 // ----------------------------------------------------------------------------
 #include "wx/timer.h"
 
 // ----------------------------------------------------------------------------


@@ -18,7 +25,7 @@
 // pressed
 // ----------------------------------------------------------------------------
 
 // pressed
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxScrollTimer : public wxTimer
+class WXDLLIMPEXP_CORE wxScrollTimer : public wxTimer

 {
 public:
     // default ctor
 {
 public:
     // default ctor


@@ -39,3 +46,6 @@ protected:
     bool m_skipNext;
 };
 
     bool m_skipNext;
 };
 

+#endif // wxUSE_TIMER
+
+#endif // _WX_UNIV_SCRTIMER_H