Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More WinCE mods

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21902 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2003-07-11 21:50:07 +00:00
parent 086b3a5b02
commit 4676948b68
69 changed files with 953 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/msw/timer.cpp
View File

@@ -48,7 +48,8 @@ WX_DECLARE_HASH_MAP( long,
wxTimerMap );
wxTimerMap wxTimerList;
UINT WINAPI _EXPORT wxTimerProc(HWND hwnd, WORD, int idTimer, DWORD);
void WINAPI _EXPORT wxTimerProc(HWND hwnd, WORD, int idTimer, DWORD);
// ----------------------------------------------------------------------------
// macros
@@ -95,11 +96,16 @@ bool wxTimer::Start(int milliseconds, bool oneShot)
wxCHECK_MSG( m_milli > 0, false, wxT("invalid value for timer timeour") );
#ifdef __WXWINCE__
m_id = ::SetTimer(NULL, (UINT)(m_id ? m_id : 1),
(UINT)m_milli, (void (__stdcall *)(struct HWND__ *,unsigned int,unsigned int,unsigned long)) wxTimerProc);
#else
TIMERPROC wxTimerProcInst = (TIMERPROC)
MakeProcInstance((FARPROC)wxTimerProc, wxGetInstance());
m_id = ::SetTimer(NULL, (UINT)(m_id ? m_id : 1),
(UINT)m_milli, wxTimerProcInst);
#endif
if ( m_id > 0 )
{
@@ -143,17 +149,16 @@ void wxProcessTimer(wxTimer& timer)
timer.Notify();
}
UINT WINAPI _EXPORT wxTimerProc(HWND WXUNUSED(hwnd), WORD, int idTimer, DWORD)
void WINAPI _EXPORT wxTimerProc(HWND WXUNUSED(hwnd), WORD, int idTimer, DWORD)
{
wxTimerMap::iterator node = wxTimerList.find((long)idTimer);
wxCHECK_MSG( node != wxTimerList.end(), 0,
wxT("bogus timer id in wxTimerProc") );
wxASSERT_MSG( node != wxTimerList.end(), wxT("bogus timer id in wxTimerProc") );
wxProcessTimer(*(node->second));
return 0;
// return 0;
}
#endif // wxUSE_TIMER