various minor fixes to wxHashMap: compilation warnings suppressed, use calloc() inste...

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

diff --git a/include/wx/os2/timer.h b/include/wx/os2/timer.h
index c7680e50b1c56b8d73f596661b95dbc8b5887082..b4f8a2fc517b3f47c3ae0dd7a04c9a422875629a 100644 (file)
--- a/include/wx/os2/timer.h
+++ b/include/wx/os2/timer.h
@@ -19,7 +19,14 @@ class WXDLLEXPORT wxTimer: public wxTimerBase
 friend void wxProcessTimer(wxTimer& timer);
 
 public:
 friend void wxProcessTimer(wxTimer& timer);
 
 public:

-    wxTimer();
+    wxTimer() { Init(); }
+    wxTimer( wxEvtHandler* pOwner
+            ,int           nId = -1
+           )
+           : wxTimerBase( pOwner
+                         ,nId
+                        )
+        { Init(); }

     ~wxTimer();
 
     virtual bool Start( int  nMilliseconds = -1
     ~wxTimer();
 
     virtual bool Start( int  nMilliseconds = -1


@@ -30,6 +37,8 @@ public:
     inline virtual bool IsRunning(void) const { return m_ulId != 0L; }
 
 protected:
     inline virtual bool IsRunning(void) const { return m_ulId != 0L; }
 
 protected:

+    void Init(void);
+

     ULONG                            m_ulId;
     HAB                              m_Hab;
 
     ULONG                            m_ulId;
     HAB                              m_Hab;
 


@@ -37,5 +46,10 @@ private:
     DECLARE_ABSTRACT_CLASS(wxTimer)
 };
 
     DECLARE_ABSTRACT_CLASS(wxTimer)
 };
 

+extern ULONG wxTimerProc( HWND  WXUNUSED(hwnd)
+                         ,ULONG
+                         ,int   nIdTimer
+                         ,ULONG
+                        );

 #endif
     // _WX_TIMER_H_
 #endif
     // _WX_TIMER_H_