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

2
include/wx/os2/timer.h
View File

@@ -36,7 +36,7 @@ public:
virtual void Stop(void); virtual void Stop(void);
inline virtual bool IsRunning(void) const { return m_ulId != 0L; } inline virtual bool IsRunning(void) const { return m_ulId != 0L; }
inline ULONG GetTimerId(void) const { return m_ulId; } inline int GetTimerId(void) const { return m_idTimer; }
protected: protected:
void Init(void); void Init(void);

37
src/os2/timer.cpp
View File

@@ -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);
// wxWindow* pWin = NULL;
// Create a windowless timer
// if (m_owner)
m_ulId = ::WinStartTimer( m_Hab {
,NULLHANDLE pWin = (wxWindow*)m_owner;
,0 m_ulId = ::WinStartTimer( m_Hab
,(ULONG)nMilliseconds ,pWin->GetHWND()
); ,m_idTimer
,(ULONG)nMilliseconds
);
}
else
m_ulId = ::WinStartTimer( m_Hab
,NULLHANDLE
,0
,(ULONG)nMilliseconds
);
if (m_ulId > 0L) if (m_ulId > 0L)
{ {
wxTimerList.Append( m_ulId 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;
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

4
src/os2/toolbar.cpp
View File

@@ -1439,7 +1439,7 @@ void wxToolBar::OnTimer (
wxTimerEvent& rEvent wxTimerEvent& rEvent
) )
{ {
if (rEvent.GetId() == (int)m_vToolTimer.GetTimerId()) if (rEvent.GetId() == m_vToolTimer.GetTimerId())
{ {
wxPoint vPos( m_vXMouse wxPoint vPos( m_vXMouse
,m_vYMouse ,m_vYMouse
@@ -1449,7 +1449,7 @@ void wxToolBar::OnTimer (
m_vToolTimer.Stop(); m_vToolTimer.Stop();
m_vToolExpTimer.Start(3000L, TRUE); m_vToolExpTimer.Start(3000L, TRUE);
} }
else if (rEvent.GetId() == (int)m_vToolExpTimer.GetTimerId()) else if (rEvent.GetId() == m_vToolExpTimer.GetTimerId())
{ {
m_pToolTip->HideToolTipWindow(); m_pToolTip->HideToolTipWindow();
GetParent()->Refresh(); GetParent()->Refresh();

2
src/os2/tooltip.cpp
View File

@@ -98,7 +98,7 @@ void wxToolTip::DisplayToolTipWindow(
LONG lWidth = 0L; LONG lWidth = 0L;
LONG lHeight = 0L; LONG lHeight = 0L;
lWidth = m_sText.Length() * 13; lWidth = m_sText.Length() * 8;
lHeight = 15; lHeight = 15;
::WinSetWindowPos( m_hWnd ::WinSetWindowPos( m_hWnd
,HWND_TOP ,HWND_TOP