From: Stefan Csomor Date: Fri, 20 Mar 2009 19:23:16 +0000 (+0000) Subject: introducing temporary variables for atsu with cocoa X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/9a672c75fbc62a70f9fefc26c57300dc8c3812de introducing temporary variables for atsu with cocoa git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59657 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/osx/carbon/font.cpp b/src/osx/carbon/font.cpp index 6db6190920..c3426f807b 100644 --- a/src/osx/carbon/font.cpp +++ b/src/osx/carbon/font.cpp @@ -318,6 +318,10 @@ wxFontRefData::wxFontRefData(wxOSXSystemFont font, int size) #endif #if wxOSX_USE_ATSU_TEXT { +#if !wxOSX_USE_CARBON + // not needed outside + ThemeFontID m_macThemeFontID; +#endif switch( font ) { case wxOSX_SYSTEM_FONT_NORMAL: @@ -969,6 +973,11 @@ void wxNativeFontInfo::EnsureValid() #if wxOSX_USE_ATSU_TEXT if ( !m_atsuFontValid ) { +#if !wxOSX_USE_CARBON + // not needed outside + wxInt16 m_qdFontFamily; + wxInt16 m_qdFontStyle; +#endif wxCFStringRef cf( m_faceName, wxLocale::GetSystemEncoding() ); ATSFontFamilyRef atsfamily = ATSFontFamilyFindFromName( cf , kATSOptionFlagsDefault ); if ( atsfamily == (ATSFontFamilyRef) -1 )