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

No real changes, just use clearer names for wxMSW wxToolTip methods.

Browse Source 
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:
Vadim Zeitlin
2012-04-05 13:55:51 +00:00
parent 3caee5cfaa
commit f7dd07f64d
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/msw/tooltip.h
View File

@@ -60,7 +60,7 @@ public:
static void RelayEvent(WXMSG *msg); static void RelayEvent(WXMSG *msg);
// add a window to the tooltip control // add a window to the tooltip control
void Add(WXHWND hwnd); void AddOtherWindow(WXHWND hwnd);
// remove any tooltip from the window // remove any tooltip from the window
static void Remove(WXHWND hwnd, unsigned int id, const wxRect& rc); static void Remove(WXHWND hwnd, unsigned int id, const wxRect& rc);
@@ -72,7 +72,7 @@ public:
private: private:
// Adds a window other than our main m_window to this tooltip. // Adds a window other than our main m_window to this tooltip.
void DoAddOtherWindow(WXHWND hWnd); void DoAddHWND(WXHWND hWnd);
// Perform the specified operation for the given window only. // Perform the specified operation for the given window only.
void DoSetTip(WXHWND hWnd); void DoSetTip(WXHWND hWnd);

2
src/msw/combobox.cpp
View File

@@ -665,7 +665,7 @@ void wxComboBox::DoSetToolTip(wxToolTip *tip)
wxChoice::DoSetToolTip(tip); wxChoice::DoSetToolTip(tip);
if ( tip && !HasFlag(wxCB_READONLY) ) if ( tip && !HasFlag(wxCB_READONLY) )
tip->Add(GetEditHWND()); tip->AddOtherWindow(GetEditHWND());
} }
#endif // wxUSE_TOOLTIPS #endif // wxUSE_TOOLTIPS

2
src/msw/radiobox.cpp
View File

@@ -498,7 +498,7 @@ void wxRadioBox::DoSetItemToolTip(unsigned int item, wxToolTip *tooltip)
// we have already checked for the item to be valid in wxRadioBoxBase // we have already checked for the item to be valid in wxRadioBoxBase
const HWND hwndRbtn = (*m_radioButtons)[item]; const HWND hwndRbtn = (*m_radioButtons)[item];
if ( tooltip != NULL ) if ( tooltip != NULL )
tooltip->Add(hwndRbtn); tooltip->AddOtherWindow(hwndRbtn);
else // unset the tooltip else // unset the tooltip
wxToolTip::Remove(hwndRbtn, 0, wxRect(0,0,0,0)); wxToolTip::Remove(hwndRbtn, 0, wxRect(0,0,0,0));
// the second parameter can be zero since it's ignored by Remove() // the second parameter can be zero since it's ignored by Remove()

2
src/msw/spinctrl.cpp
View File

@@ -604,7 +604,7 @@ void wxSpinCtrl::DoSetToolTip(wxToolTip *tip)
wxSpinButton::DoSetToolTip(tip); wxSpinButton::DoSetToolTip(tip);
if ( tip ) if ( tip )
tip->Add(m_hwndBuddy); tip->AddOtherWindow(m_hwndBuddy);
} }
#endif // wxUSE_TOOLTIPS #endif // wxUSE_TOOLTIPS

10
src/msw/tooltip.cpp
View File

@@ -374,17 +374,17 @@ void wxToolTip::Remove()
DoForAllWindows(&wxToolTip::DoRemove); DoForAllWindows(&wxToolTip::DoRemove);
} }
void wxToolTip::Add(WXHWND hWnd) void wxToolTip::AddOtherWindow(WXHWND hWnd)
{ {
if ( !m_others ) if ( !m_others )
m_others = new wxToolTipOtherWindows; m_others = new wxToolTipOtherWindows;
m_others->push_back(hWnd); m_others->push_back(hWnd);
DoAddOtherWindow(hWnd); DoAddHWND(hWnd);
} }
void wxToolTip::DoAddOtherWindow(WXHWND hWnd) void wxToolTip::DoAddHWND(WXHWND hWnd)
{ {
HWND hwnd = (HWND)hWnd; HWND hwnd = (HWND)hWnd;
@@ -502,7 +502,7 @@ void wxToolTip::SetWindow(wxWindow *win)
// add the window itself // add the window itself
if ( m_window ) if ( m_window )
{ {
Add(m_window->GetHWND()); AddOtherWindow(m_window->GetHWND());
} }
#if !defined(__WXUNIVERSAL__) #if !defined(__WXUNIVERSAL__)
// and all of its subcontrols (e.g. radio buttons in a radiobox) as well // 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! // must have it by now!
wxASSERT_MSG( hwnd, wxT("no hwnd for subcontrol?") ); wxASSERT_MSG( hwnd, wxT("no hwnd for subcontrol?") );
Add((WXHWND)hwnd); AddOtherWindow((WXHWND)hwnd);
} }
} }
#endif // !defined(__WXUNIVERSAL__) #endif // !defined(__WXUNIVERSAL__)