X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/51abe921b849be69f02c174365c9a7bc8b46bd08..49a91764b57168d9f441578001b3206a7330ee70:/src/mac/font.cpp

diff --git a/src/mac/font.cpp b/src/mac/font.cpp
index 988d1c81e2..d425b3cf95 100644
--- a/src/mac/font.cpp
+++ b/src/mac/font.cpp
@@ -16,15 +16,16 @@
 #include "wx/defs.h"
 #include "wx/string.h"
 #include "wx/font.h"
+#include "wx/fontutil.h"
 #include "wx/gdicmn.h"
+#include "wx/utils.h"
+
+#include "wx/fontutil.h"
 
 #if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
 #endif
 
-
-
-
 // ============================================================================
 // implementation
 // ============================================================================
@@ -79,7 +80,7 @@ void wxFontRefData::MacFindFont()
 				::GetFNum( "\pTimes" , &m_macFontNum) ;
 				break ;
 			case wxSWISS :
-				::GetFNum( "\pHelvetica" , &m_macFontNum) ;
+				::GetFNum( "\pGeneva" , &m_macFontNum) ;
 				break ;
 			case wxMODERN :
 				::GetFNum( "\pMonaco" , &m_macFontNum) ;
@@ -94,9 +95,13 @@ void wxFontRefData::MacFindFont()
 			m_macFontNum = ::GetAppFont() ;
 		else
 		{
-			strcpy(wxBuffer, m_faceName);
-			C2PStr(wxBuffer);
-			::GetFNum( (unsigned char*) wxBuffer, &m_macFontNum);
+#if TARGET_CARBON
+			c2pstrcpy( (StringPtr) wxBuffer, m_faceName ) ;
+#else
+			strcpy( (char *) wxBuffer, m_faceName ) ;
+			c2pstr( (char *) wxBuffer ) ;
+#endif
+			::GetFNum( (StringPtr) wxBuffer, &m_macFontNum);
 		}
 	}
 
@@ -120,6 +125,19 @@ void wxFont::Init()
         wxTheFontList->Append(this);
 }
 
+bool wxFont::Create(const wxNativeFontInfo& info)
+{
+    return Create(info.pointSize, info.family, info.style, info.weight,
+                  info.underlined, info.faceName, info.encoding);
+}
+
+wxFont::wxFont(const wxString& fontdesc)
+{
+    wxNativeFontInfo info;
+    if ( info.FromString(fontdesc) )
+        (void)Create(info);
+}
+
 bool wxFont::Create(int pointSize,
                     int family,
                     int style,