Update version to 2.9.4 in version.bkl too and rebake everything.

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

diff --git a/src/osx/carbon/aboutdlg.cpp b/src/osx/carbon/aboutdlg.cpp
index 243de8b7d7b2a1a69358fdf82a8d417ba4ca8b01..0ca668b1ffee6309e2ce5281599592349a300e7d 100644 (file)
--- a/src/osx/carbon/aboutdlg.cpp
+++ b/src/osx/carbon/aboutdlg.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        mac/carbon/aboutdlg.cpp
+// Name:        src/osx/carbon/aboutdlg.cpp

 // Purpose:     native wxAboutBox() implementation for wxMac
 // Author:      Vadim Zeitlin
 // Created:     2006-10-08
 // Purpose:     native wxAboutBox() implementation for wxMac
 // Author:      Vadim Zeitlin
 // Created:     2006-10-08


@@ -27,7 +27,7 @@
 #include "wx/aboutdlg.h"
 #include "wx/generic/aboutdlgg.h"
 
 #include "wx/aboutdlg.h"
 #include "wx/generic/aboutdlgg.h"
 

-#include "wx/mac/private.h"
+#include "wx/osx/private.h"

 
 // helper class for HIAboutBox options
 class AboutBoxOptions : public wxCFRef<CFMutableDictionaryRef>
 
 // helper class for HIAboutBox options
 class AboutBoxOptions : public wxCFRef<CFMutableDictionaryRef>


@@ -56,12 +56,12 @@ public:
 // implementation
 // ============================================================================
 
 // 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
 {
     // 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

-#ifndef __LP64__
+

     if ( info.IsSimple() )
     {
         AboutBoxOptions opts;
     if ( info.IsSimple() )
     {
         AboutBoxOptions opts;


@@ -69,23 +69,19 @@ void wxAboutBox(const wxAboutDialogInfo& info)
         opts.Set(kHIAboutBoxNameKey, info.GetName());
 
         if ( info.HasVersion() )
         opts.Set(kHIAboutBoxNameKey, info.GetName());
 
         if ( info.HasVersion() )

-        {
-            opts.Set(kHIAboutBoxVersionKey,
-                     wxString::Format(_("Version %s"), info.GetVersion()));
-        }
+            opts.Set(kHIAboutBoxVersionKey,info.GetLongVersion());

 
         if ( info.HasCopyright() )
 
         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
 
         opts.Set(kHIAboutBoxDescriptionKey, info.GetDescriptionAndCredits());
 
         HIAboutBox(opts);
     }
     else // simple "native" version is not enough

-#endif

     {
         // we need to use the full-blown generic version
     {
         // we need to use the full-blown generic version

-        wxGenericAboutBox(info);
+        wxGenericAboutBox(info, parent);

     }
 }
 
     }
 }