applied wxNativeFontInfo patch from Derry Bryson (with minor changes)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9134 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/mac/font.h b/include/wx/mac/font.h
index 6b41fc9c61545ea0594bc5a2085fa5219210262d..e65149037e90a6ac88b85ed0d2402464ea824aa8 100644 (file)
--- a/include/wx/mac/font.h
+++ b/include/wx/mac/font.h
@@ -100,6 +100,15 @@ public:
         (void)Create(size, family, style, weight, underlined, face, encoding);
     }
 
+    wxFont(const wxNativeFontInfo& info)
+    {
+        Init();
+
+        (void)Create(info);
+    }
+
+    wxFont(const wxString& fontDesc);
+
     bool Create(int size,
                 int family,
                 int style,
@@ -108,6 +117,8 @@ public:
                 const wxString& face = wxEmptyString,
                 wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
 
+    bool Create(const wxNativeFontInfo& info);
+
     virtual ~wxFont();
 
     // assignment

diff --git a/src/mac/carbon/font.cpp b/src/mac/carbon/font.cpp
index 4f26c04f914e3bfab6d22d3655d28981ec364b68..ecffc9fd941d59244dc5d710d92340b785981080 100644 (file)
--- a/src/mac/carbon/font.cpp
+++ b/src/mac/carbon/font.cpp
@@ -18,13 +18,12 @@
 #include "wx/font.h"
 #include "wx/gdicmn.h"
 
+#include "wx/fontutil.h"
+
 #if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
 #endif
 
-
-
-
 // ============================================================================
 // implementation
 // ============================================================================
@@ -120,6 +119,13 @@ void wxFont::Init()
         wxTheFontList->Append(this);
 }
 
+wxFont::wxFont(const wxString& fontdesc)
+{
+    wxNativeFontInfo info;
+    if ( info.FromString(fontdesc) )
+        (void)Create(info);
+}
+
 bool wxFont::Create(int pointSize,
                     int family,
                     int style,
@@ -137,6 +143,12 @@ bool wxFont::Create(int pointSize,
     return TRUE;
 }
 
+bool wxFont::Create(const wxNativeFontInfo& info)
+{
+    return Create(info.pointSize, info.family, info.style, info.weight,
+                  info.underlined, info.faceName, info.encoding);
+}
+
 wxFont::~wxFont()
 {
     if (wxTheFontList)

diff --git a/src/mac/carbon/fontenum.cpp b/src/mac/carbon/fontenum.cpp
index f296efd93cb19bb41fc9923e166e7fbb6f7161f8..99cd68441ad9de7641580d276309485476ad105b 100644 (file)
--- a/src/mac/carbon/fontenum.cpp
+++ b/src/mac/carbon/fontenum.cpp
@@ -34,6 +34,7 @@
 
 #include "wx/fontenum.h"
 #include "wx/fontmap.h"
+#include "wx/fontutil.h"
 
 // ----------------------------------------------------------------------------
 // private classes

diff --git a/src/mac/font.cpp b/src/mac/font.cpp
index 4f26c04f914e3bfab6d22d3655d28981ec364b68..ecffc9fd941d59244dc5d710d92340b785981080 100644 (file)
--- a/src/mac/font.cpp
+++ b/src/mac/font.cpp
@@ -18,13 +18,12 @@
 #include "wx/font.h"
 #include "wx/gdicmn.h"
 
+#include "wx/fontutil.h"
+
 #if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
 #endif
 
-
-
-
 // ============================================================================
 // implementation
 // ============================================================================
@@ -120,6 +119,13 @@ void wxFont::Init()
         wxTheFontList->Append(this);
 }
 
+wxFont::wxFont(const wxString& fontdesc)
+{
+    wxNativeFontInfo info;
+    if ( info.FromString(fontdesc) )
+        (void)Create(info);
+}
+
 bool wxFont::Create(int pointSize,
                     int family,
                     int style,
@@ -137,6 +143,12 @@ bool wxFont::Create(int pointSize,
     return TRUE;
 }
 
+bool wxFont::Create(const wxNativeFontInfo& info)
+{
+    return Create(info.pointSize, info.family, info.style, info.weight,
+                  info.underlined, info.faceName, info.encoding);
+}
+
 wxFont::~wxFont()
 {
     if (wxTheFontList)

diff --git a/src/mac/fontenum.cpp b/src/mac/fontenum.cpp
index f296efd93cb19bb41fc9923e166e7fbb6f7161f8..99cd68441ad9de7641580d276309485476ad105b 100644 (file)
--- a/src/mac/fontenum.cpp
+++ b/src/mac/fontenum.cpp
@@ -34,6 +34,7 @@
 
 #include "wx/fontenum.h"
 #include "wx/fontmap.h"
+#include "wx/fontutil.h"
 
 // ----------------------------------------------------------------------------
 // private classes