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

Removed hard-coded timer Id in wxAUI for the transparent hint fade functionality. (fixes #11435)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62760 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Bryan Petty
2009-12-02 00:57:56 +00:00
parent 0678e935b1
commit 6604fd4c23
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/aui/framemanager.cpp
View File

@@ -706,7 +706,6 @@ BEGIN_EVENT_TABLE(wxAuiManager, wxEvtHandler)
EVT_MOUSE_CAPTURE_LOST(wxAuiManager::OnCaptureLost) EVT_MOUSE_CAPTURE_LOST(wxAuiManager::OnCaptureLost)
EVT_CHILD_FOCUS(wxAuiManager::OnChildFocus) EVT_CHILD_FOCUS(wxAuiManager::OnChildFocus)
EVT_AUI_FIND_MANAGER(wxAuiManager::OnFindManager) EVT_AUI_FIND_MANAGER(wxAuiManager::OnFindManager)
EVT_TIMER(101, wxAuiManager::OnHintFadeTimer)
END_EVENT_TABLE() END_EVENT_TABLE()
@@ -3313,6 +3312,8 @@ void wxAuiManager::OnHintFadeTimer(wxTimerEvent& WXUNUSED(event))
if (!m_hint_wnd || m_hint_fadeamt >= m_hint_fademax) if (!m_hint_wnd || m_hint_fadeamt >= m_hint_fademax)
{ {
m_hint_fadetimer.Stop(); m_hint_fadetimer.Stop();
Disconnect(m_hint_fadetimer.GetId(), wxEVT_TIMER,
wxTimerEventHandler(wxAuiManager::OnHintFadeTimer));
return; return;
} }
@@ -3354,8 +3355,10 @@ void wxAuiManager::ShowHint(const wxRect& rect)
if (m_hint_fadeamt != m_hint_fademax) // Only fade if we need to if (m_hint_fadeamt != m_hint_fademax) // Only fade if we need to
{ {
// start fade in timer // start fade in timer
m_hint_fadetimer.SetOwner(this, 101); m_hint_fadetimer.SetOwner(this);
m_hint_fadetimer.Start(5); m_hint_fadetimer.Start(5);
Connect(m_hint_fadetimer.GetId(), wxEVT_TIMER,
wxTimerEventHandler(wxAuiManager::OnHintFadeTimer));
} }
} }
else // Not using a transparent hint window... else // Not using a transparent hint window...
@@ -3423,6 +3426,10 @@ void wxAuiManager::HideHint()
m_hint_wnd->Show(false); m_hint_wnd->Show(false);
m_hint_wnd->SetTransparent(0); m_hint_wnd->SetTransparent(0);
m_hint_fadetimer.Stop(); m_hint_fadetimer.Stop();
// In case this is called while a hint fade is going, we need to
// disconnect the event handler.
Disconnect(m_hint_fadetimer.GetId(), wxEVT_TIMER,
wxTimerEventHandler(wxAuiManager::OnHintFadeTimer));
m_last_hint = wxRect(); m_last_hint = wxRect();
return; return;
} }