wxCriticalSection implemented using mutexes for !MSW (sample compiles again)

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

diff --git a/include/wx/msw/timer.h b/include/wx/msw/timer.h
index a728aede1781dfc49b0a886ae9a1268c09826b5c..8ce875f6574e7e2cb7f7de996da76bcaa6a2d8d0 100644 (file)
--- a/include/wx/msw/timer.h
+++ b/include/wx/msw/timer.h
@@ -17,11 +17,11 @@
 #endif
 
 #include "wx/object.h"
 #endif
 
 #include "wx/object.h"

-#include <windows.h>
-

 
 class WXDLLEXPORT wxTimer : public wxObject
 {
 
 class WXDLLEXPORT wxTimer : public wxObject
 {

+friend void wxProcessTimer(wxTimer& timer);
+

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


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

-public:
+protected:

     bool oneShot ;
     int  milli ;
     int  lastMilli ;
     bool oneShot ;
     int  milli ;
     int  lastMilli ;


@@ -45,8 +45,6 @@ public:
 
 private:
     DECLARE_ABSTRACT_CLASS(wxTimer)
 
 private:
     DECLARE_ABSTRACT_CLASS(wxTimer)

-
-       friend UINT WINAPI wxTimerProc(HWND WXUNUSED(hwnd), WORD, int idTimer, DWORD);

 };
 
 // Timer functions (milliseconds)
 };
 
 // Timer functions (milliseconds)