bugfixes

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

diff --git a/include/wx/msw/timer.h b/include/wx/msw/timer.h
index a728aede1781dfc49b0a886ae9a1268c09826b5c..1320d5e8c025b24621bf48c7d75099d412874857 100644 (file)
--- a/include/wx/msw/timer.h
+++ b/include/wx/msw/timer.h
@@ -17,11 +17,11 @@
 #endif
 
 #include "wx/object.h"
-#include <windows.h>
-
 
 class WXDLLEXPORT wxTimer : public wxObject
 {
+friend void wxProcessTimer(wxTimer& timer);
+
 public:
     wxTimer();
     ~wxTimer();
@@ -36,7 +36,7 @@ public:
     int Interval() const { return milli; };
     bool OneShot() const { return oneShot; }
 
-public:
+protected:
     bool oneShot ;
     int  milli ;
     int  lastMilli ;
@@ -45,20 +45,7 @@ public:
 
 private:
     DECLARE_ABSTRACT_CLASS(wxTimer)
-
-       friend UINT WINAPI wxTimerProc(HWND WXUNUSED(hwnd), WORD, int idTimer, DWORD);
 };
 
-// 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_TIMERH_