X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fc7a2a602b4bd9308be21bc07e40a680f483438e..5bc97d1b81910a82e249f6227798b42089149f94:/include/wx/timer.h diff --git a/include/wx/timer.h b/include/wx/timer.h index cc33886ea1..ae71d604ee 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_ -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "timerbase.h" #endif @@ -90,12 +90,6 @@ public: // return TRUE if the timer is one shot bool IsOneShot() const { return m_oneShot; } -#if WXWIN_COMPATIBILITY_2 - // deprecated functions - int Interval() const { return GetInterval(); }; - bool OneShot() const { return IsOneShot(); } -#endif // WXWIN_COMPATIBILITY_2 - protected: // common part of all ctors void Init() { m_oneShot = FALSE; m_milli = 0; }