added native Mac implementation of wxAboutBox(); also moved aboutdlg.* files from core to adv library as they depend on wxHyperlinkCtrl which is in adv

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41695 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-08 12:07:03 +00:00
parent affebd0a6e
commit fd3f8f5cf5
5 changed files with 161 additions and 42 deletions
--- a/src/mac/carbon/aboutdlg.cpp
+++ b/src/mac/carbon/aboutdlg.cpp
@@ -0,0 +1,87 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        mac/carbon/aboutdlg.cpp
+// Purpose:     native wxAboutBox() implementation for wxMac
+// Author:      Vadim Zeitlin
+// Created:     2006-10-08
+// RCS-ID:      $Id$
+// Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// for compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#if wxUSE_ABOUTDLG
+
+#ifndef WX_PRECOMP
+#endif //WX_PRECOMP
+
+#include "wx/aboutdlg.h"
+#include "wx/generic/aboutdlgg.h"
+
+#include "wx/mac/private.h"
+
+// helper class for HIAboutBox options
+class AboutBoxOptions : public wxMacCFRefHolder<CFMutableDictionaryRef>
+{
+public:
+    AboutBoxOptions() : wxMacCFRefHolder<CFMutableDictionaryRef>
+                        (
+                          CFDictionaryCreateMutable
+                          (
+                           kCFAllocatorDefault,
+                           4, // there are at most 4 values
+                           &kCFTypeDictionaryKeyCallBacks,
+                           &kCFTypeDictionaryValueCallBacks
+                          )
+                        )
+    {
+    }
+
+    void Set(CFStringRef key, const wxString& value)
+    {
+        CFDictionarySetValue(*this, key, wxMacCFStringHolder(value));
+    }
+};
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+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 ( info.IsSimple() )
+    {
+        AboutBoxOptions opts;
+
+        opts.Set(kHIAboutBoxNameKey, info.GetName());
+
+        if ( info.HasVersion() )
+            opts.Set(kHIAboutBoxVersionKey, info.GetVersion());
+
+        if ( info.HasCopyright() )
+            opts.Set(kHIAboutBoxCopyrightKey, info.GetCopyright());
+
+        opts.Set(kHIAboutBoxDescriptionKey, info.GetDescriptionAndCredits());
+
+        HIAboutBox(opts);
+    }
+    else // simple "native" version is not enough
+    {
+        // we need to use the full-blown generic version
+        wxGenericAboutBox(info);
+    }
+}
+
+#endif // wxUSE_ABOUTDLG