fix wxDataObjectComposite::GetFormatCount and add some comments to explain the reason...

[wxWidgets.git] / src / osx / carbon / aboutdlg.cpp

diff --git a/src/osx/carbon/aboutdlg.cpp b/src/osx/carbon/aboutdlg.cpp
index 49dd82abfa2b4b4c2067221b487ea6b835a04e55..9188a221c71aab70d60e18aecc88922969683086 100644 (file)
--- a/src/osx/carbon/aboutdlg.cpp
+++ b/src/osx/carbon/aboutdlg.cpp
@@ -61,7 +61,7 @@ void wxAboutBox(const wxAboutDialogInfo& info)
     // 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,14 +75,13 @@ 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);