X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..d9fda37ba1e29443ed473d3c69e71480935e09b7:/src/palmos/timer.cpp

diff --git a/src/palmos/timer.cpp b/src/palmos/timer.cpp
index 4867dbe6be..8b7241b828 100644
--- a/src/palmos/timer.cpp
+++ b/src/palmos/timer.cpp
@@ -18,19 +18,18 @@
 
 #if wxUSE_TIMER
 
+#include "wx/palmos/private/timer.h"
+
 #ifndef WX_PRECOMP
-    #include "wx/window.h"
     #include "wx/list.h"
+    #include "wx/window.h"
     #include "wx/event.h"
     #include "wx/app.h"
     #include "wx/intl.h"
     #include "wx/log.h"
+    #include "wx/hashmap.h"
 #endif
 
-#include "wx/hashmap.h"
-
-#include "wx/timer.h"
-
 #include "wx/palmos/private.h"
 
 // from utils.cpp
@@ -43,7 +42,7 @@ wxCreateHiddenWindow(LPCTSTR *pclassname, LPCTSTR classname, WNDPROC wndproc);
 
 // 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;
@@ -54,12 +53,6 @@ static wxTimerMap g_timerMap;
 
 void WINAPI wxTimerProc(HWND hwnd, WORD, int idTimer, DWORD);
 
-// ----------------------------------------------------------------------------
-// macros
-// ----------------------------------------------------------------------------
-
-IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxEvtHandler)
-
 // ============================================================================
 // implementation
 // ============================================================================
@@ -68,20 +61,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,7 +82,7 @@ void wxTimer::Stop()
 // private functions
 // ----------------------------------------------------------------------------
 
-void wxProcessTimer(wxTimer& timer)
+void wxProcessTimer(wxPalmOSTimerImpl& timer)
 {
 }
 
@@ -98,4 +91,3 @@ void WINAPI wxTimerProc(HWND WXUNUSED(hwnd), WORD, int idTimer, DWORD)
 }
 
 #endif // wxUSE_TIMER
-