GetBestFittingSize --> GetEffectiveMinSize

[wxWidgets.git] / src / gtk / aboutdlg.cpp

diff --git a/src/gtk/aboutdlg.cpp b/src/gtk/aboutdlg.cpp
index 7c0c374076361b013a02e9b517c56dd2e8c66440..b6d960990b6298c59d163986967ed7215a239de8 100644 (file)
--- a/src/gtk/aboutdlg.cpp
+++ b/src/gtk/aboutdlg.cpp
@@ -22,6 +22,7 @@
 #if wxUSE_ABOUTDLG && defined(__WXGTK26__)
 
 #ifndef WX_PRECOMP
+    #include "wx/utils.h"       // for wxLaunchDefaultBrowser()
 #endif //WX_PRECOMP
 
 #include "wx/aboutdlg.h"
@@ -81,6 +82,20 @@ private:
 // 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));
+}
+
 void wxAboutBox(const wxAboutDialogInfo& info)
 {
     if ( !gtk_check_version(2,6,0) )
@@ -102,6 +117,11 @@ void wxAboutBox(const wxAboutDialogInfo& info)
 
         if ( info.HasWebSite() )
         {
+            // NB: must be called before gtk_about_dialog_set_website() as
+            //     otherwise it has no effect (although GTK+ docs don't mention
+            //     this...)
+            gtk_about_dialog_set_url_hook(wxGtkAboutDialogOnLink, NULL, NULL);
+
             gtk_about_dialog_set_website(dlg, GtkStr(info.GetWebSiteURL()));
             gtk_about_dialog_set_website_label
             (
@@ -130,10 +150,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, GtkStr(transCredits));
+
+        g_signal_connect(dlg, "response",
+                            G_CALLBACK(wxGtkAboutDialogOnClose), NULL);
 
         gtk_widget_show(GTK_WIDGET(dlg));
         return;