X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c2ca375c5620209d77a88d2d378bdcdedbc82e7e..7bd30a12ade503fd135c686ecc98a6f6d5fecbeb:/include/wx/msw/private/timer.h

diff --git a/include/wx/msw/private/timer.h b/include/wx/msw/private/timer.h
index 07139ee528..1e70cd387f 100644
--- a/include/wx/msw/private/timer.h
+++ b/include/wx/msw/private/timer.h
@@ -11,12 +11,15 @@
 #ifndef _WX_MSW_PRIVATE_TIMER_H_
 #define _WX_MSW_PRIVATE_TIMER_H_
 
+#if wxUSE_TIMER
+
 #include "wx/private/timer.h"
+#include "wx/msw/wrapwin.h"     // for WPARAM
 
 class WXDLLIMPEXP_BASE wxMSWTimerImpl : public wxTimerImpl
 {
 public:
-    wxMSWTimerImpl(wxTimer *timer) : wxTimerImpl(timer) { m_id = 0; }
+    wxMSWTimerImpl(wxTimer *timer) : wxTimerImpl(timer) { m_id = 0; };
 
     virtual bool Start(int milliseconds = -1, bool oneShot = false);
     virtual void Stop();
@@ -24,7 +27,11 @@ public:
     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_