No real changes, just use clearer names for wxMSW wxToolTip methods.
Rename wxToolTip::DoAddOtherWindow() to DoAddHWND() as it should be used for adding any window associated with the tooltip, either the main or an auxiliary one. And rename wxToolTip::Add() to AddOtherWindow() because it shouldn't be used for the main window. See #14184. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71096 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -374,17 +374,17 @@ void wxToolTip::Remove()
|
||||
DoForAllWindows(&wxToolTip::DoRemove);
|
||||
}
|
||||
|
||||
void wxToolTip::Add(WXHWND hWnd)
|
||||
void wxToolTip::AddOtherWindow(WXHWND hWnd)
|
||||
{
|
||||
if ( !m_others )
|
||||
m_others = new wxToolTipOtherWindows;
|
||||
|
||||
m_others->push_back(hWnd);
|
||||
|
||||
DoAddOtherWindow(hWnd);
|
||||
DoAddHWND(hWnd);
|
||||
}
|
||||
|
||||
void wxToolTip::DoAddOtherWindow(WXHWND hWnd)
|
||||
void wxToolTip::DoAddHWND(WXHWND hWnd)
|
||||
{
|
||||
HWND hwnd = (HWND)hWnd;
|
||||
|
||||
@@ -502,7 +502,7 @@ void wxToolTip::SetWindow(wxWindow *win)
|
||||
// add the window itself
|
||||
if ( m_window )
|
||||
{
|
||||
Add(m_window->GetHWND());
|
||||
AddOtherWindow(m_window->GetHWND());
|
||||
}
|
||||
#if !defined(__WXUNIVERSAL__)
|
||||
// and all of its subcontrols (e.g. radio buttons in a radiobox) as well
|
||||
@@ -526,7 +526,7 @@ void wxToolTip::SetWindow(wxWindow *win)
|
||||
// must have it by now!
|
||||
wxASSERT_MSG( hwnd, wxT("no hwnd for subcontrol?") );
|
||||
|
||||
Add((WXHWND)hwnd);
|
||||
AddOtherWindow((WXHWND)hwnd);
|
||||
}
|
||||
}
|
||||
#endif // !defined(__WXUNIVERSAL__)
|
||||
|
Reference in New Issue
Block a user