fix for wxBitmapType definition problem

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

diff --git a/src/msw/timer.cpp b/src/msw/timer.cpp
index cd331eb4ec1ce8b3e9ae74769622ce6df62f3f04..e999fd6924d260e6e3c3af6fb3f85d12c1923726 100644 (file)
--- a/src/msw/timer.cpp
+++ b/src/msw/timer.cpp
@@ -20,6 +20,8 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_TIMER
+
 #ifndef WX_PRECOMP
     #include "wx/setup.h"
     #include "wx/window.h"
@@ -51,7 +53,7 @@ UINT WINAPI _EXPORT wxTimerProc(HWND hwnd, WORD, int idTimer, DWORD);
     #define _EXPORT _export
 #endif
 
-    IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject)
+IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject)
 
 // ============================================================================
 // implementation
@@ -61,7 +63,7 @@ UINT WINAPI _EXPORT wxTimerProc(HWND hwnd, WORD, int idTimer, DWORD);
 // wxTimer class
 // ----------------------------------------------------------------------------
 
-wxTimer::wxTimer()
+void wxTimer::Init()
 {
     m_id = 0;
 }
@@ -136,3 +138,5 @@ UINT WINAPI _EXPORT wxTimerProc(HWND WXUNUSED(hwnd), WORD, int idTimer, DWORD)
 
     return 0;
 }
+
+#endif // wxUSE_TIMER