small optimization in wxConfigPathChanger: don't change the path if it is already...

[wxWidgets.git] / src / os2 / timer.cpp

diff --git a/src/os2/timer.cpp b/src/os2/timer.cpp
index bb897e1f78b3c53b8595699047657e2e629d41f0..1aebce5ee143222539b25e8c9eb994e45cc0517b 100644 (file)
--- a/src/os2/timer.cpp
+++ b/src/os2/timer.cpp
@@ -9,6 +9,10 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+#ifdef __GNUG__
+    #pragma implementation "timer.h"
+#endif
+
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -42,7 +46,7 @@ ULONG wxTimerProc(HWND hwnd, ULONG, int nIdTimer, ULONG);
 // macros
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject)
+IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxEvtHandler)
 
 void wxTimer::Init()
 {
@@ -51,8 +55,8 @@ void wxTimer::Init()
 
 wxTimer::~wxTimer()
 {
-    Stop();
     wxTimer::Stop();
+
     wxTimerList.DeleteObject(this);
 }
 
@@ -164,8 +168,8 @@ ULONG wxTimerProc(
     wxNode*                         pNode = wxTimerList.Find((ULONG)nIdTimer);
 
     wxCHECK_MSG(pNode, 0, wxT("bogus timer id in wxTimerProc") );
-
-    wxProcessTimer(*(wxTimer *)pNode->Data());
+    if (pNode)
+      wxProcessTimer(*(wxTimer *)pNode->GetData());
     return 0;
 }