correcting #ifdef to #if, fixes #11062

[wxWidgets.git] / src / osx / cocoa / aboutdlg.mm

diff --git a/src/osx/cocoa/aboutdlg.mm b/src/osx/cocoa/aboutdlg.mm
index 553094bf1807e083456cf31e32b5d8764410626b..7d9d6f9cd47f5004d1f29a683041ec583e72e66a 100644 (file)
--- a/src/osx/cocoa/aboutdlg.mm
+++ b/src/osx/cocoa/aboutdlg.mm
@@ -62,7 +62,7 @@ public:
 
     void SetAttributedString( CFStringRef key, const wxString& value )
     {
-          wxCFRef<CFAttributedStringRef> attrString( 
+          wxCFRef<CFAttributedStringRef> attrString(
             CFAttributedStringCreate(kCFAllocatorDefault, wxCFStringRef(value), NULL) );
         CFDictionarySetValue(*this, key, attrString);
     }
@@ -72,7 +72,7 @@ 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
@@ -87,12 +87,11 @@ void wxAboutBox(const wxAboutDialogInfo& info)
         if ( info.HasVersion() )
         {
             opts.Set(CFSTR("Version"),info.GetVersion());
-            opts.Set(CFSTR("ApplicationVersion"),
-                     wxString::Format(_("Version %s"), info.GetVersion()));
+            opts.Set(CFSTR("ApplicationVersion"),info.GetLongVersion());
         }
 
         if ( info.HasCopyright() )
-            opts.Set(CFSTR("Copyright"), info.GetCopyright());
+            opts.Set(CFSTR("Copyright"), info.GetCopyrightToDisplay());
 
         opts.SetAttributedString(CFSTR("Credits"), info.GetDescriptionAndCredits());
 
@@ -101,7 +100,7 @@ void wxAboutBox(const wxAboutDialogInfo& info)
     else // simple "native" version is not enough
     {
         // we need to use the full-blown generic version
-        wxGenericAboutBox(info);
+        wxGenericAboutBox(info, parent);
     }
 }