fixed gcc warnings and reformatted some pieces of code to be a bit readable

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

diff --git a/include/wx/timer.h b/include/wx/timer.h
index 877a3208993a63ffc72466986aa3c67b57f19084..ae71d604eed22ddf86feeb276ba5b9033be15d2c 100644 (file)
--- a/include/wx/timer.h
+++ b/include/wx/timer.h
@@ -90,12 +90,6 @@ public:
     // return TRUE if the timer is one shot
     bool IsOneShot() const { return m_oneShot; }
 
     // 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; }
 protected:
     // common part of all ctors
     void Init() { m_oneShot = FALSE; m_milli = 0; }