Make about dialog non-modal on GTK/Mac and don't show the OK button on Mac.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59356 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/generic/aboutdlgg.cpp b/src/generic/aboutdlgg.cpp
index e2cc19315ac3aedeb818e8fa8c0d23bdf390ce60..1992228b6db1c6cde445b6dfe149cc2990c17bb8 100644 (file)
--- a/src/generic/aboutdlgg.cpp
+++ b/src/generic/aboutdlgg.cpp
@@ -185,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);
 


@@ -239,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