simplify code to return from the end of the function

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

diff --git a/src/gtk/aboutdlg.cpp b/src/gtk/aboutdlg.cpp
index 6728f212a8f0938703ee0908a0de75b33b75669c..f17a837de96d35bb9f68004fb82e9fd6514588fe 100644 (file)
--- a/src/gtk/aboutdlg.cpp
+++ b/src/gtk/aboutdlg.cpp
@@ -19,16 +19,17 @@
 // for compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // for compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#if wxUSE_ABOUTDLG && defined(__WXGTK26__)
+#if wxUSE_ABOUTDLG
+
+#include "wx/aboutdlg.h"

 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"       // for wxLaunchDefaultBrowser()
 #endif //WX_PRECOMP
 
 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"       // for wxLaunchDefaultBrowser()
 #endif //WX_PRECOMP
 

-#include "wx/aboutdlg.h"
-#include "wx/generic/aboutdlgg.h"
-
+#include <gtk/gtk.h>

 #include "wx/gtk/private.h"
 #include "wx/gtk/private.h"

+#include "wx/gtk/private/gtk2-compat.h"

 
 // ----------------------------------------------------------------------------
 // GtkArray: temporary array of GTK strings
 
 // ----------------------------------------------------------------------------
 // GtkArray: temporary array of GTK strings


@@ -101,126 +102,141 @@ private:
 // GTK+ about dialog is modeless, keep track of it in this variable
 static GtkAboutDialog *gs_aboutDialog = NULL;
 
 // GTK+ about dialog is modeless, keep track of it in this variable
 static GtkAboutDialog *gs_aboutDialog = NULL;
 

-extern "C" void
-wxGtkAboutDialogOnClose(GtkAboutDialog *about)
+extern "C" {
+static void wxGtkAboutDialogOnClose(GtkAboutDialog *about)

 {
     gtk_widget_destroy(GTK_WIDGET(about));
     if ( about == gs_aboutDialog )
         gs_aboutDialog = NULL;
 }
 {
     gtk_widget_destroy(GTK_WIDGET(about));
     if ( about == gs_aboutDialog )
         gs_aboutDialog = NULL;
 }

+}

 
 

