added wxString ctor from std::string (inside #ifdef wxUSE_STD_STRING); removed pragma...

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

diff --git a/include/wx/os2/timer.h b/include/wx/os2/timer.h
index 3c9ff0267d047473080c3ec902a7c0af15999499..62ab0c423e4a08c48089784547b4e688ce1e0216 100644 (file)
--- a/include/wx/os2/timer.h
+++ b/include/wx/os2/timer.h
@@ -12,6 +12,10 @@
 #ifndef _WX_TIMER_H_
 #define _WX_TIMER_H_
 
+#ifdef __GNUG__
+    #pragma interface "timer.h"
+#endif
+
 #include "wx/object.h"
 
 class WXDLLEXPORT wxTimer: public wxTimerBase
@@ -36,7 +40,7 @@ public:
     virtual void Stop(void);
 
     inline virtual bool IsRunning(void) const { return m_ulId != 0L; }
-    inline        ULONG GetTimerId(void) const { return m_ulId; }
+    inline          int GetTimerId(void) const { return m_idTimer; }
 
 protected:
     void Init(void);