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 c6f1845ca724fb695d389b2ba524136c50205bcf..1992228b6db1c6cde445b6dfe149cc2990c17bb8 100644 (file)
--- a/src/generic/aboutdlgg.cpp
+++ b/src/generic/aboutdlgg.cpp
@@ -100,9 +100,11 @@ wxString wxAboutDialogInfo::GetCopyrightToDisplay() const
 {
     wxString ret = m_copyright;
 
 {
     wxString ret = m_copyright;
 

+#if wxUSE_UNICODE

     const wxString copyrightSign = wxString::FromUTF8("\xc2\xa9");
     ret.Replace("(c)", copyrightSign);
     ret.Replace("(C)", copyrightSign);
     const wxString copyrightSign = wxString::FromUTF8("\xc2\xa9");
     ret.Replace("(c)", copyrightSign);
     ret.Replace("(C)", copyrightSign);

+#endif // wxUSE_UNICODE

 
     return ret;
 }
 
     return ret;
 }


@@ -183,11 +185,14 @@ bool wxGenericAboutDialog::Create(const wxAboutDialogInfo& info)
     wxSizer *sizerTop = new wxBoxSizer(wxVERTICAL);
     sizerTop->Add(sizerIconAndText, wxSizerFlags(1).Expand().Border());
 
     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());
     }
     wxSizer *sizerBtns = CreateButtonSizer(wxOK);
     if ( sizerBtns )
     {
         sizerTop->Add(sizerBtns, wxSizerFlags().Expand().Border());
     }

+#endif

 
     SetSizerAndFit(sizerTop);
 
 
     SetSizerAndFit(sizerTop);
 


@@ -237,8 +242,13 @@ void wxGenericAboutDialog::AddCollapsiblePane(const wxString& title,
 
 void wxGenericAboutBox(const wxAboutDialogInfo& info)
 {
 
 void wxGenericAboutBox(const wxAboutDialogInfo& info)
 {

+#if !defined(__WXGTK__) && !defined(__WXMAC__)

     wxGenericAboutDialog dlg(info);
     dlg.ShowModal();
     wxGenericAboutDialog dlg(info);
     dlg.ShowModal();

+#else
+    wxGenericAboutDialog* dlg = new wxGenericAboutDialog(info);
+    dlg->Show();
+#endif

 }
 
 // currently wxAboutBox is implemented natively only under these platforms, for
 }
 
 // currently wxAboutBox is implemented natively only under these platforms, for