no real change; just add the standard separator where it's missing

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

diff --git a/src/generic/aboutdlgg.cpp b/src/generic/aboutdlgg.cpp
index b7a9fcf9775109ada00a0f8dafc8a66b2706f718..1992228b6db1c6cde445b6dfe149cc2990c17bb8 100644 (file)
--- a/src/generic/aboutdlgg.cpp
+++ b/src/generic/aboutdlgg.cpp
@@ -100,8 +100,11 @@ wxString wxAboutDialogInfo::GetCopyrightToDisplay() const
 {
     wxString ret = m_copyright;
 
-    ret.Replace("(c)", "\u00A9");
-    ret.Replace("(C)", "\u00A9");
+#if wxUSE_UNICODE
+    const wxString copyrightSign = wxString::FromUTF8("\xc2\xa9");
+    ret.Replace("(c)", copyrightSign);
+    ret.Replace("(C)", copyrightSign);
+#endif // wxUSE_UNICODE
 
     return ret;
 }
@@ -182,11 +185,14 @@ bool wxGenericAboutDialog::Create(const wxAboutDialogInfo& info)
     wxSizer *sizerTop = new wxBoxSizer(wxVERTICAL);
     sizerTop->Add(sizerIconAndText, wxSizerFlags(1).Expand().Border());
 
+// Mac typically doesn't use OK buttons just for dismissing dialogs.
+#if !defined(__WXMAC__)
     wxSizer *sizerBtns = CreateButtonSizer(wxOK);
     if ( sizerBtns )
     {
         sizerTop->Add(sizerBtns, wxSizerFlags().Expand().Border());
     }
+#endif
 
     SetSizerAndFit(sizerTop);
 
@@ -236,8 +242,13 @@ void wxGenericAboutDialog::AddCollapsiblePane(const wxString& title,
 
 void wxGenericAboutBox(const wxAboutDialogInfo& info)
 {
+#if !defined(__WXGTK__) && !defined(__WXMAC__)
     wxGenericAboutDialog dlg(info);
     dlg.ShowModal();
+#else
+    wxGenericAboutDialog* dlg = new wxGenericAboutDialog(info);
+    dlg->Show();
+#endif
 }
 
 // currently wxAboutBox is implemented natively only under these platforms, for