X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3b7e6277be7c6dc21c62f3fa709bd0438df33175..ba0b7b323817e44903ba5ee199d17bbb166ed3d5:/src/mac/carbon/font.cpp?ds=sidebyside

diff --git a/src/mac/carbon/font.cpp b/src/mac/carbon/font.cpp
index ecffc9fd94..d425b3cf95 100644
--- a/src/mac/carbon/font.cpp
+++ b/src/mac/carbon/font.cpp
@@ -16,7 +16,9 @@
 #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"
 
@@ -93,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);
 		}
 	}
 
@@ -119,6 +125,12 @@ 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;
@@ -143,12 +155,6 @@ 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)