synchronize GTK2 minimum version in docs

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

diff --git a/include/wx/msw/private/timer.h b/include/wx/msw/private/timer.h
index 07139ee528af56cc937655479074fff21cf74075..b22a3dc73b158abf4d0f22b41127d172fb44f3fb 100644 (file)
--- a/include/wx/msw/private/timer.h
+++ b/include/wx/msw/private/timer.h
@@ -11,7 +11,10 @@
 #ifndef _WX_MSW_PRIVATE_TIMER_H_
 #define _WX_MSW_PRIVATE_TIMER_H_
 
 #ifndef _WX_MSW_PRIVATE_TIMER_H_
 #define _WX_MSW_PRIVATE_TIMER_H_
 

+#if wxUSE_TIMER
+

 #include "wx/private/timer.h"
 #include "wx/private/timer.h"

+#include "wx/msw/wrapwin.h"     // for WPARAM

 
 class WXDLLIMPEXP_BASE wxMSWTimerImpl : public wxTimerImpl
 {
 
 class WXDLLIMPEXP_BASE wxMSWTimerImpl : public wxTimerImpl
 {


@@ -24,7 +27,11 @@ public:
     virtual bool IsRunning() const { return m_id != 0; }
 
 protected:
     virtual bool IsRunning() const { return m_id != 0; }
 
 protected:

-    unsigned long m_id;
+    // this must be 64 bit under Win64 as WPARAM (storing timer ids) is 64 bit
+    // there and so the ids may possibly not fit in 32 bits
+    WPARAM m_id;

 };
 
 };
 

+#endif // wxUSE_TIMER
+

 #endif // _WX_TIMERH_
 #endif // _WX_TIMERH_