AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixing 10.5 only compiles

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50345 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor 2007-11-30 12:34:04 +00:00
parent affd62faa2
commit 9f4e08aefa
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/mac/carbon/font.cpp
View File

@ -163,11 +163,13 @@ void wxFontRefData::Init(int pointSize,
wxFontRefData::~wxFontRefData()
{
#if wxMAC_USE_ATSU_TEXT
if ( m_macATSUStyle )
{
::ATSUDisposeStyle((ATSUStyle)m_macATSUStyle);
m_macATSUStyle = NULL ;
}
#endif
}
#if wxMAC_USE_CORE_TEXT
@ -232,7 +234,6 @@ static CTFontRef wxMacCreateCTFont(CFStringRef iFamilyName, CTFontSymbolicTraits
void wxFontRefData::MacFindFont()
{
OSStatus status = noErr;
#if wxMAC_USE_CORE_TEXT
if ( UMAGetSystemVersion() >= 0x1050 )
@ -298,6 +299,7 @@ void wxFontRefData::MacFindFont()
#endif
#if wxMAC_USE_ATSU_TEXT
{
OSStatus status = noErr;
Str255 qdFontName ;
if ( m_macThemeFontID != kThemeCurrentPortFont )
{
@ -522,7 +524,7 @@ bool wxFont::MacCreateThemeFont(wxUint16 themeFontID)
return MacCreateUIFont(HIThemeGetUIFontType(themeFontID));
}
#endif
#if wxMAC_USE_CORE_TEXT
#if wxMAC_USE_ATSU_TEXT
{
UnRef();
@ -532,9 +534,10 @@ bool wxFont::MacCreateThemeFont(wxUint16 themeFontID)
M_FONTDATA->m_macThemeFontID = themeFontID ;
RealizeResource();
return true;
}
return true;
#endif
return false;
}
wxFont::~wxFont()