substitute '@b NB:' with '@note'; first partial revision of e*h headers; replace...

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

diff --git a/src/mac/carbon/aboutdlg.cpp b/src/mac/carbon/aboutdlg.cpp
index 9cf251339aa866361964d844b426f599e5e2e599..243de8b7d7b2a1a69358fdf82a8d417ba4ca8b01 100644 (file)
--- a/src/mac/carbon/aboutdlg.cpp
+++ b/src/mac/carbon/aboutdlg.cpp
@@ -30,10 +30,10 @@
 #include "wx/mac/private.h"
 
 // helper class for HIAboutBox options
 #include "wx/mac/private.h"
 
 // helper class for HIAboutBox options

-class AboutBoxOptions : public wxMacCFRefHolder<CFMutableDictionaryRef>
+class AboutBoxOptions : public wxCFRef<CFMutableDictionaryRef>

 {
 public:
 {
 public:

-    AboutBoxOptions() : wxMacCFRefHolder<CFMutableDictionaryRef>
+    AboutBoxOptions() : wxCFRef<CFMutableDictionaryRef>

                         (
                           CFDictionaryCreateMutable
                           (
                         (
                           CFDictionaryCreateMutable
                           (


@@ -48,7 +48,7 @@ public:
 
     void Set(CFStringRef key, const wxString& value)
     {
 
     void Set(CFStringRef key, const wxString& value)
     {

-        CFDictionarySetValue(*this, key, wxMacCFStringHolder(value));
+        CFDictionarySetValue(*this, key, wxCFStringRef(value));

     }
 };
 
     }
 };
 


@@ -61,6 +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
     // 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;


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

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

 
         if ( info.HasCopyright() )
             opts.Set(kHIAboutBoxCopyrightKey, info.GetCopyright());
 
         if ( info.HasCopyright() )
             opts.Set(kHIAboutBoxCopyrightKey, info.GetCopyright());


@@ -78,6 +82,7 @@ void wxAboutBox(const wxAboutDialogInfo& info)
         HIAboutBox(opts);
     }
     else // simple "native" version is not enough
         HIAboutBox(opts);
     }
     else // simple "native" version is not enough

+#endif

     {
         // we need to use the full-blown generic version
         wxGenericAboutBox(info);
     {
         // we need to use the full-blown generic version
         wxGenericAboutBox(info);