Fix SetToolTip(NULL) to unset the tooltip.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61549 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -3763,7 +3763,21 @@ void wxWindowGTK::DoSetToolTip( wxToolTip *tip )
|
|||||||
wxWindowBase::DoSetToolTip(tip);
|
wxWindowBase::DoSetToolTip(tip);
|
||||||
|
|
||||||
if (m_tooltip)
|
if (m_tooltip)
|
||||||
|
{
|
||||||
m_tooltip->GTKApply( (wxWindow *)this );
|
m_tooltip->GTKApply( (wxWindow *)this );
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
GtkWidget *w = GetConnectWidget();
|
||||||
|
wxToolTip::GTKApply(w, NULL);
|
||||||
|
#if GTK_CHECK_VERSION(2, 12, 0)
|
||||||
|
// Just applying NULL doesn't work on 2.12.0, so also use
|
||||||
|
// gtk_widget_set_has_tooltip. It is part of the new GtkTooltip API
|
||||||
|
// but seems also to work with the old GtkTooltips.
|
||||||
|
if (gtk_check_version(2, 12, 0) == NULL)
|
||||||
|
gtk_widget_set_has_tooltip(w, FALSE);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxWindowGTK::GTKApplyToolTip( GtkTooltips *tips, const gchar *tip )
|
void wxWindowGTK::GTKApplyToolTip( GtkTooltips *tips, const gchar *tip )
|
||||||
|
Reference in New Issue
Block a user