Added C/wxString array constructors to wxArrayString

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

diff --git a/include/wx/msw/timer.h b/include/wx/msw/timer.h
index 7e2d20f77f363f61a1a292efb41d00ce33720962..ffa150e111c6a4b4224c4b092bc92aa67679b7b9 100644 (file)
--- a/include/wx/msw/timer.h
+++ b/include/wx/msw/timer.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

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

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


@@ -22,11 +22,11 @@ friend void wxProcessTimer(wxTimer& timer);
 
 public:
     wxTimer() { Init(); }
 
 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; }