Make InheritAttributes and ShouldInheritColours public so they can be

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

diff --git a/include/wx/mac/timer.h b/include/wx/mac/timer.h
index 0f656dae8ff5965008b0fcdb309431901c09abc5..e4eeb8cca2734efd2ed8dd7c96c9ee4504762b8c 100644 (file)
--- a/include/wx/mac/timer.h
+++ b/include/wx/mac/timer.h
@@ -1,49 +1,5 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        timer.h
-// Purpose:     wxTimer class
-// Author:      AUTHOR
-// Modified by:
-// Created:     ??/??/98
-// RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_TIMER_H_
-#define _WX_TIMER_H_
-
-#ifdef __GNUG__
-#pragma interface "timer.h"
-#endif
-
-#include "wx/object.h"
-
-class WXDLLEXPORT wxTimer: public wxObject
-{
-public:
-    wxTimer();
-    ~wxTimer();
-
-    virtual bool Start(int milliseconds = -1,
-                       bool one_shot = FALSE); // Start timer
-    virtual void Stop();                       // Stop timer
-
-    virtual void Notify() = 0;                 // Override this member
-
-    // Returns the current interval time (0 if stop)
-    int Interval() const { return m_milli; }; 
-    bool OneShot() const { return m_oneShot; }
-
-protected:
-    bool m_oneShot ;
-    int  m_milli ;
-    int  m_lastMilli ;
-
-    long m_id;
-
-private:
-    DECLARE_ABSTRACT_CLASS(wxTimer)
-};
-
-#endif
-    // _WX_TIMER_H_
+#if __WXMAC_CLASSIC__
+#include "wx/mac/classic/timer.h"
+#else
+#include "wx/mac/carbon/timer.h"
+#endif
\ No newline at end of file