SetTextColour is gone

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

diff --git a/include/wx/motif/timer.h b/include/wx/motif/timer.h
index b669415151591b3537b1d7459fba365731b764c5..add463502d8c58675385536e6f2c1e0bd4f3ac80 100644 (file)
--- a/include/wx/motif/timer.h
+++ b/include/wx/motif/timer.h
@@ -1,41 +1,37 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        timer.h
+// Name:        wx/motif/timer.h

 // Purpose:     wxTimer class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Purpose:     wxTimer class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TIMER_H_
 #define _WX_TIMER_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TIMER_H_
 #define _WX_TIMER_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "timer.h"
-#endif
-

 class WXDLLEXPORT wxTimer : public wxTimerBase
 {
     friend void wxTimerCallback(wxTimer * timer);
 class WXDLLEXPORT wxTimer : public wxTimerBase
 {
     friend void wxTimerCallback(wxTimer * timer);

-    
+

 public:
     wxTimer() { Init(); }
     wxTimer(wxEvtHandler *owner, int id = -1) : wxTimerBase(owner, id)
     { Init(); }
 public:
     wxTimer() { Init(); }
     wxTimer(wxEvtHandler *owner, int id = -1) : wxTimerBase(owner, id)
     { Init(); }

-    ~wxTimer();
-    
+    virtual ~wxTimer();
+

     virtual bool Start(int milliseconds = -1, bool oneShot = false);
     virtual void Stop();
     virtual bool Start(int milliseconds = -1, bool oneShot = false);
     virtual void Stop();

-    
+

     virtual bool IsRunning() const { return m_id != 0; }
     virtual bool IsRunning() const { return m_id != 0; }

-    
+

 protected:
     void Init();
 protected:
     void Init();

-    
+

     long m_id;
     long m_id;

-    
+

 private:
     DECLARE_DYNAMIC_CLASS(wxTimer)
 };
 private:
     DECLARE_DYNAMIC_CLASS(wxTimer)
 };