Add EVT_RIBBONBAR_TAB_LEFT_DCLICK event.

[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 f7044e07549f79008fbce5f7498788104fe5e2cd..1e70cd387f59b352b90cf6e57ec6ef7d30c84da3 100644 (file)
--- a/include/wx/msw/private/timer.h
+++ b/include/wx/msw/private/timer.h
@@ -14,11 +14,12 @@
 #if wxUSE_TIMER
 
 #include "wx/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:
 
 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();
 
     virtual bool Start(int milliseconds = -1, bool oneShot = false);
     virtual void Stop();


@@ -26,7 +27,9 @@ 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 // wxUSE_TIMER