projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed bug in Ungetch() which was preventing wxExecute() from working: this method...
[wxWidgets.git]
/
src
/
os2
/
timer.cpp
diff --git
a/src/os2/timer.cpp
b/src/os2/timer.cpp
index 292dfbb1f9f22a8fa7b8ce796af4ef9e848c5c47..bb897e1f78b3c53b8595699047657e2e629d41f0 100644
(file)
--- a/
src/os2/timer.cpp
+++ b/
src/os2/timer.cpp
@@
-65,7
+65,7
@@
void wxTimer::Notify()
//
wxCHECK_RET( m_owner, _T("wxTimer::Notify() should be overridden.") );
//
wxCHECK_RET( m_owner, _T("wxTimer::Notify() should be overridden.") );
- wxTimerEvent vEvent( m_
ulId
+ wxTimerEvent vEvent( m_
idTimer
,m_milli
);
,m_milli
);
@@
-85,14
+85,23
@@
bool wxTimer::Start(
wxTimerList.DeleteObject(this);
wxTimerList.DeleteObject(this);
- //
- // Create a windowless timer
- //
- m_ulId = ::WinStartTimer( m_Hab
- ,NULLHANDLE
- ,0
- ,(ULONG)nMilliseconds
- );
+ wxWindow* pWin = NULL;
+
+ if (m_owner)
+ {
+ pWin = (wxWindow*)m_owner;
+ m_ulId = ::WinStartTimer( m_Hab
+ ,pWin->GetHWND()
+ ,m_idTimer
+ ,(ULONG)nMilliseconds
+ );
+ }
+ else
+ m_ulId = ::WinStartTimer( m_Hab
+ ,NULLHANDLE
+ ,0
+ ,(ULONG)nMilliseconds
+ );
if (m_ulId > 0L)
{
wxTimerList.Append( m_ulId
if (m_ulId > 0L)
{
wxTimerList.Append( m_ulId
@@
-112,9
+121,17
@@
void wxTimer::Stop()
{
if ( m_ulId )
{
{
if ( m_ulId )
{
- ::WinStopTimer(m_Hab, NULL, m_ulId);
+ if (m_owner)
+ {
+ wxWindow* pWin = (wxWindow*)m_owner;
+
+ ::WinStopTimer(m_Hab, pWin->GetHWND(), m_ulId);
+ }
+ else
+ ::WinStopTimer(m_Hab, NULLHANDLE, m_ulId);
wxTimerList.DeleteObject(this);
}
wxTimerList.DeleteObject(this);
}
+ m_ulId = 0L;
}
// ----------------------------------------------------------------------------
}
// ----------------------------------------------------------------------------