From f8193bbb146376fddf1f6c9863aba3b7f5be1646 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 4 Jan 2012 13:39:23 +0000 Subject: [PATCH] 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 --- src/ribbon/buttonbar.cpp | 4 ++++ src/ribbon/toolbar.cpp | 2 ++ 2 files changed, 6 insertions(+) diff --git a/src/ribbon/buttonbar.cpp b/src/ribbon/buttonbar.cpp index 3e73865a01..ad44278f14 100644 --- a/src/ribbon/buttonbar.cpp +++ b/src/ribbon/buttonbar.cpp @@ -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); } diff --git a/src/ribbon/toolbar.cpp b/src/ribbon/toolbar.cpp index 95afe60396..12826d1eae 100644 --- a/src/ribbon/toolbar.cpp +++ b/src/ribbon/toolbar.cpp @@ -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) { -- 2.47.2