X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/becac1ef57b05ee093e63df6650149e9fd75e500..a9e2e6e52b9c2371413597a92ccc4f8352963c32:/src/gtk/tooltip.cpp diff --git a/src/gtk/tooltip.cpp b/src/gtk/tooltip.cpp index 08f55c48f4..801ae68eed 100644 --- a/src/gtk/tooltip.cpp +++ b/src/gtk/tooltip.cpp @@ -24,7 +24,7 @@ // global data //----------------------------------------------------------------------------- -static GtkTooltips *gs_tooltips = (GtkTooltips*) NULL; +static GtkTooltips *gs_tooltips = NULL; //----------------------------------------------------------------------------- // wxToolTip @@ -35,16 +35,16 @@ IMPLEMENT_ABSTRACT_CLASS(wxToolTip, wxObject) wxToolTip::wxToolTip( const wxString &tip ) { m_text = tip; - m_window = (wxWindow*) NULL; + m_window = NULL; } void wxToolTip::SetTip( const wxString &tip ) { m_text = tip; - Apply( m_window ); + GTKApply( m_window ); } -void wxToolTip::Apply( wxWindow *win ) +void wxToolTip::GTKApply( wxWindow *win ) { if (!win) return; @@ -55,13 +55,13 @@ void wxToolTip::Apply( wxWindow *win ) m_window = win; if (m_text.empty()) - m_window->ApplyToolTip( gs_tooltips, NULL ); + m_window->GTKApplyToolTip( gs_tooltips, NULL ); else - m_window->ApplyToolTip( gs_tooltips, wxGTK_CONV_SYS(m_text) ); + m_window->GTKApplyToolTip( gs_tooltips, wxGTK_CONV_SYS(m_text) ); } /* static */ -void wxToolTip::Apply(GtkWidget *w, const gchar *tip) +void wxToolTip::GTKApply(GtkWidget *w, const gchar *tip) { if ( !gs_tooltips ) gs_tooltips = gtk_tooltips_new();