X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/677eff077ec0e0fbdda61f4e5e7c186e21c4fc47..2fda2145700445519a0ce539b04dc72bae180124:/include/wx/timer.h diff --git a/include/wx/timer.h b/include/wx/timer.h index 7fff1bbdc3..d6fcce73d0 100644 --- a/include/wx/timer.h +++ b/include/wx/timer.h @@ -13,7 +13,7 @@ #ifndef _WX_TIMER_H_BASE_ #define _WX_TIMER_H_BASE_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "timerbase.h" #endif @@ -28,6 +28,14 @@ // wxTimer // ---------------------------------------------------------------------------- +// more readable flags for Start(): + +// generate notifications periodically until the timer is stopped (default) +#define wxTIMER_CONTINUOUS FALSE + +// only send the notification once and then stop the timer +#define wxTIMER_ONE_SHOT TRUE + // the interface of wxTimer class class WXDLLEXPORT wxTimerBase : public wxObject { @@ -95,6 +103,8 @@ protected: int m_milli; // the timer interval bool m_oneShot; // TRUE if one shot + + DECLARE_NO_COPY_CLASS(wxTimerBase) }; // ---------------------------------------------------------------------------- @@ -113,8 +123,6 @@ protected: #include "wx/mac/timer.h" #elif defined(__WXPM__) #include "wx/os2/timer.h" -#elif defined(__WXSTUBS__) - #include "wx/stubs/timer.h" #endif // ----------------------------------------------------------------------------