Fixed compilation problem.

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

diff --git a/include/wx/timer.h b/include/wx/timer.h
index cc33886ea1d9d40a353e0245753d78fa07f9b42c..ae71d604eed22ddf86feeb276ba5b9033be15d2c 100644 (file)
--- 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; }