Common code for the same handling of wxSL_INVERSE.

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

diff --git a/include/wx/gtk1/timer.h b/include/wx/gtk1/timer.h
index a565eefd3d46adf5507306b53417c960c7d57221..5d006be202fcc6669609694909695f1df3b4f92d 100644 (file)
--- a/include/wx/gtk1/timer.h
+++ b/include/wx/gtk1/timer.h
@@ -1,17 +1,17 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        timer.h
+// Name:        wx/gtk/timer.h

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 
 #ifndef __GTKTIMERH__
 #define __GTKTIMERH__
 
 /////////////////////////////////////////////////////////////////////////////
 
 
 #ifndef __GTKTIMERH__
 #define __GTKTIMERH__
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "timer.h"
 #endif
 
     #pragma interface "timer.h"
 #endif
 


@@ -22,7 +22,9 @@
 class wxTimer : public wxTimerBase
 {
 public:
 class wxTimer : public wxTimerBase
 {
 public:

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

     ~wxTimer();
 
     virtual bool Start( int millisecs = -1, bool oneShot = FALSE );
     ~wxTimer();
 
     virtual bool Start( int millisecs = -1, bool oneShot = FALSE );


@@ -31,6 +33,8 @@ public:
     virtual bool IsRunning() const { return m_tag != -1; }
 
 protected:
     virtual bool IsRunning() const { return m_tag != -1; }
 
 protected:

+    void Init();
+

     int  m_tag;
 
 private:
     int  m_tag;
 
 private: