added bmpbase.cpp (forgotten during merge?)

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

diff --git a/src/os2/timer.cpp b/src/os2/timer.cpp
index 6ae0e005b0e054b5852a6606edb728c9fc0924b2..d3c2fdff27053130fc9987a39035401d5afd2f9c 100644 (file)
--- a/src/os2/timer.cpp
+++ b/src/os2/timer.cpp
@@ -31,7 +31,6 @@
 #include <sys/types.h>
 
 #include <sys/timeb.h>
 #include <sys/types.h>
 
 #include <sys/timeb.h>

-

 // ----------------------------------------------------------------------------
 // private functions
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // private functions
 // ----------------------------------------------------------------------------


@@ -43,11 +42,9 @@ ULONG wxTimerProc(HWND hwnd, ULONG, int nIdTimer, ULONG);
 // macros
 // ----------------------------------------------------------------------------
 
 // macros
 // ----------------------------------------------------------------------------
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject)
 IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject)

-#endif

 
 

-wxTimer::wxTimer()
+void wxTimer::Init()

 {
     m_ulId = 0;
 }
 {
     m_ulId = 0;
 }


@@ -55,7 +52,7 @@ wxTimer::wxTimer()
 wxTimer::~wxTimer()
 {
     Stop();
 wxTimer::~wxTimer()
 {
     Stop();

-
+    wxTimer::Stop();

     wxTimerList.DeleteObject(this);
 }
 
     wxTimerList.DeleteObject(this);
 }