diff options
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/aqua/source/gdi/atsui/salgdi.cxx | 24 | ||||
-rw-r--r-- | vcl/aqua/source/window/salframeview.mm | 4 | ||||
-rw-r--r-- | vcl/coretext/salcoretextfontutils.cxx | 13 |
3 files changed, 1 insertions, 40 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; diff --git a/vcl/aqua/source/window/salframeview.mm b/vcl/aqua/source/window/salframeview.mm index e05156e59859..d477b85c98bd 100644 --- a/vcl/aqua/source/window/salframeview.mm +++ b/vcl/aqua/source/window/salframeview.mm @@ -1587,11 +1587,7 @@ private: return 0; } -#if MACOSX_SDK_VERSION < 1050 -- (long)conversationIdentifier -#else - (NSInteger)conversationIdentifier -#endif { return (long)self; } diff --git a/vcl/coretext/salcoretextfontutils.cxx b/vcl/coretext/salcoretextfontutils.cxx index 15db6fb4812c..3bcfa2285585 100644 --- a/vcl/coretext/salcoretextfontutils.cxx +++ b/vcl/coretext/salcoretextfontutils.cxx @@ -45,17 +45,6 @@ static bool GetDevFontAttributes( CTFontDescriptorRef font_descriptor, ImplDevFo rDFA.mbDevice = true; rDFA.mnQuality = 0; -#if defined(MACOSX) && MAC_OS_X_VERSION_MIN_REQUIRED < 1060 - CTFontRef font = CTFontCreateWithFontDescriptor(font_descriptor, 0.0, NULL); - CFDataRef rHeadTable = CTFontCopyTable(font, kCTFontTableHead, kCTFontTableOptionNoOptions); - CFRelease(font); - if(!rHeadTable || CFDataGetLength(rHeadTable) == 0) - { - SafeCFRelease(rHeadTable); - return false; - } - CFRelease(rHeadTable); -#else CFNumberRef format = (CFNumberRef)CTFontDescriptorCopyAttribute(font_descriptor, kCTFontFormatAttribute); CFNumberGetValue(format, kCFNumberIntType, &value); CFRelease(format); @@ -65,7 +54,7 @@ static bool GetDevFontAttributes( CTFontDescriptorRef font_descriptor, ImplDevFo /* we don't want bitmap fonts */ return false; } -#endif + rDFA.mbSubsettable = true; rDFA.mbEmbeddable = false; |