X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/49b3b52cc8411690e1b1869181cc3fd934ab6767..55410bb4f67febe1ca20654f078ea4fb9a6223ae:/src/gtk/aboutdlg.cpp?ds=inline diff --git a/src/gtk/aboutdlg.cpp b/src/gtk/aboutdlg.cpp index 853d9a2101..1094233cd8 100644 --- 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(m_strings[n])); #endif delete [] m_strings; @@ -81,7 +81,7 @@ private: const gchar **m_strings; size_t m_count; - DECLARE_NO_COPY_CLASS(GtkArray) + wxDECLARE_NO_COPY_CLASS(GtkArray); }; } // anonymous namespace @@ -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() )