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 c7680e50b1c56b8d73f596661b95dbc8b5887082..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_
 
 #ifndef _WX_TIMER_H_
 #define _WX_TIMER_H_
 

+#ifdef __GNUG__
+    #pragma interface "timer.h"
+#endif
+

 #include "wx/object.h"
 
 class WXDLLEXPORT wxTimer: public wxTimerBase
 #include "wx/object.h"
 
 class WXDLLEXPORT wxTimer: public wxTimerBase


@@ -19,17 +23,28 @@ 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();
 
     ~wxTimer();
 

+    virtual void Notify(void);

     virtual bool Start( int  nMilliseconds = -1
                        ,bool bOneShot = FALSE
                       );
     virtual void Stop(void);
 
     inline virtual bool IsRunning(void) const { return m_ulId != 0L; }
     virtual bool Start( int  nMilliseconds = -1
                        ,bool bOneShot = FALSE
                       );
     virtual void Stop(void);
 
     inline virtual bool IsRunning(void) const { return m_ulId != 0L; }

+    inline          int GetTimerId(void) const { return m_idTimer; }

 
 protected:
 
 protected:

+    void Init(void);
+

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


@@ -37,5 +52,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_