make sure that code is always available when compiling for 10.4, whatever flavour
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58064 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -754,7 +754,7 @@ bool wxFont::MacCreateFromCTFontDescriptor( const void * ctFontDescriptor , int
|
|||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if wxOSX_USE_CARBON
|
#if wxOSX_USE_ATSU_TEXT
|
||||||
bool wxFont::MacCreateFromThemeFont(wxUint16 themeFontID)
|
bool wxFont::MacCreateFromThemeFont(wxUint16 themeFontID)
|
||||||
{
|
{
|
||||||
#if wxOSX_USE_CORE_TEXT
|
#if wxOSX_USE_CORE_TEXT
|
||||||
@@ -763,7 +763,6 @@ bool wxFont::MacCreateFromThemeFont(wxUint16 themeFontID)
|
|||||||
return MacCreateFromUIFont(HIThemeGetUIFontType(themeFontID));
|
return MacCreateFromUIFont(HIThemeGetUIFontType(themeFontID));
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
#if wxOSX_USE_ATSU_TEXT
|
|
||||||
{
|
{
|
||||||
UnRef();
|
UnRef();
|
||||||
|
|
||||||
@@ -775,7 +774,6 @@ bool wxFont::MacCreateFromThemeFont(wxUint16 themeFontID)
|
|||||||
RealizeResource();
|
RealizeResource();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
Reference in New Issue
Block a user