Temporarily disable colour picker to keep build working and bofore finding nice repla...

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

diff --git a/include/wx/msw/timer.h b/include/wx/msw/timer.h
index 9ecd87327cb494812e703eb566030c684818144e..0607121c6c342e6f990ecea89c64653bdd53a223 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_
 
 #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(); }
 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();
 
         { Init(); }
     ~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; }
     virtual void Stop();
 
     virtual bool IsRunning() const { return m_id != 0; }