Applied patch [ 1845819 ] wxMSW Top level window freeze fix for trunk

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

diff --git a/include/wx/timer.h b/include/wx/timer.h
index 1707d8346ef5c0f9b922c31512ee6d93667326b0..4e36b6d35f174fc2ea4ddac948d86a19b87a08a7 100644 (file)
--- a/include/wx/timer.h
+++ b/include/wx/timer.h
@@ -1,45 +1,41 @@
 /////////////////////////////////////////////////////////////////////////////
 // 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) wxWindows 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_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

+#include "wx/utils.h"

 
 

-#if wxUSE_GUI && wxUSE_TIMER
-
-// ----------------------------------------------------------------------------
-// wxTimer
-// ----------------------------------------------------------------------------

 
 // more readable flags for Start():
 
 // generate notifications periodically until the timer is stopped (default)
 
 // more readable flags for Start():
 
 // generate notifications periodically until the timer is stopped (default)

-#define wxTIMER_CONTINUOUS FALSE
+#define wxTIMER_CONTINUOUS false

 
 // only send the notification once and then stop the timer
 
 // only send the notification once and then stop the timer

-#define wxTIMER_ONE_SHOT TRUE
+#define wxTIMER_ONE_SHOT true
+
+class WXDLLIMPEXP_FWD_BASE wxTimerImpl;

 
 // the interface of wxTimer class
 
 // the interface of wxTimer class

-class WXDLLEXPORT wxTimerBase : public wxEvtHandler
+class WXDLLIMPEXP_BASE wxTimer : public wxEvtHandler

 {
 public:
     // ctors and initializers
 {
 public:
     // ctors and initializers


@@ -47,95 +43,90 @@ 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); }
+    wxTimer()
+    {
+        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
     // EVT_TIMER
 
     // ctor which allows to avoid having to override Notify() in the derived
     // class: the owner will get timer notifications which can be handled with
     // EVT_TIMER

-    wxTimerBase(wxEvtHandler *owner, int timerid = -1)
-        { Init(); SetOwner(owner, timerid); }
+    wxTimer(wxEvtHandler *owner, int timerid = wxID_ANY)
+    {
+        Init();
+        SetOwner(owner, timerid);
+    }

 
     // same as ctor above
 
     // same as ctor above

-    void SetOwner(wxEvtHandler *owner, int timerid = -1)
-        { m_owner = owner; m_idTimer = timerid; }
+    void SetOwner(wxEvtHandler *owner, int timerid = wxID_ANY);
+
+    virtual ~wxTimer();

 
 

-    virtual ~wxTimerBase();

 
     // working with the timer
     // ----------------------
 
 
     // working with the timer
     // ----------------------
 

+    // NB: Start() and Stop() are not supposed to be overridden, they are only
+    //     virtual for historical reasons, only Notify() can be overridden
+

     // start the timer: if milliseconds == -1, use the same value as for the
     // last Start()
     //
     // it is now valid to call Start() multiple times: this just restarts the
     // timer if it is already running
     // start the timer: if milliseconds == -1, use the same value as for the
     // last Start()
     //
     // it is now valid to call Start() multiple times: this just restarts the
     // timer if it is already running

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

 
 

-    // stop the timer
-    virtual void Stop() = 0;
+    // stop the timer, does nothing if the timer is not running
+    virtual void Stop();

 
     // override this in your wxTimer-derived class if you want to process timer
     // messages in it, use non default ctor or SetOwner() otherwise
     virtual void Notify();
 
 
     // override this in your wxTimer-derived class if you want to process timer
     // messages in it, use non default ctor or SetOwner() otherwise
     virtual void Notify();
 

-    // getting info
-    // ------------

 
 

-    // return TRUE if the timer is running
-    virtual bool IsRunning() const = 0;
+    // accessors
+    // ---------

 
 

-    // get the (last) timer interval in the milliseconds
-    int GetInterval() const { return m_milli; }
+    // get the object notified about the timer events
+    wxEvtHandler *GetOwner() const;

 
 

-    // return TRUE if the timer is one shot
-    bool IsOneShot() const { return m_oneShot; }
+    // return true if the timer is running
+    bool IsRunning() const;

 
 

-protected:
-    // common part of all ctors
-    void Init() { m_oneShot = FALSE; m_milli = 0; }
+    // return the timer ID
+    int GetId() const;

 
 

-    wxEvtHandler *m_owner;
-    int     m_idTimer;
+    // get the (last) timer interval in milliseconds
+    int GetInterval() const;

 
 

-    int     m_milli;        // the timer interval
-    bool    m_oneShot;      // TRUE if one shot
+    // return true if the timer is one shot
+    bool IsOneShot() const;

 
 

-    DECLARE_NO_COPY_CLASS(wxTimerBase)
-};
+protected:
+    // common part of all ctors
+    void Init();

 
 

-// ----------------------------------------------------------------------------
-// wxTimer itself
-// ----------------------------------------------------------------------------
+    wxTimerImpl *m_impl;

 
 

-#if defined(__WXMSW__)
-    #include "wx/msw/timer.h"
-#elif defined(__WXMOTIF__)
-    #include "wx/motif/timer.h"
-#elif defined(__WXGTK__)
-    #include "wx/gtk/timer.h"
-#elif defined(__WXX11__) || defined(__WXMGL__) || defined(__WXCOCOA__)
-    #include "wx/generic/timer.h"
-#elif defined(__WXMAC__)
-    #include "wx/mac/timer.h"
-#elif defined(__WXPM__)
-    #include "wx/os2/timer.h"
-#endif
+    DECLARE_NO_COPY_CLASS(wxTimer)
+};

 
 // ----------------------------------------------------------------------------
 // wxTimerRunner: starts the timer in its ctor, stops in the dtor
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // wxTimerRunner: starts the timer in its ctor, stops in the dtor
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxTimerRunner
+class WXDLLIMPEXP_BASE wxTimerRunner

 {
 public:
     wxTimerRunner(wxTimer& timer) : m_timer(timer) { }
 {
 public:
     wxTimerRunner(wxTimer& timer) : m_timer(timer) { }

-    wxTimerRunner(wxTimer& timer, int milli, bool oneShot = FALSE)
+    wxTimerRunner(wxTimer& timer, int milli, bool oneShot = false)

         : m_timer(timer)
     {
         m_timer.Start(milli, oneShot);
     }
 
         : m_timer(timer)
     {
         m_timer.Start(milli, oneShot);
     }
 

-    void Start(int milli, bool oneShot = FALSE)
+    void Start(int milli, bool oneShot = false)

     {
         m_timer.Start(milli, oneShot);
     }
     {
         m_timer.Start(milli, oneShot);
     }


@@ -158,34 +149,38 @@ private:
 // wxTimerEvent
 // ----------------------------------------------------------------------------
 
 // wxTimerEvent
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxTimerEvent : public wxEvent
+class WXDLLIMPEXP_BASE wxTimerEvent : public wxEvent

 {
 public:
 {
 public:

-    wxTimerEvent(int timerid = 0, int interval = 0) : wxEvent(timerid)
+    wxTimerEvent(wxTimer& timer)
+        : wxEvent(timer.GetId(), wxEVT_TIMER),
+          m_timer(timer)

     {
     {

-        m_eventType = wxEVT_TIMER;
-
-        m_interval = interval;
+        SetEventObject(timer.GetOwner());

     }
 
     // accessors
     }
 
     // accessors

-    int GetInterval() const { return m_interval; }
+    int GetInterval() const { return m_timer.GetInterval(); }
+    wxTimer& GetTimer() const { return m_timer; }

 
     // implement the base class pure virtual
     virtual wxEvent *Clone() const { return new wxTimerEvent(*this); }
 
 private:
 
     // implement the base class pure virtual
     virtual wxEvent *Clone() const { return new wxTimerEvent(*this); }
 
 private:

-    int m_interval;
+    wxTimer& m_timer;

 
 

-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxTimerEvent)
+    DECLARE_ABSTRACT_CLASS(wxTimerEvent)
+    DECLARE_NO_ASSIGN_CLASS(wxTimerEvent)

 };
 
 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, -1, (wxObjectEventFunction) (wxEventFunction) (wxTimerEventFunction) & func, NULL),
+    wx__DECLARE_EVT1(wxEVT_TIMER, timerid, wxTimerEventHandler(func))

 
 

-#endif // wxUSE_GUI && wxUSE_TIMER
+#endif // wxUSE_TIMER

 
 

-#endif
-    // _WX_TIMER_H_BASE_
+#endif // _WX_TIMER_H_BASE_