Fix wxRibbon compilation when wxUSE_TOOLTIPS==0.
Add wxUSE_TOOLTIPS tests after the changes of r70175. Closes #13827. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70262 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -977,10 +977,12 @@ void wxRibbonButtonBar::OnMouseMove(wxMouseEvent& evt)
|
||||
}
|
||||
}
|
||||
|
||||
#if wxUSE_TOOLTIPS
|
||||
if(new_hovered == NULL && GetToolTip())
|
||||
{
|
||||
UnsetToolTip();
|
||||
}
|
||||
#endif
|
||||
|
||||
if(new_hovered != m_hovered_button || (m_hovered_button != NULL &&
|
||||
new_hovered_state != m_hovered_button->base->state))
|
||||
@@ -993,7 +995,9 @@ void wxRibbonButtonBar::OnMouseMove(wxMouseEvent& evt)
|
||||
if(m_hovered_button != NULL)
|
||||
{
|
||||
m_hovered_button->base->state = new_hovered_state;
|
||||
#if wxUSE_TOOLTIPS
|
||||
SetToolTip(m_hovered_button->base->help_string);
|
||||
#endif
|
||||
}
|
||||
Refresh(false);
|
||||
}
|
||||
|
@@ -581,6 +581,7 @@ void wxRibbonToolBar::OnMouseMove(wxMouseEvent& evt)
|
||||
}
|
||||
}
|
||||
|
||||
#if wxUSE_TOOLTIPS
|
||||
if(new_hover)
|
||||
{
|
||||
SetToolTip(new_hover->help_string);
|
||||
@@ -589,6 +590,7 @@ void wxRibbonToolBar::OnMouseMove(wxMouseEvent& evt)
|
||||
{
|
||||
UnsetToolTip();
|
||||
}
|
||||
#endif
|
||||
|
||||
if(new_hover != m_hover_tool)
|
||||
{
|
||||
|
Reference in New Issue
Block a user