don't use wxVector<wxDataFormat> from wx/clipbrd.h as wxDataFormat definition is...

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

diff --git a/src/palmos/timer.cpp b/src/palmos/timer.cpp
index 426dc3036748f2f7bc76e572930531a0beaa001d..37ec7bd3d95085cc84aad624e7917296e1ba6960 100644 (file)
--- a/src/palmos/timer.cpp
+++ b/src/palmos/timer.cpp
@@ -18,6 +18,8 @@
 
 #if wxUSE_TIMER
 
 
 #if wxUSE_TIMER
 

+#include "wx/palmos/private/timer.h"
+

 #ifndef WX_PRECOMP
     #include "wx/list.h"
     #include "wx/window.h"
 #ifndef WX_PRECOMP
     #include "wx/list.h"
     #include "wx/window.h"


@@ -25,25 +27,16 @@
     #include "wx/app.h"
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/intl.h"
     #include "wx/log.h"

+    #include "wx/hashmap.h"

 #endif
 
 #endif
 

-#include "wx/hashmap.h"
-
-#include "wx/timer.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
 // ----------------------------------------------------------------------------
 // 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;
                     wxTimerMap);
 
 static wxTimerMap g_timerMap;


@@ -52,14 +45,6 @@ static wxTimerMap g_timerMap;
 // private functions
 // ----------------------------------------------------------------------------
 
 // private functions
 // ----------------------------------------------------------------------------
 

-void WINAPI wxTimerProc(HWND hwnd, WORD, int idTimer, DWORD);
-
-// ----------------------------------------------------------------------------
-// macros
-// ----------------------------------------------------------------------------
-
-IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxEvtHandler)
-

 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================


@@ -68,20 +53,20 @@ IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxEvtHandler)
 // wxTimer class
 // ----------------------------------------------------------------------------
 
 // 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;
 }
 
 {
     return false;
 }
 

-void wxTimer::Stop()
+void wxPalmOSTimerImpl::Stop()

 {
 }
 
 {
 }
 


@@ -89,11 +74,7 @@ void wxTimer::Stop()
 // private functions
 // ----------------------------------------------------------------------------
 
 // private functions
 // ----------------------------------------------------------------------------
 

-void wxProcessTimer(wxTimer& timer)
-{
-}
-
-void WINAPI wxTimerProc(HWND WXUNUSED(hwnd), WORD, int idTimer, DWORD)
+void wxProcessTimer(wxPalmOSTimerImpl& timer)

 {
 }
 
 {
 }