we need our own imaglist implementation because in wxmac wxIcon does not inherit...

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

diff --git a/include/wx/motif/timer.h b/include/wx/motif/timer.h
index d6d6df245538e716de060bf16d16044c220717f1..b669415151591b3537b1d7459fba365731b764c5 100644 (file)
--- a/include/wx/motif/timer.h
+++ b/include/wx/motif/timer.h
@@ -12,29 +12,33 @@
 #ifndef _WX_TIMER_H_
 #define _WX_TIMER_H_
 
 #ifndef _WX_TIMER_H_
 #define _WX_TIMER_H_
 

-#ifdef __GNUG__
-    #pragma interface "timer.h"
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+#pragma interface "timer.h"

 #endif
 
 class WXDLLEXPORT wxTimer : public wxTimerBase
 {
 #endif
 
 class WXDLLEXPORT wxTimer : public wxTimerBase
 {

-friend void wxTimerCallback(wxTimer * timer);
-
+    friend void wxTimerCallback(wxTimer * timer);
+    

 public:
 public:

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

     ~wxTimer();
     ~wxTimer();

-
-    virtual bool Start(int milliseconds = -1, bool oneShot = FALSE);
+    
+    virtual bool Start(int milliseconds = -1, bool oneShot = false);

     virtual void Stop();
     virtual void Stop();

-
+    

     virtual bool IsRunning() const { return m_id != 0; }
     virtual bool IsRunning() const { return m_id != 0; }

-
+    

 protected:
 protected:

+    void Init();
+    

     long m_id;
     long m_id;

-
+    

 private:
     DECLARE_DYNAMIC_CLASS(wxTimer)
 };
 
 #endif
 private:
     DECLARE_DYNAMIC_CLASS(wxTimer)
 };
 
 #endif

-    // _WX_TIMER_H_
+// _WX_TIMER_H_