projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added the static function GetLabelText() to wxStaticText which was mentioned in the...
[wxWidgets.git]
/
src
/
palmos
/
timer.cpp
diff --git
a/src/palmos/timer.cpp
b/src/palmos/timer.cpp
index 254369d4b0cfe46bb82a5b9eb9ea8f933ccd4024..8b7241b828cc21de620c7bb1fc1468c6fb27070f 100644
(file)
--- a/
src/palmos/timer.cpp
+++ b/
src/palmos/timer.cpp
@@
-1,18
+1,14
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: palmos/timer.cpp
+// Name:
src/
palmos/timer.cpp
// Purpose: wxTimer implementation
// Purpose: wxTimer implementation
-// Author: William Osborne
+// Author: William Osborne
- minimal working wxPalmOS port
// Modified by:
// Created: 10/13/04
// Modified by:
// Created: 10/13/04
-// RCS-ID: $Id
:
+// RCS-ID: $Id
$
// Copyright: (c) William Osborne
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Copyright: (c) William Osborne
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma implementation "timer.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
@@
-22,19
+18,18
@@
#if wxUSE_TIMER
#if wxUSE_TIMER
+#include "wx/palmos/private/timer.h"
+
#ifndef WX_PRECOMP
#ifndef WX_PRECOMP
- #include "wx/window.h"
#include "wx/list.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/event.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
#include "wx/palmos/private.h"
// from utils.cpp
@@
-47,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
// define a hash containing all the timers: it is indexed by timer id and
// contains the corresponding timer
-WX_DECLARE_HASH_MAP(unsigned long, wx
Timer
*, wxIntegerHash, wxIntegerEqual,
+WX_DECLARE_HASH_MAP(unsigned long, wx
PalmOSTimerImpl
*, wxIntegerHash, wxIntegerEqual,
wxTimerMap);
static wxTimerMap g_timerMap;
wxTimerMap);
static wxTimerMap g_timerMap;
@@
-58,12
+53,6
@@
static wxTimerMap g_timerMap;
void WINAPI wxTimerProc(HWND hwnd, WORD, int idTimer, DWORD);
void WINAPI wxTimerProc(HWND hwnd, WORD, int idTimer, DWORD);
-// ----------------------------------------------------------------------------
-// macros
-// ----------------------------------------------------------------------------
-
-IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxEvtHandler)
-
// ============================================================================
// implementation
// ============================================================================
// ============================================================================
// implementation
// ============================================================================
@@
-72,20
+61,20
@@
IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxEvtHandler)
// wxTimer class
// ----------------------------------------------------------------------------
// wxTimer class
// ----------------------------------------------------------------------------
-void wx
Timer
::Init()
+void wx
PalmOSTimerImpl
::Init()
{
}
{
}
-wx
Timer::~wxTimer
()
+wx
PalmOSTimerImpl::~wxPalmOSTimerImpl
()
{
}
{
}
-bool wx
Timer
::Start(int milliseconds, bool oneShot)
+bool wx
PalmOSTimerImpl
::Start(int milliseconds, bool oneShot)
{
return false;
}
{
return false;
}
-void wx
Timer
::Stop()
+void wx
PalmOSTimerImpl
::Stop()
{
}
{
}
@@
-93,7
+82,7
@@
void wxTimer::Stop()
// private functions
// ----------------------------------------------------------------------------
// private functions
// ----------------------------------------------------------------------------
-void wxProcessTimer(wx
Timer
& timer)
+void wxProcessTimer(wx
PalmOSTimerImpl
& timer)
{
}
{
}
@@
-102,4
+91,3
@@
void WINAPI wxTimerProc(HWND WXUNUSED(hwnd), WORD, int idTimer, DWORD)
}
#endif // wxUSE_TIMER
}
#endif // wxUSE_TIMER
-