made wxTLW::SetIcon() non-virtual, it was already implemented in terms of

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

diff --git a/include/wx/msw/timer.h b/include/wx/msw/timer.h
index 116e02e303f3a18692fc17e2bfefc51bb0f9c472..ad80f5080ce9408b444f7fce40d6efea4c53f067 100644 (file)
--- a/include/wx/msw/timer.h
+++ b/include/wx/msw/timer.h
@@ -12,21 +12,17 @@
 #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 wxProcessTimer(wxTimer& timer);
 
 public:
     wxTimer() { Init(); }
-    wxTimer(wxEvtHandler *owner, int id = -1) : wxTimerBase(owner, id)
+    wxTimer(wxEvtHandler *owner, int id = wxID_ANY) : wxTimerBase(owner, id)
         { Init(); }
-    ~wxTimer();
+    virtual ~wxTimer();
 
-    virtual bool Start(int milliseconds = -1, bool oneShot = FALSE);
+    virtual bool Start(int milliseconds = -1, bool oneShot = false);
     virtual void Stop();
 
     virtual bool IsRunning() const { return m_id != 0; }
@@ -34,7 +30,7 @@ public:
 protected:
     void Init();
 
-    long m_id;
+    unsigned long m_id;
 
 private:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxTimer)