column autosizing added

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

diff --git a/include/wx/timer.h b/include/wx/timer.h
index 30e48fca4453ae08abad3359aadbaae48b624be6..30491db2ff37b96b57a7df4a574841d385e79b43 100644 (file)
--- a/include/wx/timer.h
+++ b/include/wx/timer.h
@@ -41,7 +41,7 @@ public:
     // class: the owner will get timer notifications which can be handled with
     // EVT_TIMER
     wxTimerBase(wxEvtHandler *owner, int id = -1)
     // class: the owner will get timer notifications which can be handled with
     // EVT_TIMER
     wxTimerBase(wxEvtHandler *owner, int id = -1)

-        { Init(); SetOwner(owner, -1); }
+        { Init(); SetOwner(owner, id); }

 
     // same as ctor above
     void SetOwner(wxEvtHandler *owner, int id = -1)
 
     // same as ctor above
     void SetOwner(wxEvtHandler *owner, int id = -1)


@@ -158,8 +158,8 @@ public:
     // ctor starts the stop watch
     wxStopWatch()        { Start(); }
     void Start(long t = 0);
     // ctor starts the stop watch
     wxStopWatch()        { Start(); }
     void Start(long t = 0);

-    inline void Pause()  { m_pause = GetElapsedTime(); }
-    inline void Resume() { Start(m_pause); }
+    void Pause()  { m_pause = GetElapsedTime(); }
+    void Resume() { Start(m_pause); }

 
     // get elapsed time since the last Start() or Pause() in milliseconds
     long Time() const;
 
     // get elapsed time since the last Start() or Pause() in milliseconds
     long Time() const;