1. removed useless GtkStr class, wxGTK_CONV is the way to do the conversion2. don...

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

diff --git a/src/gtk/aboutdlg.cpp b/src/gtk/aboutdlg.cpp
index d8058f0336f5bbc8ae1fb6a9164188930aee0fa9..683e47f67fca6bf2308eecf7bb9b31ed0fb06228 100644 (file)
--- a/src/gtk/aboutdlg.cpp
+++ b/src/gtk/aboutdlg.cpp
@@ -30,19 +30,6 @@
 
 #include "wx/gtk/private.h"
 
-// ----------------------------------------------------------------------------
-// GtkStr: temporary GTK string
-// ----------------------------------------------------------------------------
-
-class GtkStr : public wxGtkString
-{
-public:
-    GtkStr(const wxString& s)
-        : wxGtkString(wx_const_cast(char *, wxGTK_CONV_SYS(s).release()))
-    {
-    }
-};
-
 // ----------------------------------------------------------------------------
 // GtkArray: temporary array of GTK strings
 // ----------------------------------------------------------------------------
@@ -50,12 +37,21 @@ public:
 class GtkArray
 {
 public:
+    // Create GtkArray from wxArrayString. Note that the created object is
+    // only valid as long as 'a' is!
     GtkArray(const wxArrayString& a)
     {
         m_count = a.size();
         m_strings = new const gchar *[m_count + 1];
+
         for ( size_t n = 0; n < m_count; n++ )
+        {
+#if wxUSE_UNICODE_UTF8
+            m_strings[n] = a[n].utf8_str();
+#else
             m_strings[n] = wxGTK_CONV_SYS(a[n]).release();
+#endif
+        }
 
         // array must be NULL-terminated
         m_strings[m_count] = NULL;
@@ -65,8 +61,10 @@ public:
 
     ~GtkArray()
     {
+#if !wxUSE_UNICODE_UTF8
         for ( size_t n = 0; n < m_count; n++ )
             free(wx_const_cast(gchar *, m_strings[n]));
+#endif
 
         delete [] m_strings;
     }
@@ -101,15 +99,15 @@ void wxAboutBox(const wxAboutDialogInfo& info)
     if ( !gtk_check_version(2,6,0) )
     {
         GtkAboutDialog * const dlg = GTK_ABOUT_DIALOG(gtk_about_dialog_new());
-        gtk_about_dialog_set_name(dlg, GtkStr(info.GetName()));
+        gtk_about_dialog_set_name(dlg, wxGTK_CONV(info.GetName()));
         if ( info.HasVersion() )
-            gtk_about_dialog_set_version(dlg, GtkStr(info.GetVersion()));
+            gtk_about_dialog_set_version(dlg, wxGTK_CONV(info.GetVersion()));
         if ( info.HasCopyright() )
-            gtk_about_dialog_set_copyright(dlg, GtkStr(info.GetCopyright()));
+            gtk_about_dialog_set_copyright(dlg, wxGTK_CONV(info.GetCopyright()));
         if ( info.HasDescription() )
-            gtk_about_dialog_set_comments(dlg, GtkStr(info.GetDescription()));
+            gtk_about_dialog_set_comments(dlg, wxGTK_CONV(info.GetDescription()));
         if ( info.HasLicence() )
-            gtk_about_dialog_set_license(dlg, GtkStr(info.GetLicence()));
+            gtk_about_dialog_set_license(dlg, wxGTK_CONV(info.GetLicence()));
 
         wxIcon icon = info.GetIcon();
         if ( icon.Ok() )
@@ -122,11 +120,11 @@ void wxAboutBox(const wxAboutDialogInfo& info)
             //     this...)
             gtk_about_dialog_set_url_hook(wxGtkAboutDialogOnLink, NULL, NULL);
 
-            gtk_about_dialog_set_website(dlg, GtkStr(info.GetWebSiteURL()));
+            gtk_about_dialog_set_website(dlg, wxGTK_CONV(info.GetWebSiteURL()));
             gtk_about_dialog_set_website_label
             (
                 dlg,
-                GtkStr(info.GetWebSiteDescription())
+                wxGTK_CONV(info.GetWebSiteDescription())
             );
         }
 
@@ -163,7 +161,7 @@ void wxAboutBox(const wxAboutDialogInfo& info)
         }
 
         if ( !transCredits.empty() )
-            gtk_about_dialog_set_translator_credits(dlg, GtkStr(transCredits));
+            gtk_about_dialog_set_translator_credits(dlg, wxGTK_CONV(transCredits));
 
         g_signal_connect(dlg, "response",
                             G_CALLBACK(wxGtkAboutDialogOnClose), NULL);