add support for alpha in color dialog on OSX, see #14127

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

diff --git a/src/gtk/aboutdlg.cpp b/src/gtk/aboutdlg.cpp
index 7c0c374076361b013a02e9b517c56dd2e8c66440..f17a837de96d35bb9f68004fb82e9fd6514588fe 100644 (file)
--- a/src/gtk/aboutdlg.cpp
+++ b/src/gtk/aboutdlg.cpp
@@ -19,42 +19,56 @@
 // 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
 
 #ifndef WX_PRECOMP

+    #include "wx/utils.h"       // for wxLaunchDefaultBrowser()

 #endif //WX_PRECOMP
 
 #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"

 
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------

-// 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:
 
 class GtkArray
 {
 public:

+    // Create empty GtkArray
+    GtkArray() : m_strings(0), m_count(0)
+    {
+    }
+
+    // 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];
     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++ )
         for ( size_t n = 0; n < m_count; n++ )

+        {
+#if wxUSE_UNICODE
+            // notice that there is no need to copy the string pointer here
+            // because this class is used only as a temporary and during its
+            // existence the pointer persists in wxString which uses it either
+            // for internal representation (in wxUSE_UNICODE_UTF8 case) or as
+            // cached m_convertedToChar (in wxUSE_UNICODE_WCHAR case)
+            m_strings[n] = wxGTK_CONV_SYS(a[n]);
+#else // !wxUSE_UNICODE
+            // and in ANSI build we can simply borrow the pointer from
+            // wxCharBuffer (which owns it in this case) instead of copying it
+            // but we then become responsible for freeing it

             m_strings[n] = wxGTK_CONV_SYS(a[n]).release();
             m_strings[n] = wxGTK_CONV_SYS(a[n]).release();

+#endif // wxUSE_UNICODE/!wxUSE_UNICODE
+        }

 
         // array must be NULL-terminated
         m_strings[m_count] = NULL;
 
         // array must be NULL-terminated
         m_strings[m_count] = NULL;


@@ -64,8 +78,10 @@ public:
 
     ~GtkArray()
     {
 
     ~GtkArray()
     {

+#if !wxUSE_UNICODE

         for ( size_t n = 0; n < m_count; n++ )
         for ( size_t n = 0; n < m_count; n++ )

-            free(wx_const_cast(gchar *, m_strings[n]));
+            free(const_cast<gchar *>(m_strings[n]));
+#endif

 
         delete [] m_strings;
     }
 
         delete [] m_strings;
     }


@@ -74,73 +90,153 @@ private:
     const gchar **m_strings;
     size_t m_count;
 
     const gchar **m_strings;
     size_t m_count;
 

-    DECLARE_NO_COPY_CLASS(GtkArray)
+    wxDECLARE_NO_COPY_CLASS(GtkArray);

 };
 
 };
 

+} // anonymous namespace
+

 // ============================================================================
 // implementation
 // ============================================================================
 
 // ============================================================================
 // implementation
 // ============================================================================
 

-void wxAboutBox(const wxAboutDialogInfo& info)
+// GTK+ about dialog is modeless, keep track of it in this variable
+static GtkAboutDialog *gs_aboutDialog = NULL;
+
+extern "C" {
+static void wxGtkAboutDialogOnClose(GtkAboutDialog *about)

 {
 {

-    if ( !gtk_check_version(2,6,0) )
+    gtk_widget_destroy(GTK_WIDGET(about));
+    if ( about == gs_aboutDialog )
+        gs_aboutDialog = NULL;
+}
+}
+
+#ifdef __WXGTK3__
+extern "C" {
+static gboolean activate_link(GtkAboutDialog*, const char* link, void* dontIgnore)
+{
+    if (dontIgnore)

     {
     {

-        GtkAboutDialog * const dlg = GTK_ABOUT_DIALOG(gtk_about_dialog_new());
-        gtk_about_dialog_set_name(dlg, GtkStr(info.GetName()));
-        if ( info.HasVersion() )
-            gtk_about_dialog_set_version(dlg, GtkStr(info.GetVersion()));
-        if ( info.HasCopyright() )
-            gtk_about_dialog_set_copyright(dlg, GtkStr(info.GetCopyright()));
-        if ( info.HasDescription() )
-            gtk_about_dialog_set_comments(dlg, GtkStr(info.GetDescription()));
-        if ( info.HasLicence() )
-            gtk_about_dialog_set_license(dlg, GtkStr(info.GetLicence()));
-
-        wxIcon icon = info.GetIcon();
-        if ( icon.Ok() )
-            gtk_about_dialog_set_logo(dlg, info.GetIcon().GetPixbuf());
-
-        if ( info.HasWebSite() )
-        {
-            gtk_about_dialog_set_website(dlg, GtkStr(info.GetWebSiteURL()));
-            gtk_about_dialog_set_website_label
-            (
-                dlg,
-                GtkStr(info.GetWebSiteDescription())
-            );
-        }
+        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));
+}
+}
+#endif

 
 

-        if ( info.HasDevelopers() )
-            gtk_about_dialog_set_authors(dlg, GtkArray(info.GetDevelopers()));
-        if ( info.HasDocWriters() )
-            gtk_about_dialog_set_documenters(dlg, GtkArray(info.GetDocWriters()));
-        if ( info.HasArtists() )
-            gtk_about_dialog_set_artists(dlg, GtkArray(info.GetArtists()));
+void wxAboutBox(const wxAboutDialogInfo& info, wxWindow* WXUNUSED(parent))
+{
+    // 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() )
+    {
+#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
+
+        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
+    }

 
 

-        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] << _T('\n');
-            }
-        }
-        else // no translators explicitely specified
+    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?
-            transCredits = _("translator-credits");
+            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;
+    }

 
 

-        gtk_about_dialog_set_translator_credits(dlg, GtkStr(transCredits));
+    if ( !transCredits.empty() )
+        gtk_about_dialog_set_translator_credits(dlg, wxGTK_CONV_SYS(transCredits));
+    else
+        gtk_about_dialog_set_translator_credits(dlg, NULL);

 
 

-        gtk_widget_show(GTK_WIDGET(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