correct the test for Windows platform (this also fixes unit test failures in FormatCo...

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

diff --git a/src/palmos/timer.cpp b/src/palmos/timer.cpp
index 74ae9f19652deefacdc07aaf03397b4988566809..37ec7bd3d95085cc84aad624e7917296e1ba6960 100644 (file)
--- a/src/palmos/timer.cpp
+++ b/src/palmos/timer.cpp
@@ -18,7 +18,7 @@
 
 #if wxUSE_TIMER
 
-#include "wx/timer.h"
+#include "wx/palmos/private/timer.h"
 
 #ifndef WX_PRECOMP
     #include "wx/list.h"
@@ -27,23 +27,16 @@
     #include "wx/app.h"
     #include "wx/intl.h"
     #include "wx/log.h"
+    #include "wx/hashmap.h"
 #endif
 
-#include "wx/hashmap.h"
-
-#include "wx/palmos/private.h"
-
-// from utils.cpp
-extern "C" WXDLLIMPEXP_BASE HWND
-wxCreateHiddenWindow(LPCTSTR *pclassname, LPCTSTR classname, WNDPROC wndproc);
-
 // ----------------------------------------------------------------------------
 // private globals
 // ----------------------------------------------------------------------------
 
 // define a hash containing all the timers: it is indexed by timer id and
 // contains the corresponding timer
-WX_DECLARE_HASH_MAP(unsigned long, wxTimer *, wxIntegerHash, wxIntegerEqual,
+WX_DECLARE_HASH_MAP(unsigned long, wxPalmOSTimerImpl*, wxIntegerHash, wxIntegerEqual,
                     wxTimerMap);
 
 static wxTimerMap g_timerMap;
@@ -52,14 +45,6 @@ static wxTimerMap g_timerMap;
 // private functions
 // ----------------------------------------------------------------------------
 
-void WINAPI wxTimerProc(HWND hwnd, WORD, int idTimer, DWORD);
-
-// ----------------------------------------------------------------------------
-// macros
-// ----------------------------------------------------------------------------
-
-IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxEvtHandler)
-
 // ============================================================================
 // implementation
 // ============================================================================
@@ -68,20 +53,20 @@ IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxEvtHandler)
 // wxTimer class
 // ----------------------------------------------------------------------------
 
-void wxTimer::Init()
+void wxPalmOSTimerImpl::Init()
 {
 }
 
-wxTimer::~wxTimer()
+wxPalmOSTimerImpl::~wxPalmOSTimerImpl()
 {
 }
 
-bool wxTimer::Start(int milliseconds, bool oneShot)
+bool wxPalmOSTimerImpl::Start(int milliseconds, bool oneShot)
 {
     return false;
 }
 
-void wxTimer::Stop()
+void wxPalmOSTimerImpl::Stop()
 {
 }
 
@@ -89,11 +74,7 @@ void wxTimer::Stop()
 // private functions
 // ----------------------------------------------------------------------------
 
-void wxProcessTimer(wxTimer& timer)
-{
-}
-
-void WINAPI wxTimerProc(HWND WXUNUSED(hwnd), WORD, int idTimer, DWORD)
+void wxProcessTimer(wxPalmOSTimerImpl& timer)
 {
 }