X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6225e6e111b461d54abad7db78ceff2c6398ad9b..c267759c8f0d9d8954b2cc883c868b23ff1ca9ee:/src/gtk/aboutdlg.cpp?ds=sidebyside diff --git a/src/gtk/aboutdlg.cpp b/src/gtk/aboutdlg.cpp index 5f83dc37fd..e7d7e497f7 100644 --- a/src/gtk/aboutdlg.cpp +++ b/src/gtk/aboutdlg.cpp @@ -31,31 +31,30 @@ #include "wx/gtk/private.h" // ---------------------------------------------------------------------------- -// GtkStr: temporary GTK string +// GtkArray: temporary array of GTK strings // ---------------------------------------------------------------------------- -class GtkStr : public wxGtkString +namespace { -public: - GtkStr(const wxString& s) - : wxGtkString(wx_const_cast(char *, wxGTK_CONV_SYS(s).release())) - { - } -}; - -// ---------------------------------------------------------------------------- -// GtkArray: temporary array of GTK strings -// ---------------------------------------------------------------------------- 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 +64,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; } @@ -78,16 +79,24 @@ private: DECLARE_NO_COPY_CLASS(GtkArray) }; +} // anonymous namespace + // ============================================================================ // implementation // ============================================================================ +extern "C" void +wxGtkAboutDialogOnClose(GtkAboutDialog *about) +{ + gtk_widget_destroy(GTK_WIDGET(about)); +} + extern "C" void wxGtkAboutDialogOnLink(GtkAboutDialog * WXUNUSED(about), const gchar *link, gpointer WXUNUSED(data)) { - wxLaunchDefaultBrowser(wxGTK_CONV_BACK(link)); + wxLaunchDefaultBrowser(wxGTK_CONV_BACK_SYS(link)); } void wxAboutBox(const wxAboutDialogInfo& info) @@ -95,15 +104,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_SYS(info.GetName())); if ( info.HasVersion() ) - gtk_about_dialog_set_version(dlg, GtkStr(info.GetVersion())); + gtk_about_dialog_set_version(dlg, wxGTK_CONV_SYS(info.GetVersion())); if ( info.HasCopyright() ) - gtk_about_dialog_set_copyright(dlg, GtkStr(info.GetCopyright())); + gtk_about_dialog_set_copyright(dlg, wxGTK_CONV_SYS(info.GetCopyright())); if ( info.HasDescription() ) - gtk_about_dialog_set_comments(dlg, GtkStr(info.GetDescription())); + gtk_about_dialog_set_comments(dlg, wxGTK_CONV_SYS(info.GetDescription())); if ( info.HasLicence() ) - gtk_about_dialog_set_license(dlg, GtkStr(info.GetLicence())); + gtk_about_dialog_set_license(dlg, wxGTK_CONV_SYS(info.GetLicence())); wxIcon icon = info.GetIcon(); if ( icon.Ok() ) @@ -116,11 +125,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_SYS(info.GetWebSiteURL())); gtk_about_dialog_set_website_label ( dlg, - GtkStr(info.GetWebSiteDescription()) + wxGTK_CONV_SYS(info.GetWebSiteDescription()) ); } @@ -144,10 +153,23 @@ void wxAboutBox(const wxAboutDialogInfo& info) else // no translators explicitely specified { // maybe we have translator credits in the message catalog? - transCredits = _("translator-credits"); + wxString translator = _("translator-credits"); + + // gtk_about_dialog_set_translator_credits() is smart enough to + // detect if "translator-credits" is untranslated and hide the + // translators tab in that case, however it will still show the + // "credits" button, (at least GTK 2.10.6) even if there are no + // credits informations at all, so we still need to do the check + // ourselves + if ( translator != wxT("translator-credits") ) // untranslated! + transCredits = translator; } - gtk_about_dialog_set_translator_credits(dlg, GtkStr(transCredits)); + if ( !transCredits.empty() ) + gtk_about_dialog_set_translator_credits(dlg, wxGTK_CONV_SYS(transCredits)); + + g_signal_connect(dlg, "response", + G_CALLBACK(wxGtkAboutDialogOnClose), NULL); gtk_widget_show(GTK_WIDGET(dlg)); return;