check for m_parentMenu being NULL in IsChecked/Checked/Enable() too (closes #10460)

[wxWidgets.git] / src / generic / aboutdlgg.cpp

diff --git a/src/generic/aboutdlgg.cpp b/src/generic/aboutdlgg.cpp
index 77e5d513c2f81e7e78bf0e0932f1b0c00720fa4f..c6f1845ca724fb695d389b2ba524136c50205bcf 100644 (file)
--- a/src/generic/aboutdlgg.cpp
+++ b/src/generic/aboutdlgg.cpp
@@ -96,6 +96,17 @@ wxIcon wxAboutDialogInfo::GetIcon() const
     return icon;
 }
 
     return icon;
 }
 

+wxString wxAboutDialogInfo::GetCopyrightToDisplay() const
+{
+    wxString ret = m_copyright;
+
+    const wxString copyrightSign = wxString::FromUTF8("\xc2\xa9");
+    ret.Replace("(c)", copyrightSign);
+    ret.Replace("(C)", copyrightSign);
+
+    return ret;
+}
+

 // ----------------------------------------------------------------------------
 // wxGenericAboutDialog
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxGenericAboutDialog
 // ----------------------------------------------------------------------------


@@ -120,7 +131,7 @@ bool wxGenericAboutDialog::Create(const wxAboutDialogInfo& info)
     m_sizerText->Add(label, wxSizerFlags().Centre().Border());
     m_sizerText->AddSpacer(5);
 
     m_sizerText->Add(label, wxSizerFlags().Centre().Border());
     m_sizerText->AddSpacer(5);
 

-    AddText(info.GetCopyright());
+    AddText(info.GetCopyrightToDisplay());

     AddText(info.GetDescription());
 
     if ( info.HasWebSite() )
     AddText(info.GetDescription());
 
     if ( info.HasWebSite() )


@@ -136,22 +147,22 @@ bool wxGenericAboutDialog::Create(const wxAboutDialogInfo& info)
 
 #if wxUSE_COLLPANE
     if ( info.HasLicence() )
 
 #if wxUSE_COLLPANE
     if ( info.HasLicence() )

-        AddCollapsiblePane(wxT("License"), info.GetLicence());
+        AddCollapsiblePane(_("License"), info.GetLicence());

 
     if ( info.HasDevelopers() )
 
     if ( info.HasDevelopers() )

-        AddCollapsiblePane(wxT("Developers"),
+        AddCollapsiblePane(_("Developers"),

                            AllAsString(info.GetDevelopers()));
 
     if ( info.HasDocWriters() )
                            AllAsString(info.GetDevelopers()));
 
     if ( info.HasDocWriters() )

-        AddCollapsiblePane(wxT("Documentation writers"),
+        AddCollapsiblePane(_("Documentation writers"),

                            AllAsString(info.GetDocWriters()));
 
     if ( info.HasArtists() )
                            AllAsString(info.GetDocWriters()));
 
     if ( info.HasArtists() )

-        AddCollapsiblePane(wxT("Artists"),
+        AddCollapsiblePane(_("Artists"),

                            AllAsString(info.GetArtists()));
 
     if ( info.HasTranslators() )
                            AllAsString(info.GetArtists()));
 
     if ( info.HasTranslators() )

-        AddCollapsiblePane(wxT("Translators"),
+        AddCollapsiblePane(_("Translators"),

                            AllAsString(info.GetTranslators()));
 #endif // wxUSE_COLLPANE
 
                            AllAsString(info.GetTranslators()));
 #endif // wxUSE_COLLPANE