fixing iterator comparison

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

diff --git a/src/gtk/aboutdlg.cpp b/src/gtk/aboutdlg.cpp
index 2460ea5b6adfded45d91ecd563377ce5023ec7a2..b2da06fe523f186c133ad20ce89de35ca5bbbafb 100644 (file)
--- a/src/gtk/aboutdlg.cpp
+++ b/src/gtk/aboutdlg.cpp
@@ -40,6 +40,11 @@ namespace
 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)
     // Create GtkArray from wxArrayString. Note that the created object is
     // only valid as long as 'a' is!
     GtkArray(const wxArrayString& a)


@@ -49,11 +54,19 @@ public:
 
         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
+#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
+#endif // wxUSE_UNICODE/!wxUSE_UNICODE

         }
 
         // array must be NULL-terminated
         }
 
         // array must be NULL-terminated


@@ -64,9 +77,9 @@ public:
 
     ~GtkArray()
     {
 
     ~GtkArray()
     {

-#if !wxUSE_UNICODE_UTF8
+#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;
 #endif
 
         delete [] m_strings;


@@ -76,7 +89,7 @@ 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
 };
 
 } // anonymous namespace


@@ -104,7 +117,7 @@ wxGtkAboutDialogOnLink(GtkAboutDialog * WXUNUSED(about),
     wxLaunchDefaultBrowser(wxGTK_CONV_BACK_SYS(link));
 }
 
     wxLaunchDefaultBrowser(wxGTK_CONV_BACK_SYS(link));
 }
 

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

 {
     if ( !gtk_check_version(2,6,0) )
     {
 {
     if ( !gtk_check_version(2,6,0) )
     {


@@ -116,12 +129,20 @@ void wxAboutBox(const wxAboutDialogInfo& info)
         gtk_about_dialog_set_name(dlg, wxGTK_CONV_SYS(info.GetName()));
         if ( info.HasVersion() )
             gtk_about_dialog_set_version(dlg, wxGTK_CONV_SYS(info.GetVersion()));
         gtk_about_dialog_set_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() )
         if ( info.HasCopyright() )

-            gtk_about_dialog_set_copyright(dlg, wxGTK_CONV_SYS(info.GetCopyright()));
+            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()));
         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()));
         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() )
 
         wxIcon icon = info.GetIcon();
         if ( icon.Ok() )


@@ -141,13 +162,25 @@ void wxAboutBox(const wxAboutDialogInfo& info)
                 wxGTK_CONV_SYS(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() )


@@ -156,7 +189,7 @@ void wxAboutBox(const wxAboutDialogInfo& info)
             const size_t count = translators.size();
             for ( size_t n = 0; n < count; n++ )
             {
             const size_t count = translators.size();
             for ( size_t n = 0; n < count; n++ )
             {

-                transCredits << translators[n] << _T('\n');
+                transCredits << translators[n] << wxT('\n');

             }
         }
         else // no translators explicitely specified
             }
         }
         else // no translators explicitely specified


@@ -176,6 +209,8 @@ void wxAboutBox(const wxAboutDialogInfo& info)
 
         if ( !transCredits.empty() )
             gtk_about_dialog_set_translator_credits(dlg, wxGTK_CONV_SYS(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);