More DnD.

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

diff --git a/include/wx/msw/timer.h b/include/wx/msw/timer.h
index 1db218cbfca63afac0ed7ccd2e50bb930492083a..36fc33a1c0f339a7d834da456deb95838be1a9fe 100644 (file)
--- a/include/wx/msw/timer.h
+++ b/include/wx/msw/timer.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TIMER_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TIMER_H_


@@ -20,6 +20,8 @@
 
 class WXDLLEXPORT wxTimer : public wxObject
 {
 
 class WXDLLEXPORT wxTimer : public wxObject
 {

+friend void wxProcessTimer(wxTimer& timer);
+

 public:
     wxTimer();
     ~wxTimer();
 public:
     wxTimer();
     ~wxTimer();


@@ -34,10 +36,10 @@ public:
     int Interval() const { return milli; };
     bool OneShot() const { return oneShot; }
 
     int Interval() const { return milli; };
     bool OneShot() const { return oneShot; }
 

-public:
-    bool oneShot ;
-    int  milli ;
-    int  lastMilli ;
+protected:
+    bool oneShot;
+    int  milli;
+    int  lastMilli;

 
     long id;
 
 
     long id;
 


@@ -45,16 +47,5 @@ private:
     DECLARE_ABSTRACT_CLASS(wxTimer)
 };
 
     DECLARE_ABSTRACT_CLASS(wxTimer)
 };
 

-// 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_
 #endif
     // _WX_TIMERH_