Merge wxBitmapButton and wxButton panels in the xrc sample.

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

diff --git a/src/gtk/aboutdlg.cpp b/src/gtk/aboutdlg.cpp
index 1094233cd85fc180bbce633556dbbd854d5a55be..b2da06fe523f186c133ad20ce89de35ca5bbbafb 100644 (file)
--- a/src/gtk/aboutdlg.cpp
+++ b/src/gtk/aboutdlg.cpp
@@ -54,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


@@ -69,7 +77,7 @@ public:
 
     ~GtkArray()
     {
 
     ~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
         for ( size_t n = 0; n < m_count; n++ )
             free(const_cast<gchar *>(m_strings[n]));
 #endif


@@ -109,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) )
     {


@@ -181,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