Remove apparently erroneous -1 from DrawBitmap() in wxMSW wxGC code.

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

diff --git a/src/gtk/aboutdlg.cpp b/src/gtk/aboutdlg.cpp
index 6e06f39b68b27e36328a80b4d6dddacfc4c4b851..6728f212a8f0938703ee0908a0de75b33b75669c 100644 (file)
--- a/src/gtk/aboutdlg.cpp
+++ b/src/gtk/aboutdlg.cpp
@@ -44,7 +44,7 @@ public:
     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)
@@ -54,11 +54,19 @@ public:
 
         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();
-#endif
+#endif // wxUSE_UNICODE/!wxUSE_UNICODE
         }
 
         // array must be NULL-terminated
@@ -69,7 +77,7 @@ public:
 
     ~GtkArray()
     {
-#if !wxUSE_UNICODE_UTF8
+#if !wxUSE_UNICODE
         for ( size_t n = 0; n < m_count; n++ )
             free(const_cast<gchar *>(m_strings[n]));
 #endif
@@ -81,7 +89,7 @@ private:
     const gchar **m_strings;
     size_t m_count;
 
-    DECLARE_NO_COPY_CLASS(GtkArray)
+    wxDECLARE_NO_COPY_CLASS(GtkArray);
 };
 
 } // anonymous namespace
@@ -109,7 +117,7 @@ wxGtkAboutDialogOnLink(GtkAboutDialog * WXUNUSED(about),
     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) )
     {
@@ -118,13 +126,13 @@ void wxAboutBox(const wxAboutDialogInfo& info)
             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()));
+        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.GetCopyright()));
+            gtk_about_dialog_set_copyright(dlg, wxGTK_CONV_SYS(info.GetCopyrightToDisplay()));
         else
             gtk_about_dialog_set_copyright(dlg, NULL);
         if ( info.HasDescription() )
@@ -181,10 +189,10 @@ void wxAboutBox(const wxAboutDialogInfo& info)
             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 explicitly specified
         {
             // maybe we have translator credits in the message catalog?
             wxString translator = _("translator-credits");