-extern "C" void
-wxGtkAboutDialogOnLink(GtkAboutDialog * WXUNUSED(about),
-                       const gchar *link,
-                       gpointer WXUNUSED(data))
+#ifdef __WXGTK3__
+extern "C" {
+static gboolean activate_link(GtkAboutDialog*, const char* link, void* dontIgnore)
+{
+    if (dontIgnore)
+    {
+        wxLaunchDefaultBrowser(wxGTK_CONV_BACK_SYS(link));
+        return true;
+    }
+    return false;
+}
+}
+#else
+extern "C" {
+static void wxGtkAboutDialogOnLink(GtkAboutDialog*, const char* link, void*)

 {
     wxLaunchDefaultBrowser(wxGTK_CONV_BACK_SYS(link));
 }
 {
     wxLaunchDefaultBrowser(wxGTK_CONV_BACK_SYS(link));
 }

+}
+#endif

 
 void wxAboutBox(const wxAboutDialogInfo& info, wxWindow* WXUNUSED(parent))
 {
 
 void wxAboutBox(const wxAboutDialogInfo& info, wxWindow* WXUNUSED(parent))
 {

-    if ( !gtk_check_version(2,6,0) )
+    // don't create another dialog if one is already present
+    if ( !gs_aboutDialog )
+        gs_aboutDialog = GTK_ABOUT_DIALOG(gtk_about_dialog_new());
+
+    GtkAboutDialog * const dlg = gs_aboutDialog;
+    gtk_about_dialog_set_program_name(dlg, wxGTK_CONV_SYS(info.GetName()));
+    if ( info.HasVersion() )
+        gtk_about_dialog_set_version(dlg, wxGTK_CONV_SYS(info.GetVersion()));
+    else
+        gtk_about_dialog_set_version(dlg, NULL);
+    if ( info.HasCopyright() )
+        gtk_about_dialog_set_copyright(dlg, wxGTK_CONV_SYS(info.GetCopyrightToDisplay()));
+    else
+        gtk_about_dialog_set_copyright(dlg, NULL);
+    if ( info.HasDescription() )
+        gtk_about_dialog_set_comments(dlg, wxGTK_CONV_SYS(info.GetDescription()));
+    else
+        gtk_about_dialog_set_comments(dlg, NULL);
+    if ( info.HasLicence() )
+        gtk_about_dialog_set_license(dlg, wxGTK_CONV_SYS(info.GetLicence()));
+    else
+        gtk_about_dialog_set_license(dlg, NULL);
+
+    wxIcon icon = info.GetIcon();
+    if ( icon.IsOk() )
+        gtk_about_dialog_set_logo(dlg, info.GetIcon().GetPixbuf());
+
+    if ( info.HasWebSite() )

     {
     {

-        // don't create another dialog if one is already present
-        if ( !gs_aboutDialog )
-            gs_aboutDialog = GTK_ABOUT_DIALOG(gtk_about_dialog_new());
-
-        GtkAboutDialog * const dlg = gs_aboutDialog;
-        gtk_about_dialog_set_program_name(dlg, wxGTK_CONV_SYS(info.GetName()));
-        if ( info.HasVersion() )
-            gtk_about_dialog_set_version(dlg, wxGTK_CONV_SYS(info.GetVersion()));
-        else
-            gtk_about_dialog_set_version(dlg, NULL);
-        if ( info.HasCopyright() )
-            gtk_about_dialog_set_copyright(dlg, wxGTK_CONV_SYS(info.GetCopyrightToDisplay()));
-        else
-            gtk_about_dialog_set_copyright(dlg, NULL);
-        if ( info.HasDescription() )
-            gtk_about_dialog_set_comments(dlg, wxGTK_CONV_SYS(info.GetDescription()));
-        else
-            gtk_about_dialog_set_comments(dlg, NULL);
-        if ( info.HasLicence() )
-            gtk_about_dialog_set_license(dlg, wxGTK_CONV_SYS(info.GetLicence()));
-        else
-            gtk_about_dialog_set_license(dlg, NULL);
-
-        wxIcon icon = info.GetIcon();
-        if ( icon.Ok() )
-            gtk_about_dialog_set_logo(dlg, info.GetIcon().GetPixbuf());
-
-        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, wxGTK_CONV_SYS(info.GetWebSiteURL()));
-            gtk_about_dialog_set_website_label
-            (
-                dlg,
-                wxGTK_CONV_SYS(info.GetWebSiteDescription())
-            );
-        }
-        else
-        {
-            gtk_about_dialog_set_website(dlg, NULL);
-            gtk_about_dialog_set_website_label(dlg, NULL);
-            gtk_about_dialog_set_url_hook(NULL, NULL, NULL);
-        }
+#ifdef __WXGTK3__
+        g_signal_connect(dlg, "activate-link", G_CALLBACK(activate_link), dlg);
+#else
+        // 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);
+#endif

 
 

-        if ( info.HasDevelopers() )
-            gtk_about_dialog_set_authors(dlg, GtkArray(info.GetDevelopers()));
-        else
-            gtk_about_dialog_set_authors(dlg, GtkArray());
-        if ( info.HasDocWriters() )
-            gtk_about_dialog_set_documenters(dlg, GtkArray(info.GetDocWriters()));
-        else
-            gtk_about_dialog_set_documenters(dlg, GtkArray());
-        if ( info.HasArtists() )
-            gtk_about_dialog_set_artists(dlg, GtkArray(info.GetArtists()));
-        else
-            gtk_about_dialog_set_artists(dlg, GtkArray());
-
-        wxString transCredits;
-        if ( info.HasTranslators() )
-        {
-            const wxArrayString& translators = info.GetTranslators();
-            const size_t count = translators.size();
-            for ( size_t n = 0; n < count; n++ )
-            {
-                transCredits << translators[n] << wxT('\n');
-            }
-        }
-        else // no translators explicitly specified
+        gtk_about_dialog_set_website(dlg, wxGTK_CONV_SYS(info.GetWebSiteURL()));
+        gtk_about_dialog_set_website_label
+        (
+            dlg,
+            wxGTK_CONV_SYS(info.GetWebSiteDescription())
+        );
+    }
+    else
+    {
+        gtk_about_dialog_set_website(dlg, NULL);
+        gtk_about_dialog_set_website_label(dlg, NULL);
+#ifdef __WXGTK3__
+        g_signal_connect(dlg, "activate-link", G_CALLBACK(activate_link), NULL);
+#else
+        gtk_about_dialog_set_url_hook(NULL, NULL, NULL);
+#endif
+    }
+
+    if ( info.HasDevelopers() )
+        gtk_about_dialog_set_authors(dlg, GtkArray(info.GetDevelopers()));
+    else
+        gtk_about_dialog_set_authors(dlg, GtkArray());
+    if ( info.HasDocWriters() )
+        gtk_about_dialog_set_documenters(dlg, GtkArray(info.GetDocWriters()));
+    else
+        gtk_about_dialog_set_documenters(dlg, GtkArray());
+    if ( info.HasArtists() )
+        gtk_about_dialog_set_artists(dlg, GtkArray(info.GetArtists()));
+    else
+        gtk_about_dialog_set_artists(dlg, GtkArray());
+
+    wxString transCredits;
+    if ( info.HasTranslators() )
+    {
+        const wxArrayString& translators = info.GetTranslators();
+        const size_t count = translators.size();
+        for ( size_t n = 0; n < count; n++ )

         {
         {

-            // maybe we have translator credits in the message catalog?
-            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;
+            transCredits << translators[n] << wxT('\n');

         }
         }

+    }
+    else // no translators explicitly specified
+    {
+        // maybe we have translator credits in the message catalog?
+        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;
+    }

 
 

-        if ( !transCredits.empty() )
-            gtk_about_dialog_set_translator_credits(dlg, wxGTK_CONV_SYS(transCredits));
-        else
-            gtk_about_dialog_set_translator_credits(dlg, NULL);
-
-        g_signal_connect(dlg, "response",
-                            G_CALLBACK(wxGtkAboutDialogOnClose), NULL);
+    if ( !transCredits.empty() )
+        gtk_about_dialog_set_translator_credits(dlg, wxGTK_CONV_SYS(transCredits));
+    else
+        gtk_about_dialog_set_translator_credits(dlg, NULL);

 
 

-        gtk_window_present(GTK_WINDOW(dlg));
-        return;
-    }
+    g_signal_connect(dlg, "response",
+                        G_CALLBACK(wxGtkAboutDialogOnClose), NULL);

 
 

-    // native about dialog not available, fall back to the generic one
-    wxGenericAboutBox(info);
+    gtk_window_present(GTK_WINDOW(dlg));

 }
 
 }
 

-#endif // wxUSE_ABOUTDLG && GTK+ 2.6+
+#endif // wxUSE_ABOUTDLG