Applied patch [ 1325207 ] Fixes unicode build using Solaris with Sun's SunPro compiler

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

diff --git a/include/wx/motif/timer.h b/include/wx/motif/timer.h
index d6d6df245538e716de060bf16d16044c220717f1..cc64203cceb93302486a3186e871e52b38eb0b21 100644 (file)
--- a/include/wx/motif/timer.h
+++ b/include/wx/motif/timer.h
@@ -12,29 +12,29 @@
 #ifndef _WX_TIMER_H_
 #define _WX_TIMER_H_
 
-#ifdef __GNUG__
-    #pragma interface "timer.h"
-#endif
-
 class WXDLLEXPORT wxTimer : public wxTimerBase
 {
-friend void wxTimerCallback(wxTimer * timer);
-
+    friend void wxTimerCallback(wxTimer * timer);
+    
 public:
-    wxTimer();
+    wxTimer() { Init(); }
+    wxTimer(wxEvtHandler *owner, int id = -1) : wxTimerBase(owner, id)
+    { Init(); }
     ~wxTimer();
-
-    virtual bool Start(int milliseconds = -1, bool oneShot = FALSE);
+    
+    virtual bool Start(int milliseconds = -1, bool oneShot = false);
     virtual void Stop();
-
+    
     virtual bool IsRunning() const { return m_id != 0; }
-
+    
 protected:
+    void Init();
+    
     long m_id;
-
+    
 private:
     DECLARE_DYNAMIC_CLASS(wxTimer)
 };
 
 #endif
-    // _WX_TIMER_H_
+// _WX_TIMER_H_