don't use deprecated gtk_object_sink(), replace it with g_object_ref_sink()

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

diff --git a/src/gtk/aboutdlg.cpp b/src/gtk/aboutdlg.cpp
index c5c73555634b9de7981a2e404de9180dc078d9f0..853d9a210127fc3c0f8cf6bdceab5fad5135407b 100644 (file)
--- a/src/gtk/aboutdlg.cpp
+++ b/src/gtk/aboutdlg.cpp
@@ -31,31 +31,35 @@
 #include "wx/gtk/private.h"
 
 // ----------------------------------------------------------------------------
 #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:
 
 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_UTF8
+            m_strings[n] = a[n].utf8_str();
+#else

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

+#endif
+        }

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


@@ -65,8 +69,10 @@ public:
 
     ~GtkArray()
     {
 
     ~GtkArray()
     {

+#if !wxUSE_UNICODE_UTF8

         for ( size_t n = 0; n < m_count; n++ )
             free(wx_const_cast(gchar *, m_strings[n]));
         for ( size_t n = 0; n < m_count; n++ )
             free(wx_const_cast(gchar *, m_strings[n]));

+#endif

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


@@ -78,14 +84,21 @@ private:
     DECLARE_NO_COPY_CLASS(GtkArray)
 };
 
     DECLARE_NO_COPY_CLASS(GtkArray)
 };
 

+} // anonymous namespace
+

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

+// GTK+ about dialog is modeless, keep track of it in this variable
+static GtkAboutDialog *gs_aboutDialog = NULL;
+

 extern "C" void
 wxGtkAboutDialogOnClose(GtkAboutDialog *about)
 {
     gtk_widget_destroy(GTK_WIDGET(about));
 extern "C" void
 wxGtkAboutDialogOnClose(GtkAboutDialog *about)
 {
     gtk_widget_destroy(GTK_WIDGET(about));

+    if ( about == gs_aboutDialog )
+        gs_aboutDialog = NULL;

 }
 
 extern "C" void
 }
 
 extern "C" void


@@ -93,23 +106,35 @@ wxGtkAboutDialogOnLink(GtkAboutDialog * WXUNUSED(about),
                        const gchar *link,
                        gpointer WXUNUSED(data))
 {
                        const gchar *link,
                        gpointer WXUNUSED(data))
 {

-    wxLaunchDefaultBrowser(wxGTK_CONV_BACK(link));
+    wxLaunchDefaultBrowser(wxGTK_CONV_BACK_SYS(link));

 }
 
 void wxAboutBox(const wxAboutDialogInfo& info)
 {
     if ( !gtk_check_version(2,6,0) )
     {
 }
 
 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()));
+        // 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_name(dlg, wxGTK_CONV_SYS(info.GetName()));

         if ( info.HasVersion() )
         if ( info.HasVersion() )

-            gtk_about_dialog_set_version(dlg, GtkStr(info.GetVersion()));
+            gtk_about_dialog_set_version(dlg, wxGTK_CONV_SYS(info.GetVersion()));
+        else
+            gtk_about_dialog_set_version(dlg, NULL);

         if ( info.HasCopyright() )
         if ( info.HasCopyright() )

-            gtk_about_dialog_set_copyright(dlg, GtkStr(info.GetCopyright()));
+            gtk_about_dialog_set_copyright(dlg, wxGTK_CONV_SYS(info.GetCopyright()));
+        else
+            gtk_about_dialog_set_copyright(dlg, NULL);

         if ( info.HasDescription() )
         if ( info.HasDescription() )

-            gtk_about_dialog_set_comments(dlg, GtkStr(info.GetDescription()));
+            gtk_about_dialog_set_comments(dlg, wxGTK_CONV_SYS(info.GetDescription()));
+        else
+            gtk_about_dialog_set_comments(dlg, NULL);

         if ( info.HasLicence() )
         if ( info.HasLicence() )

-            gtk_about_dialog_set_license(dlg, GtkStr(info.GetLicence()));
+            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() )
 
         wxIcon icon = info.GetIcon();
         if ( icon.Ok() )


@@ -122,20 +147,32 @@ void wxAboutBox(const wxAboutDialogInfo& info)
             //     this...)
             gtk_about_dialog_set_url_hook(wxGtkAboutDialogOnLink, NULL, NULL);
 
             //     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,
             gtk_about_dialog_set_website_label
             (
                 dlg,

-                GtkStr(info.GetWebSiteDescription())
+                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);
+        }

 
         if ( info.HasDevelopers() )
             gtk_about_dialog_set_authors(dlg, GtkArray(info.GetDevelopers()));
 
         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()));
         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()));
         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() )
 
         wxString transCredits;
         if ( info.HasTranslators() )


@@ -150,15 +187,27 @@ void wxAboutBox(const wxAboutDialogInfo& info)
         else // no translators explicitely specified
         {
             // maybe we have translator credits in the message catalog?
         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));
+        else
+            gtk_about_dialog_set_translator_credits(dlg, NULL);

 
         g_signal_connect(dlg, "response",
                             G_CALLBACK(wxGtkAboutDialogOnClose), NULL);
 
 
         g_signal_connect(dlg, "response",
                             G_CALLBACK(wxGtkAboutDialogOnClose), NULL);
 

-        gtk_widget_show(GTK_WIDGET(dlg));
+        gtk_window_present(GTK_WINDOW(dlg));

         return;
     }
 
         return;
     }