wxPGProperty::GenerateComposedValue() -> protected DoGenerateComposedValue(), added...

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

diff --git a/include/wx/univ/scrtimer.h b/include/wx/univ/scrtimer.h
index 7e4e8bdd05cdc803babfa2768b2955e3bd2c745d..d73aada0b65e4255dcd1b1968452b6e3b9f08482 100644 (file)
--- a/include/wx/univ/scrtimer.h
+++ b/include/wx/univ/scrtimer.h
@@ -14,6 +14,10 @@
 
 // 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"
 
 // ----------------------------------------------------------------------------


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

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

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


@@ -42,4 +46,6 @@ protected:
     bool m_skipNext;
 };
 
     bool m_skipNext;
 };
 

+#endif // wxUSE_TIMER
+

 #endif // _WX_UNIV_SCRTIMER_H
 #endif // _WX_UNIV_SCRTIMER_H