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

More tooltip handling

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16129 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2002-07-10 05:47:43 +00:00
parent dd56228c02
commit ff5802f399
3 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/os2/timer.cpp
View File

@@ -89,8 +89,8 @@ bool wxTimer::Start(
// Create a windowless timer // Create a windowless timer
// //
m_ulId = ::WinStartTimer( m_Hab m_ulId = ::WinStartTimer( m_Hab
,NULL ,NULLHANDLE
,(m_ulId ? m_ulId : 1L) ,0
,(ULONG)nMilliseconds ,(ULONG)nMilliseconds
); );
if (m_ulId > 0L) if (m_ulId > 0L)
@@ -115,7 +115,6 @@ void wxTimer::Stop()
::WinStopTimer(m_Hab, NULL, m_ulId); ::WinStopTimer(m_Hab, NULL, m_ulId);
wxTimerList.DeleteObject(this); wxTimerList.DeleteObject(this);
} }
m_ulId = 0L;
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

10
src/os2/toolbar.cpp
View File

@@ -928,11 +928,6 @@ void wxToolBar::OnMouseEvent(
if (!pTool) if (!pTool)
{ {
m_vToolTimer.Stop(); m_vToolTimer.Stop();
if (m_pToolTip)
{
delete m_pToolTip;
m_pToolTip = NULL;
}
if (m_nCurrentTool > -1) if (m_nCurrentTool > -1)
{ {
if (rEvent.LeftIsDown()) if (rEvent.LeftIsDown())
@@ -976,6 +971,8 @@ void wxToolBar::OnMouseEvent(
OnMouseEnter(m_nCurrentTool); OnMouseEnter(m_nCurrentTool);
if (!pTool->GetShortHelp().IsEmpty()) if (!pTool->GetShortHelp().IsEmpty())
{ {
if (m_pToolTip)
delete m_pToolTip;
m_pToolTip = new wxToolTip(pTool->GetShortHelp()); m_pToolTip = new wxToolTip(pTool->GetShortHelp());
m_vXMouse = (wxCoord)vPoint.x; m_vXMouse = (wxCoord)vPoint.x;
m_vYMouse = (wxCoord)vPoint.y; m_vYMouse = (wxCoord)vPoint.y;
@@ -1449,11 +1446,14 @@ void wxToolBar::OnTimer (
); );
m_pToolTip->DisplayToolTipWindow(vPos); m_pToolTip->DisplayToolTipWindow(vPos);
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() == (int)m_vToolExpTimer.GetTimerId())
{ {
m_pToolTip->HideToolTipWindow(); m_pToolTip->HideToolTipWindow();
GetParent()->Refresh();
m_vToolExpTimer.Stop();
} }
} // end of wxToolBar::OnTimer } // end of wxToolBar::OnTimer

4
src/os2/tooltip.cpp
View File

@@ -81,7 +81,7 @@ void wxToolTip::Create(
,sizeof(LONG) ,sizeof(LONG)
,(PVOID)&lColor ,(PVOID)&lColor
); );
strcpy(zFont, "10.Helv"); strcpy(zFont, "8.Helv");
::WinSetPresParam( m_hWnd ::WinSetPresParam( m_hWnd
,PP_FONTNAMESIZE ,PP_FONTNAMESIZE
,strlen(zFont) + 1 ,strlen(zFont) + 1
@@ -125,7 +125,7 @@ void wxToolTip::SetTip(
::WinQueryWindowPos(m_hWnd, &vSwp); ::WinQueryWindowPos(m_hWnd, &vSwp);
m_sText = rsTip; m_sText = rsTip;
lWidth = rsTip.Length() * 13; lWidth = rsTip.Length() * 8;
lHeight = 15; lHeight = 15;
::WinSetWindowPos( m_hWnd ::WinSetWindowPos( m_hWnd
,HWND_TOP ,HWND_TOP