removed extern from inline function declarations

[wxWidgets.git] / include / wx / stubs / timer.h

diff --git a/include/wx/stubs/timer.h b/include/wx/stubs/timer.h
index 22fa2eed598f7370b359e73fc0728ae91fd79477..e668d30bec94ea771125a332d26255bd304db86c 100644 (file)
--- a/include/wx/stubs/timer.h
+++ b/include/wx/stubs/timer.h
@@ -20,38 +20,34 @@
 
 class WXDLLEXPORT wxTimer: public wxObject
 {
-  DECLARE_DYNAMIC_CLASS(wxTimer)
+public:
+    wxTimer();
+    ~wxTimer();
 
- public:
-  wxTimer();
-  ~wxTimer();
-  virtual bool Start(int milliseconds = -1,bool one_shot = FALSE); // Start timer
-  virtual void Stop();                   // Stop timer
-  virtual void Notify() = 0;             // Override this member
-  inline int Interval() { return m_milli ; }; // Returns the current interval time (0 if stop)
+    virtual bool Start(int milliseconds = -1,
+                       bool one_shot = FALSE); // Start timer
+    virtual void Stop();                       // Stop timer
+
+    virtual void Notify() = 0;                 // Override this member
+
+    // Returns the current interval time (0 if stop)
+    int Interval() const { return m_milli; }; 
+    bool OneShot() const { return m_oneShot; }
 
 protected:
-  bool      m_oneShot ;
-  int       m_milli ;
-  int       m_lastMilli ;
-  long      m_id;
+    bool m_oneShot ;
+    int  m_milli ;
+    int  m_lastMilli ;
+
+    long m_id;
 
+private:
+    DECLARE_ABSTRACT_CLASS(wxTimer)
 };
 
 /* Note: these are implemented in common/timercmn.cpp, so need to implement them separately.
  * But you may need to modify timercmn.cpp.
  */
 
-// Timer functions (milliseconds)
-void WXDLLEXPORT wxStartTimer();
-// Gets time since last wxStartTimer or wxGetElapsedTime
-long WXDLLEXPORT wxGetElapsedTime(bool resetTimer = TRUE);
-
-// EXPERIMENTAL: comment this out if it doesn't compile.
-bool WXDLLEXPORT wxGetLocalTime(long *timeZone, int *dstObserved);
-
-// Get number of seconds since 00:00:00 GMT, Jan 1st 1970.
-long WXDLLEXPORT wxGetCurrentTime();
-
 #endif
     // _WX_TIMER_H_