diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-04-07 03:04:31 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-04-07 03:04:31 +0300 |
| commit | 07c9bb103823dd9c0dc297d0315907ab94488f93 (patch) | |
| tree | 53b894b927c37c8a6e8779225861861656b033ac /vcl/aqua/source/gdi | |
| parent | d0d2c12a54e590496af9d0df278c863365293ae0 (diff) | |
Drop workarounds for Mac OS X SDKs 10.4 and 10.5
Change-Id: Ifa07f9b5613b4a75c5b72178cb276b9c0b495a62
Diffstat (limited to 'vcl/aqua/source/gdi')
| -rw-r--r-- | vcl/aqua/source/gdi/atsui/salgdi.cxx | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/vcl/aqua/source/gdi/atsui/salgdi.cxx b/vcl/aqua/source/gdi/atsui/salgdi.cxx index d0594b598098..02e86b1da5a1 100644 --- a/vcl/aqua/source/gdi/atsui/salgdi.cxx +++ b/vcl/aqua/source/gdi/atsui/salgdi.cxx @@ -452,21 +452,9 @@ static bool AddTempFontDir( const char* pDir ) ATSFontContainerRef aATSFontContainer; const ATSFontContext eContext = kATSFontContextLocal; // TODO: *Global??? -#if defined(MAC_OS_X_VERSION_10_5) && (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5) eStatus = ::ATSFontActivateFromFileReference( &aPathFSRef, eContext, kATSFontFormatUnspecified, NULL, kATSOptionFlagsDefault, &aATSFontContainer ); -#else - FSSpec aPathFSSpec; - eStatus = ::FSGetCatalogInfo( &aPathFSRef, kFSCatInfoNone, - NULL, NULL, &aPathFSSpec, NULL ); - if( eStatus != noErr ) - return false; - - eStatus = ::ATSFontActivateFromFileSpecification( &aPathFSSpec, - eContext, kATSFontFormatUnspecified, NULL, kATSOptionFlagsDefault, - &aATSFontContainer ); -#endif if( eStatus != noErr ) return false; @@ -541,21 +529,9 @@ bool AquaSalGraphics::AddTempDevFont( ImplDevFontList*, ATSFontContainerRef oContainer; const ATSFontContext eContext = kATSFontContextLocal; // TODO: *Global??? -#if defined(MAC_OS_X_VERSION_10_5) && (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5) eStatus = ::ATSFontActivateFromFileReference( &aNewRef, eContext, kATSFontFormatUnspecified, NULL, kATSOptionFlagsDefault, &oContainer ); -#else - FSSpec aFontFSSpec; - eStatus = ::FSGetCatalogInfo( &aNewRef, kFSCatInfoNone, - NULL, NULL, &aFontFSSpec, NULL ); - if( eStatus != noErr ) - return false; - - eStatus = ::ATSFontActivateFromFileSpecification( &aFontFSSpec, - eContext, kATSFontFormatUnspecified, NULL, kATSOptionFlagsDefault, - &oContainer ); -#endif if( eStatus != noErr ) return false; |