added wx/font.h include to fix PCH-less build

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

diff --git a/include/wx/timer.h b/include/wx/timer.h
index 6cded151efebff1a4ad35628d4e592b3f8e3cb75..8955051268dd4ed237302b231052778408869e44 100644 (file)
--- a/include/wx/timer.h
+++ b/include/wx/timer.h
@@ -13,10 +13,6 @@
 #ifndef _WX_TIMER_H_BASE_
 #define _WX_TIMER_H_BASE_
 
 #ifndef _WX_TIMER_H_BASE_
 #define _WX_TIMER_H_BASE_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "timerbase.h"
-#endif
-

 #include "wx/defs.h"
 
 #if wxUSE_GUI && wxUSE_TIMER
 #include "wx/defs.h"
 
 #if wxUSE_GUI && wxUSE_TIMER


@@ -26,9 +22,6 @@
 #include "wx/event.h"
 #include "wx/stopwatch.h" // for backwards compatibility
 
 #include "wx/event.h"
 #include "wx/stopwatch.h" // for backwards compatibility
 

-// ----------------------------------------------------------------------------
-// wxTimer
-// ----------------------------------------------------------------------------

 
 // more readable flags for Start():
 
 
 // more readable flags for Start():
 


@@ -47,7 +40,8 @@ public:
 
     // default: if you don't call SetOwner(), your only chance to get timer
     // notifications is to override Notify() in the derived class
 
     // default: if you don't call SetOwner(), your only chance to get timer
     // notifications is to override Notify() in the derived class

-    wxTimerBase() { Init(); SetOwner(this); }
+    wxTimerBase()
+        { Init(); SetOwner(this); }

 
     // ctor which allows to avoid having to override Notify() in the derived
     // class: the owner will get timer notifications which can be handled with
 
     // ctor which allows to avoid having to override Notify() in the derived
     // class: the owner will get timer notifications which can be handled with


@@ -58,7 +52,7 @@ public:
     // same as ctor above
     void SetOwner(wxEvtHandler *owner, int timerid = wxID_ANY)
         { m_owner = owner; m_idTimer = timerid; }
     // same as ctor above
     void SetOwner(wxEvtHandler *owner, int timerid = wxID_ANY)
         { m_owner = owner; m_idTimer = timerid; }

-    wxEvtHandler* GetOwner() const { return m_owner; }
+    wxEvtHandler * GetOwner() const { return m_owner; }

 
     virtual ~wxTimerBase();
 
 
     virtual ~wxTimerBase();
 


@@ -85,23 +79,22 @@ public:
     // return true if the timer is running
     virtual bool IsRunning() const = 0;
 
     // return true if the timer is running
     virtual bool IsRunning() const = 0;
 

-    // get the (last) timer interval in the milliseconds
+    // return the timer ID
+    int GetId() const { return m_idTimer; }
+
+    // get the (last) timer interval in milliseconds

     int GetInterval() const { return m_milli; }
 
     // return true if the timer is one shot
     bool IsOneShot() const { return m_oneShot; }
 
     int GetInterval() const { return m_milli; }
 
     // return true if the timer is one shot
     bool IsOneShot() const { return m_oneShot; }
 

-    // return the timer ID
-    int GetId() const { return m_idTimer; }
-
-

 protected:
     // common part of all ctors
 protected:
     // common part of all ctors

-    void Init() { m_oneShot = false; m_milli = 0; }
+    void Init()
+        { m_owner = NULL; m_idTimer = wxID_ANY; m_milli = 0; m_oneShot = false; }

 
     wxEvtHandler *m_owner;
     int     m_idTimer;
 
     wxEvtHandler *m_owner;
     int     m_idTimer;

-

     int     m_milli;        // the timer interval
     bool    m_oneShot;      // true if one shot
 
     int     m_milli;        // the timer interval
     bool    m_oneShot;      // true if one shot
 


@@ -116,8 +109,10 @@ protected:
     #include "wx/msw/timer.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/timer.h"
     #include "wx/msw/timer.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/timer.h"

-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)

     #include "wx/gtk/timer.h"
     #include "wx/gtk/timer.h"

+#elif defined(__WXGTK__)
+    #include "wx/gtk1/timer.h"

 #elif defined(__WXX11__) || defined(__WXMGL__)
     #include "wx/generic/timer.h"
 #elif defined (__WXCOCOA__)
 #elif defined(__WXX11__) || defined(__WXMGL__)
     #include "wx/generic/timer.h"
 #elif defined (__WXCOCOA__)