notify the timers outside of loop over m_timers to avoid crashes if a timer event...

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

diff --git a/src/gtk/aboutdlg.cpp b/src/gtk/aboutdlg.cpp
index 853d9a210127fc3c0f8cf6bdceab5fad5135407b..7be26532d951b473a5097d8b79f06de9cbc90424 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)
@@ -71,7 +71,7 @@ public:
     {
 #if !wxUSE_UNICODE_UTF8
         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;
@@ -124,7 +124,7 @@ void wxAboutBox(const wxAboutDialogInfo& info)
         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() )