fixing 'id' objc.h collisions, listbox rewrite

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

diff --git a/include/wx/timer.h b/include/wx/timer.h
index 313e0446807de9a71c5dc2c5c05da52f49221cdb..8955051268dd4ed237302b231052778408869e44 100644 (file)
--- a/include/wx/timer.h
+++ b/include/wx/timer.h
@@ -1,34 +1,27 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/timer.h
 // Purpose:     wxTimer, wxStopWatch and global time-related functions
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/timer.h
 // Purpose:     wxTimer, wxStopWatch and global time-related functions

-// Author:      Julian Smart (wxTimer), Sylvain Bougnoux (wxStopWatch)
+// Author:      Julian Smart

 // Modified by: Vadim Zeitlin (wxTimerBase)
 //              Guillermo Rodriguez (global clean up)
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Modified by: Vadim Zeitlin (wxTimerBase)
 //              Guillermo Rodriguez (global clean up)
 // Created:     04/01/98
 // RCS-ID:      $Id$

-// Copyright:   (c) wxWidgets team
+// Copyright:   (c) Julian Smart

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TIMER_H_BASE_
 #define _WX_TIMER_H_BASE_
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #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/setup.h"

 #include "wx/object.h"
 #include "wx/longlong.h"
 #include "wx/event.h"
 #include "wx/object.h"
 #include "wx/longlong.h"
 #include "wx/event.h"

-

 #include "wx/stopwatch.h" // for backwards compatibility
 
 #include "wx/stopwatch.h" // for backwards compatibility
 

-#if wxUSE_GUI && wxUSE_TIMER
-
-// ----------------------------------------------------------------------------
-// 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,10 +109,14 @@ 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(__WXX11__) || defined(__WXMGL__) || defined(__WXCOCOA__)
+#elif defined(__WXGTK__)
+    #include "wx/gtk1/timer.h"
+#elif defined(__WXX11__) || defined(__WXMGL__)

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

+#elif defined (__WXCOCOA__)
+    #include "wx/cocoa/timer.h"

 #elif defined(__WXMAC__)
     #include "wx/mac/timer.h"
 #elif defined(__WXPM__)
 #elif defined(__WXMAC__)
     #include "wx/mac/timer.h"
 #elif defined(__WXPM__)


@@ -187,8 +184,11 @@ private:
 
 typedef void (wxEvtHandler::*wxTimerEventFunction)(wxTimerEvent&);
 
 
 typedef void (wxEvtHandler::*wxTimerEventFunction)(wxTimerEvent&);
 

+#define wxTimerEventHandler(func) \
+    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxTimerEventFunction, &func)
+

 #define EVT_TIMER(timerid, func) \
 #define EVT_TIMER(timerid, func) \

-    DECLARE_EVENT_TABLE_ENTRY( wxEVT_TIMER, timerid, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxTimerEventFunction, & func ), NULL),
+    wx__DECLARE_EVT1(wxEVT_TIMER, timerid, wxTimerEventHandler(func))

 
 #endif // wxUSE_GUI && wxUSE_TIMER
 
 
 #endif // wxUSE_GUI && wxUSE_TIMER