X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..eec960fa8987d15fd87e249c8441474188124425:/src/gtk/tooltip.cpp?ds=inline diff --git a/src/gtk/tooltip.cpp b/src/gtk/tooltip.cpp index 3b04c2c35d..c46b6f9190 100644 --- a/src/gtk/tooltip.cpp +++ b/src/gtk/tooltip.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: tooltip.cpp +// Name: src/gtk/tooltip.cpp // Purpose: wxToolTip implementation // Author: Robert Roebling // Id: $Id$ @@ -10,12 +10,13 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#include "wx/setup.h" - #if wxUSE_TOOLTIPS #include "wx/tooltip.h" -#include "wx/window.h" + +#ifndef WX_PRECOMP + #include "wx/window.h" +#endif #include "wx/gtk/private.h" @@ -23,7 +24,7 @@ // global data //----------------------------------------------------------------------------- -static GtkTooltips *ss_tooltips = (GtkTooltips*) NULL; +static GtkTooltips *gs_tooltips = (GtkTooltips*) NULL; //----------------------------------------------------------------------------- // wxToolTip @@ -45,38 +46,53 @@ void wxToolTip::SetTip( const wxString &tip ) void wxToolTip::Apply( wxWindow *win ) { - if (!win) return; + if (!win) + return; - if (!ss_tooltips) - { - ss_tooltips = gtk_tooltips_new(); - } + if ( !gs_tooltips ) + gs_tooltips = gtk_tooltips_new(); m_window = win; - if (m_text.IsEmpty()) - m_window->ApplyToolTip( ss_tooltips, (wxChar*) NULL ); + if (m_text.empty()) + m_window->ApplyToolTip( gs_tooltips, (wxChar*) NULL ); else - m_window->ApplyToolTip( ss_tooltips, m_text ); + m_window->ApplyToolTip( gs_tooltips, m_text ); +} + +/* static */ +void wxToolTip::Apply(GtkWidget *w, const wxCharBuffer& tip) +{ + if ( !gs_tooltips ) + gs_tooltips = gtk_tooltips_new(); + + gtk_tooltips_set_tip(gs_tooltips, w, tip, NULL); } void wxToolTip::Enable( bool flag ) { - if (!ss_tooltips) return; + if (!gs_tooltips) + return; if (flag) - gtk_tooltips_enable( ss_tooltips ); + gtk_tooltips_enable( gs_tooltips ); else - gtk_tooltips_disable( ss_tooltips ); + gtk_tooltips_disable( gs_tooltips ); } +G_BEGIN_DECLS +void gtk_tooltips_set_delay (GtkTooltips *tooltips, + guint delay); +G_END_DECLS + void wxToolTip::SetDelay( long msecs ) { - if (!ss_tooltips) + if (!gs_tooltips) return; - gtk_tooltips_set_delay( ss_tooltips, (int)msecs ); + // FIXME: This is a deprecated function and might not even have an effect. + // Try to not use it, after which remove the prototype above. + gtk_tooltips_set_delay( gs_tooltips, (int)msecs ); } -#endif - +#endif // wxUSE_TOOLTIPS