X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b2680ced12cbbed16990007c5fa3ea7730700122..71c5a4d19d8752bd54de0ef27b81cff7a6d4d5c7:/src/osx/carbon/aboutdlg.cpp diff --git a/src/osx/carbon/aboutdlg.cpp b/src/osx/carbon/aboutdlg.cpp index 49dd82abfa..bbe9f1f8f3 100644 --- a/src/osx/carbon/aboutdlg.cpp +++ b/src/osx/carbon/aboutdlg.cpp @@ -56,12 +56,12 @@ public: // implementation // ============================================================================ -void wxAboutBox(const wxAboutDialogInfo& info) +void wxAboutBox(const wxAboutDialogInfo& info, wxWindow *parent) { // Mac native about box currently can show only name, version, copyright // and description fields and we also shoehorn the credits text into the // description but if we have anything else we must use the generic version -#if wxOSX_USE_CARBON + if ( info.IsSimple() ) { AboutBoxOptions opts; @@ -75,17 +75,16 @@ void wxAboutBox(const wxAboutDialogInfo& info) } if ( info.HasCopyright() ) - opts.Set(kHIAboutBoxCopyrightKey, info.GetCopyright()); + opts.Set(kHIAboutBoxCopyrightKey, info.GetCopyrightToDisplay()); opts.Set(kHIAboutBoxDescriptionKey, info.GetDescriptionAndCredits()); HIAboutBox(opts); } else // simple "native" version is not enough -#endif { // we need to use the full-blown generic version - wxGenericAboutBox(info); + wxGenericAboutBox(info, parent); } }