wxStaticBitmapBase::DoGetBestSize

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

diff --git a/include/wx/timer.h b/include/wx/timer.h
index 1707d8346ef5c0f9b922c31512ee6d93667326b0..9e9ed4e5233018db1b0cbb4a3e1b4e4d84ce9c00 100644 (file)
--- a/include/wx/timer.h
+++ b/include/wx/timer.h
@@ -90,6 +90,10 @@ public:
     // return TRUE if the timer is one shot
     bool IsOneShot() const { return m_oneShot; }
 
+    // return the timer ID
+    int GetId() const { return m_idTimer; }
+    
+
 protected:
     // common part of all ctors
     void Init() { m_oneShot = FALSE; m_milli = 0; }
@@ -183,7 +187,7 @@ private:
 typedef void (wxEvtHandler::*wxTimerEventFunction)(wxTimerEvent&);
 
 #define EVT_TIMER(timerid, func) \
-    DECLARE_EVENT_TABLE_ENTRY( wxEVT_TIMER, timerid, -1, (wxObjectEventFunction) (wxEventFunction) (wxTimerEventFunction) & func, NULL),
+    DECLARE_EVENT_TABLE_ENTRY( wxEVT_TIMER, timerid, -1, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxTimerEventFunction, & func ), NULL),
 
 #endif // wxUSE_GUI && wxUSE_TIMER