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

Toolbar/tooltip udates

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16141 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2002-07-11 22:14:39 +00:00
parent 63b6646e5d
commit 5d644707ca
4 changed files with 31 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/os2/timer.cpp
View File

@@ -65,7 +65,7 @@ void wxTimer::Notify()
//
wxCHECK_RET( m_owner, _T("wxTimer::Notify() should be overridden.") );
wxTimerEvent vEvent( m_ulId
wxTimerEvent vEvent( m_idTimer
,m_milli
);
@@ -85,14 +85,23 @@ bool wxTimer::Start(
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
@@ -112,9 +121,17 @@ void wxTimer::Stop()
{
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);
}
m_ulId = 0L;
}
// ----------------------------------------------------------------------------