rename Inside(x,y) parameters to avoid gcc warnings about parameters shadowing member...

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

diff --git a/include/wx/os2/timer.h b/include/wx/os2/timer.h
index c1324430edfe767cf0248a14cf9f208a9da694fe..fb7bddc77599e52ca942a5eb8dbee855da86f5ab 100644 (file)
--- a/include/wx/os2/timer.h
+++ b/include/wx/os2/timer.h
@@ -27,7 +27,7 @@ public:
                          ,nId
                         )
         { Init(); }
-    ~wxTimer();
+    virtual ~wxTimer();
 
     virtual void Notify(void);
     virtual bool Start( int  nMilliseconds = -1
@@ -36,6 +36,7 @@ public:
     virtual void Stop(void);
 
     inline virtual bool IsRunning(void) const { return m_ulId != 0L; }
+    inline          int GetTimerId(void) const { return m_idTimer; }
 
 protected:
     void Init(void);