X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5b781a6729859abc77e6ca5b1f81cbaad974a78f..2d4511658de32250af399378ce4cd059adbc925d:/src/mac/font.cpp diff --git a/src/mac/font.cpp b/src/mac/font.cpp index 79d93657fb..d425b3cf95 100644 --- a/src/mac/font.cpp +++ b/src/mac/font.cpp @@ -18,6 +18,7 @@ #include "wx/font.h" #include "wx/fontutil.h" #include "wx/gdicmn.h" +#include "wx/utils.h" #include "wx/fontutil.h" @@ -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); } }