Forward port event handler fixes to trunk.

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

diff --git a/include/wx/univ/scrtimer.h b/include/wx/univ/scrtimer.h
index 195ddd43ad17bedb6589f1375da4f6522ed37ac4..d73aada0b65e4255dcd1b1968452b6e3b9f08482 100644 (file)
--- a/include/wx/univ/scrtimer.h
+++ b/include/wx/univ/scrtimer.h
@@ -6,11 +6,18 @@
 // Created:     18.02.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
 // Created:     18.02.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)

-// Licence:     wxWidgets 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


@@ -32,10 +39,13 @@ public:
 
 protected:
     // to implement in derived classes: perform the scroll action and return
 
 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;
 };
 
     virtual bool DoNotify() = 0;
 
     // should we skip the next timer event?
     bool m_skipNext;
 };
 

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