projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use generic collapsible pane for wxUniv based builds.
[wxWidgets.git]
/
src
/
gtk
/
tooltip.cpp
diff --git
a/src/gtk/tooltip.cpp
b/src/gtk/tooltip.cpp
index bce18195c1841891952310827d253216fbd17738..c46b6f91904f6dc2bd802e9bcbc1fbf236f9abd5 100644
(file)
--- a/
src/gtk/tooltip.cpp
+++ b/
src/gtk/tooltip.cpp
@@
-24,7
+24,7
@@
// global data
//-----------------------------------------------------------------------------
// global data
//-----------------------------------------------------------------------------
-static GtkTooltips *
s
s_tooltips = (GtkTooltips*) NULL;
+static GtkTooltips *
g
s_tooltips = (GtkTooltips*) NULL;
//-----------------------------------------------------------------------------
// wxToolTip
//-----------------------------------------------------------------------------
// wxToolTip
@@
-46,29
+46,38
@@
void wxToolTip::SetTip( const wxString &tip )
void wxToolTip::Apply( wxWindow *win )
{
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.empty())
m_window = win;
if (m_text.empty())
- m_window->ApplyToolTip(
s
s_tooltips, (wxChar*) NULL );
+ m_window->ApplyToolTip(
g
s_tooltips, (wxChar*) NULL );
else
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 )
{
}
void wxToolTip::Enable( bool flag )
{
- if (!ss_tooltips) return;
+ if (!gs_tooltips)
+ return;
if (flag)
if (flag)
- gtk_tooltips_enable(
s
s_tooltips );
+ gtk_tooltips_enable(
g
s_tooltips );
else
else
- gtk_tooltips_disable(
s
s_tooltips );
+ gtk_tooltips_disable(
g
s_tooltips );
}
G_BEGIN_DECLS
}
G_BEGIN_DECLS
@@
-78,12
+87,12
@@
G_END_DECLS
void wxToolTip::SetDelay( long msecs )
{
void wxToolTip::SetDelay( long msecs )
{
- if (!
s
s_tooltips)
+ if (!
g
s_tooltips)
return;
// FIXME: This is a deprecated function and might not even have an effect.
// Try to not use it, after which remove the prototype above.
return;
// 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(
s
s_tooltips, (int)msecs );
+ gtk_tooltips_set_delay(
g
s_tooltips, (int)msecs );
}
#endif // wxUSE_TOOLTIPS
}
#endif // wxUSE_TOOLTIPS