Make wxComboCtrlBase::Set*groundColour() methods public.

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

diff --git a/include/wx/univ/scrtimer.h b/include/wx/univ/scrtimer.h
index 82940c45aae10497403db6c1f034a0d44b05ae94..3d3f059dc56aac72b2e63d404fc053fffcb0eab4 100644 (file)
--- a/include/wx/univ/scrtimer.h
+++ b/include/wx/univ/scrtimer.h
@@ -4,13 +4,19 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     18.02.01
-// RCS-ID:      $Id$
-// Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
+// Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
 // 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 +24,7 @@
 // pressed
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxScrollTimer : public wxTimer
+class WXDLLIMPEXP_CORE wxScrollTimer : public wxTimer
 {
 public:
     // default ctor
@@ -32,10 +38,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