implemented (more) correct <pre> handling

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

diff --git a/include/wx/stubs/timer.h b/include/wx/stubs/timer.h
index 2e0e85010f9472bef591ec2261c48bb811ae012d..e668d30bec94ea771125a332d26255bd304db86c 100644 (file)
--- a/include/wx/stubs/timer.h
+++ b/include/wx/stubs/timer.h
@@ -31,15 +31,15 @@ public:
     virtual void Notify() = 0;                 // Override this member
 
     // Returns the current interval time (0 if stop)
-    int Interval() const { return milli; }; 
-    bool OneShot() const { return oneShot; }
+    int Interval() const { return m_milli; }; 
+    bool OneShot() const { return m_oneShot; }
 
 protected:
-    bool oneShot ;
-    int  milli ;
-    int  lastMilli ;
+    bool m_oneShot ;
+    int  m_milli ;
+    int  m_lastMilli ;
 
-    long id;
+    long m_id;
 
 private:
     DECLARE_ABSTRACT_CLASS(wxTimer)
@@ -49,16 +49,5 @@ private:
  * 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_