added __WXBASE__ define; removed duplicated (in wx/chkconf.h) compatibility section

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

diff --git a/src/os2/timer.cpp b/src/os2/timer.cpp
index bb897e1f78b3c53b8595699047657e2e629d41f0..f102ace512ef8a7204c1a899deb05958f20751ae 100644 (file)
--- a/src/os2/timer.cpp
+++ b/src/os2/timer.cpp
@@ -9,6 +9,10 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

+#ifdef __GNUG__
+    #pragma implementation "timer.h"
+#endif
+

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -51,8 +55,8 @@ void wxTimer::Init()
 
 wxTimer::~wxTimer()
 {
 
 wxTimer::~wxTimer()
 {

-    Stop();

     wxTimer::Stop();
     wxTimer::Stop();

+

     wxTimerList.DeleteObject(this);
 }
 
     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") );
     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->Data());

     return 0;
 }
 
     return 0;
 }