X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3b7e6277be7c6dc21c62f3fa709bd0438df33175..40de795fb9d55f137a94ff607db9641a7383b558:/src/mac/font.cpp diff --git a/src/mac/font.cpp b/src/mac/font.cpp index ecffc9fd94..ab906cad67 100644 --- a/src/mac/font.cpp +++ b/src/mac/font.cpp @@ -16,10 +16,15 @@ #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" +#include "wx/mac/private.h" +#include "ATSUnicode.h" + #if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject) #endif @@ -93,9 +98,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); } } @@ -107,6 +116,12 @@ void wxFontRefData::MacFindFont() if (m_underlined) m_macFontStyle |= underline; m_macFontSize = m_pointSize ; + + //TODO:if we supply the style as an additional parameter we must make a testing + //sequence in order to degrade gracefully while trying to maintain most of the style + //information, meanwhile we just take the normal font and apply the features after + OSStatus status = ::ATSUFONDtoFontID(m_macFontNum, normal /*qdStyle*/, (UInt32*)&m_macATSUFontID); + wxASSERT_MSG( status == noErr , "couldn't retrieve font identifier" ) ; } // ---------------------------------------------------------------------------- @@ -115,8 +130,12 @@ void wxFontRefData::MacFindFont() void wxFont::Init() { - if ( wxTheFontList ) - 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) @@ -143,16 +162,8 @@ 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) - wxTheFontList->DeleteObject(this); } bool wxFont::RealizeResource()