changed wxWindow::ApplyToolTip to take UTF8-encoded char* instead of wxChar* to avoid...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46248 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/gtk/listbox.h b/include/wx/gtk/listbox.h
index 245e537752e417ed1062030f8fee5d4f3f16836b..c855e3d6884a4d5cc17105aea822ab1c16febf1a 100644 (file)
--- a/include/wx/gtk/listbox.h
+++ b/include/wx/gtk/listbox.h
@@ -85,7 +85,7 @@ public:
     GtkWidget *GetConnectWidget();
 
 #if wxUSE_TOOLTIPS
-    void ApplyToolTip( GtkTooltips *tips, const wxChar *tip );
+    void ApplyToolTip( GtkTooltips *tips, const gchar *tip );
 #endif // wxUSE_TOOLTIPS
 
     struct _GtkTreeView   *m_treeview;

diff --git a/include/wx/gtk/radiobox.h b/include/wx/gtk/radiobox.h
index 77bbb3a066d04e0b8daac70e9acf1d78a41a5f32..563ebb5612c63a1f4363953f49bc389c1423e93f 100644 (file)
--- a/include/wx/gtk/radiobox.h
+++ b/include/wx/gtk/radiobox.h
@@ -132,7 +132,7 @@ public:
     void GtkDisableEvents();
     void GtkEnableEvents();
 #if wxUSE_TOOLTIPS
-    void ApplyToolTip( GtkTooltips *tips, const wxChar *tip );
+    void ApplyToolTip( GtkTooltips *tips, const gchar *tip );
 #endif // wxUSE_TOOLTIPS
 
     virtual void OnInternalIdle();

diff --git a/include/wx/gtk/tooltip.h b/include/wx/gtk/tooltip.h
index ad476e5ecb1419ee468a43dc77737cde1a3e6572..c2ed58bfe470aab1c2885305ebbf99a7e9a30967 100644 (file)
--- a/include/wx/gtk/tooltip.h
+++ b/include/wx/gtk/tooltip.h
@@ -50,7 +50,7 @@ public:
     // this just sets the given tooltip for the specified widget
     //
     // tip must be already UTF-8 encoded
-    static void Apply(GtkWidget *w, const wxCharBuffer& tip);
+    static void Apply(GtkWidget *w, const gchar *tip);
 
 private:
     wxString     m_text;

diff --git a/include/wx/gtk/window.h b/include/wx/gtk/window.h
index 962e33bc67ccc36bc47316649152c1bc59f30dad..b98ee769da7339b118d93ef14246786240f0bb8c 100644 (file)
--- a/include/wx/gtk/window.h
+++ b/include/wx/gtk/window.h
@@ -209,7 +209,8 @@ public:
     PangoContext   *GtkGetPangoDefaultContext();
 
 #if wxUSE_TOOLTIPS
-    virtual void ApplyToolTip( GtkTooltips *tips, const wxChar *tip );
+    // applies tooltip to the widget (tip must be UTF-8 encoded)
+    virtual void ApplyToolTip( GtkTooltips *tips, const gchar *tip );
 #endif // wxUSE_TOOLTIPS
 
     // Called when a window should delay showing itself

diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp
index c244394fcdbd361e6edc10c09fb4c9e108dc72e4..15c70a351daed662f35462f938e65ed91867f166 100644 (file)
--- a/src/gtk/listbox.cpp
+++ b/src/gtk/listbox.cpp
@@ -886,10 +886,10 @@ int wxListBox::DoListHitTest(const wxPoint& point) const
 // ----------------------------------------------------------------------------
 
 #if wxUSE_TOOLTIPS
-void wxListBox::ApplyToolTip( GtkTooltips *tips, const wxChar *tip )
+void wxListBox::ApplyToolTip( GtkTooltips *tips, const gchar *tip )
 {
     // RN: Is this needed anymore?
-    gtk_tooltips_set_tip( tips, GTK_WIDGET( m_treeview ), wxGTK_CONV(tip), (gchar*) NULL );
+    gtk_tooltips_set_tip( tips, GTK_WIDGET( m_treeview ), tip, (gchar*) NULL );
 }
 #endif // wxUSE_TOOLTIPS
 

diff --git a/src/gtk/radiobox.cpp b/src/gtk/radiobox.cpp
index 027b8d05eea425a37b435c60c32051ee212b221e..e5bb933d2b30baf5fd4962750238510f65da8064 100644 (file)
--- a/src/gtk/radiobox.cpp
+++ b/src/gtk/radiobox.cpp
@@ -601,7 +601,7 @@ void wxRadioBox::GTKWidgetDoSetMnemonic(GtkWidget* w)
 }
 
 #if wxUSE_TOOLTIPS
-void wxRadioBox::ApplyToolTip(GtkTooltips * WXUNUSED(tips), const wxChar *tip)
+void wxRadioBox::ApplyToolTip(GtkTooltips * WXUNUSED(tips), const gchar *tip)
 {
     // set this tooltip for all radiobuttons which don't have their own tips
     unsigned n = 0;
@@ -611,8 +611,7 @@ void wxRadioBox::ApplyToolTip(GtkTooltips * WXUNUSED(tips), const wxChar *tip)
     {
         if ( !GetItemToolTip(n) )
         {
-            wxToolTip::Apply(GTK_WIDGET(node->GetData()->button),
-                             wxConvCurrent->cWX2MB(tip));
+            wxToolTip::Apply(GTK_WIDGET(node->GetData()->button), tip);
         }
     }
 }

diff --git a/src/gtk/tooltip.cpp b/src/gtk/tooltip.cpp
index c46b6f91904f6dc2bd802e9bcbc1fbf236f9abd5..a02aedd620a83c10796f72b26b67d30f3a3198cb 100644 (file)
--- a/src/gtk/tooltip.cpp
+++ b/src/gtk/tooltip.cpp
@@ -55,13 +55,13 @@ void wxToolTip::Apply( wxWindow *win )
     m_window = win;
 
     if (m_text.empty())
-        m_window->ApplyToolTip( gs_tooltips, (wxChar*) NULL );
+        m_window->ApplyToolTip( gs_tooltips, NULL );
     else
-        m_window->ApplyToolTip( gs_tooltips, m_text );
+        m_window->ApplyToolTip( gs_tooltips, wxGTK_CONV_SYS(m_text) );
 }
 
 /* static */
-void wxToolTip::Apply(GtkWidget *w, const wxCharBuffer& tip)
+void wxToolTip::Apply(GtkWidget *w, const gchar *tip)
 {
     if ( !gs_tooltips )
         gs_tooltips = gtk_tooltips_new();

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 0eb815a39d9e8a6b0a86028ca72bfbb43f6a66fb..cbc1486f6bfcb4f31c2b0fe5c6ae5d7c0ec4b3e7 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -3812,17 +3812,9 @@ void wxWindowGTK::DoSetToolTip( wxToolTip *tip )
         m_tooltip->Apply( (wxWindow *)this );
 }
 
-void wxWindowGTK::ApplyToolTip( GtkTooltips *tips, const wxChar *tip )
+void wxWindowGTK::ApplyToolTip( GtkTooltips *tips, const gchar *tip )
 {
-    if (tip)
-    {
-        wxString tmp( tip );
-        gtk_tooltips_set_tip( tips, GetConnectWidget(), wxGTK_CONV(tmp), (gchar*) NULL );
-    }
-    else
-    {
-        gtk_tooltips_set_tip( tips, GetConnectWidget(), NULL, NULL);
-    }
+    gtk_tooltips_set_tip(tips, GetConnectWidget(), tip, NULL);
 }
 #endif // wxUSE_TOOLTIPS