// macros
 // ----------------------------------------------------------------------------
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject)
-#endif
 
-wxTimer::wxTimer()
+void wxTimer::Init()
 {
     m_ulId = 0;
 }
 wxTimer::~wxTimer()
 {
     Stop();
-
+    wxTimer::Stop();
     wxTimerList.DeleteObject(this);
 }