diff options
21 files changed, 23 insertions, 242 deletions
diff --git a/apple_remote/inc/apple_remote/RemoteControl.h b/apple_remote/inc/apple_remote/RemoteControl.h index cffc631ad499..6e2c67765890 100644 --- a/apple_remote/inc/apple_remote/RemoteControl.h +++ b/apple_remote/inc/apple_remote/RemoteControl.h @@ -29,16 +29,6 @@ * *****************************************************************************/ -#ifndef DID_DEFINE_SOME_FUTURE_TYPES -#import <Foundation/NSObjCRuntime.h> -#if defined (NSFoundationVersionNumber10_5) && MAC_OS_X_VERSION_MAX_ALLOWED < 1050 -@class CALayer; -@class NSViewController; -typedef int NSColorRenderingIntent; -#define DID_DEFINE_SOME_FUTURE_TYPES -#endif -#endif - #import <Cocoa/Cocoa.h> // notifaction names that are being used to signal that an application wants to diff --git a/apple_remote/inc/apple_remote/RemoteMainController.h b/apple_remote/inc/apple_remote/RemoteMainController.h index 49498779fc14..5fde4639c155 100644 --- a/apple_remote/inc/apple_remote/RemoteMainController.h +++ b/apple_remote/inc/apple_remote/RemoteMainController.h @@ -29,16 +29,6 @@ * *****************************************************************************/ -#ifndef DID_DEFINE_SOME_FUTURE_TYPES -#import <Foundation/NSObjCRuntime.h> -#if defined (NSFoundationVersionNumber10_5) && MAC_OS_X_VERSION_MAX_ALLOWED < 1050 -@class CALayer; -@class NSViewController; -typedef int NSColorRenderingIntent; -#define DID_DEFINE_SOME_FUTURE_TYPES -#endif -#endif - #import <Cocoa/Cocoa.h> #define AppleRemoteControlEvent 15 diff --git a/apple_remote/source/AppleRemote.h b/apple_remote/source/AppleRemote.h index 692a1a61172e..0e4187f8a638 100644 --- a/apple_remote/source/AppleRemote.h +++ b/apple_remote/source/AppleRemote.h @@ -29,17 +29,8 @@ * *****************************************************************************/ -#ifndef DID_DEFINE_SOME_FUTURE_TYPES -#import <Foundation/NSObjCRuntime.h> -#if defined (NSFoundationVersionNumber10_5) && MAC_OS_X_VERSION_MAX_ALLOWED < 1050 -@class CALayer; -@class NSViewController; -typedef int NSColorRenderingIntent; -#define DID_DEFINE_SOME_FUTURE_TYPES -#endif -#endif - #import <Cocoa/Cocoa.h> + #import "HIDRemoteControlDevice.h" /* Interacts with the Apple Remote Control HID device diff --git a/apple_remote/source/AppleRemote.m b/apple_remote/source/AppleRemote.m index c1a87c3f226e..d72997d2e04e 100644 --- a/apple_remote/source/AppleRemote.m +++ b/apple_remote/source/AppleRemote.m @@ -39,14 +39,6 @@ const char* AppleRemoteDeviceName = "AppleIRController"; -// the WWDC 07 Leopard Build is missing the constant -#ifndef NSAppKitVersionNumber10_4 - #define NSAppKitVersionNumber10_4 824 -#endif -#ifndef NSAppKitVersionNumber10_5 - #define NSAppKitVersionNumber10_5 949 -#endif - @implementation AppleRemote + (const char*) remoteControlDeviceName { @@ -56,60 +48,24 @@ const char* AppleRemoteDeviceName = "AppleIRController"; - (void) setCookieMappingInDictionary: (NSMutableDictionary*) _cookieToButtonMapping { // TODO : avoid such magics - if (floor(NSAppKitVersionNumber) <= NSAppKitVersionNumber10_4) { - #ifdef DEBUG - NSLog( @"setting 10.4 cookies" ); - #endif - // 10.4.x Tiger - [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlus] forKey:@"14_12_11_6_"]; - [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMinus] forKey:@"14_13_11_6_"]; - [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMenu] forKey:@"14_7_6_14_7_6_"]; - [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay] forKey:@"14_8_6_14_8_6_"]; - [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonRight] forKey:@"14_9_6_14_9_6_"]; - [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonLeft] forKey:@"14_10_6_14_10_6_"]; - [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonRight_Hold] forKey:@"14_6_4_2_"]; - [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonLeft_Hold] forKey:@"14_6_3_2_"]; - [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMenu_Hold] forKey:@"14_6_14_6_"]; - [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay_Hold] forKey:@"18_14_6_18_14_6_"]; - [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteControl_Switched] forKey:@"19_"]; - } else if( floor(NSAppKitVersionNumber) <= NSAppKitVersionNumber10_5 ) { - #ifdef DEBUG - NSLog( @"setting 10.5 cookies" ); - #endif - // 10.5.x Leopard - [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlus] forKey:@"31_29_28_19_18_"]; - [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMinus] forKey:@"31_30_28_19_18_"]; - [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMenu] forKey:@"31_20_19_18_31_20_19_18_"]; - [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay] forKey:@"31_21_19_18_31_21_19_18_"]; - [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonRight] forKey:@"31_22_19_18_31_22_19_18_"]; - [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonLeft] forKey:@"31_23_19_18_31_23_19_18_"]; - [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonRight_Hold] forKey:@"31_19_18_4_2_"]; - [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonLeft_Hold] forKey:@"31_19_18_3_2_"]; - [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMenu_Hold] forKey:@"31_19_18_31_19_18_"]; - [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay_Hold] forKey:@"35_31_19_18_35_31_19_18_"]; - [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteControl_Switched] forKey:@"19_"]; - } - else - { - #ifdef DEBUG - NSLog( @"setting 10.6 cookies" ); - #endif - // 10.6.x Snow Leopard - [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlus] forKey:@"33_31_30_21_20_2_"]; - [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMinus] forKey:@"33_32_30_21_20_2_"]; - [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMenu] forKey:@"33_22_21_20_2_33_22_21_20_2_"]; - [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay] forKey:@"33_23_21_20_2_33_23_21_20_2_"]; - [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonRight] forKey:@"33_24_21_20_2_33_24_21_20_2_"]; - [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonLeft] forKey:@"33_25_21_20_2_33_25_21_20_2_"]; - [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonRight_Hold] forKey:@"33_21_20_14_12_2_"]; - [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonLeft_Hold] forKey:@"33_21_20_13_12_2_"]; - [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMenu_Hold] forKey:@"33_21_20_2_33_21_20_2_"]; - [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay_Hold] forKey:@"37_33_21_20_2_37_33_21_20_2_"]; - [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteControl_Switched] forKey:@"19_"]; - [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kMetallicRemote2009ButtonPlay] forKey:@"33_21_20_8_2_33_21_20_8_2_"]; - [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kMetallicRemote2009ButtonMiddlePlay] forKey:@"33_21_20_3_2_33_21_20_3_2_"]; - [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteControl_Switched] forKey:@"19_"]; - } +#ifdef DEBUG + NSLog( @"setting 10.6 cookies" ); +#endif + // 10.6.x Snow Leopard + [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlus] forKey:@"33_31_30_21_20_2_"]; + [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMinus] forKey:@"33_32_30_21_20_2_"]; + [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMenu] forKey:@"33_22_21_20_2_33_22_21_20_2_"]; + [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay] forKey:@"33_23_21_20_2_33_23_21_20_2_"]; + [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonRight] forKey:@"33_24_21_20_2_33_24_21_20_2_"]; + [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonLeft] forKey:@"33_25_21_20_2_33_25_21_20_2_"]; + [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonRight_Hold] forKey:@"33_21_20_14_12_2_"]; + [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonLeft_Hold] forKey:@"33_21_20_13_12_2_"]; + [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMenu_Hold] forKey:@"33_21_20_2_33_21_20_2_"]; + [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay_Hold] forKey:@"37_33_21_20_2_37_33_21_20_2_"]; + [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteControl_Switched] forKey:@"19_"]; + [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kMetallicRemote2009ButtonPlay] forKey:@"33_21_20_8_2_33_21_20_8_2_"]; + [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kMetallicRemote2009ButtonMiddlePlay] forKey:@"33_21_20_3_2_33_21_20_3_2_"]; + [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteControl_Switched] forKey:@"19_"]; } - (void) sendRemoteButtonEvent: (RemoteControlEventIdentifier) event pressedDown: (BOOL) pressedDown { diff --git a/apple_remote/source/KeyspanFrontRowControl.h b/apple_remote/source/KeyspanFrontRowControl.h index d313ab04ce84..c75e86b08629 100644 --- a/apple_remote/source/KeyspanFrontRowControl.h +++ b/apple_remote/source/KeyspanFrontRowControl.h @@ -29,18 +29,8 @@ * *****************************************************************************/ - -#ifndef DID_DEFINE_SOME_FUTURE_TYPES -#import <Foundation/NSObjCRuntime.h> -#if defined (NSFoundationVersionNumber10_5) && MAC_OS_X_VERSION_MAX_ALLOWED < 1050 -@class CALayer; -@class NSViewController; -typedef int NSColorRenderingIntent; -#define DID_DEFINE_SOME_FUTURE_TYPES -#endif -#endif - #import <Cocoa/Cocoa.h> + #import "HIDRemoteControlDevice.h" /* Interacts with the Keyspan FrontRow Remote Control HID device diff --git a/extensions/source/macosx/spotlight/GetMetadataForFile.m b/extensions/source/macosx/spotlight/GetMetadataForFile.m index 9026e085f6b9..82f897745c85 100644 --- a/extensions/source/macosx/spotlight/GetMetadataForFile.m +++ b/extensions/source/macosx/spotlight/GetMetadataForFile.m @@ -17,21 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#import <Foundation/NSObjCRuntime.h> -#if defined (NSFoundationVersionNumber10_5) && MAC_OS_X_VERSION_MAX_ALLOWED < 1050 -@class CALayer; -@class NSViewController; -typedef int NSColorRenderingIntent; -#endif - #include <CoreFoundation/CoreFoundation.h> #include <CoreServices/CoreServices.h> #include <Foundation/Foundation.h> - #import "OOoSpotlightImporter.h" - /* ----------------------------------------------------------------------------- Get metadata attributes from file diff --git a/extensions/source/macosx/spotlight/OOoContentDataParser.h b/extensions/source/macosx/spotlight/OOoContentDataParser.h index f642651e9bff..7112497cf7de 100644 --- a/extensions/source/macosx/spotlight/OOoContentDataParser.h +++ b/extensions/source/macosx/spotlight/OOoContentDataParser.h @@ -19,7 +19,6 @@ #import <Cocoa/Cocoa.h> - @interface OOoContentDataParser : NSObject { // indicates if we are interested in an element's content BOOL shouldReadCharacters; diff --git a/extensions/source/macosx/spotlight/OOoContentDataParser.m b/extensions/source/macosx/spotlight/OOoContentDataParser.m index b711e422cd38..8c8d81f89d03 100644 --- a/extensions/source/macosx/spotlight/OOoContentDataParser.m +++ b/extensions/source/macosx/spotlight/OOoContentDataParser.m @@ -18,12 +18,6 @@ */ #include <objc/objc-runtime.h> -#import <Foundation/NSObjCRuntime.h> -#if defined (NSFoundationVersionNumber10_5) && MAC_OS_X_VERSION_MAX_ALLOWED < 1050 -@class CALayer; -@class NSViewController; -typedef int NSColorRenderingIntent; -#endif #import "OOoContentDataParser.h" diff --git a/extensions/source/macosx/spotlight/OOoMetaDataParser.m b/extensions/source/macosx/spotlight/OOoMetaDataParser.m index bc9529dfeb3a..a6ce40ac1368 100644 --- a/extensions/source/macosx/spotlight/OOoMetaDataParser.m +++ b/extensions/source/macosx/spotlight/OOoMetaDataParser.m @@ -18,12 +18,6 @@ */ #include <objc/objc-runtime.h> -#import <Foundation/NSObjCRuntime.h> -#if defined (NSFoundationVersionNumber10_5) && MAC_OS_X_VERSION_MAX_ALLOWED < 1050 -@class CALayer; -@class NSViewController; -typedef int NSColorRenderingIntent; -#endif #import "OOoMetaDataParser.h" diff --git a/extensions/source/macosx/spotlight/OOoSpotlightImporter.m b/extensions/source/macosx/spotlight/OOoSpotlightImporter.m index 15cafe5b8406..6302e95c7380 100644 --- a/extensions/source/macosx/spotlight/OOoSpotlightImporter.m +++ b/extensions/source/macosx/spotlight/OOoSpotlightImporter.m @@ -17,14 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#import <Foundation/NSObjCRuntime.h> -#if defined (NSFoundationVersionNumber10_5) && MAC_OS_X_VERSION_MAX_ALLOWED < 1050 -@class CALayer; -@class NSViewController; -typedef int NSColorRenderingIntent; -#endif - #import <zlib.h> + #import "OOoSpotlightImporter.h" #import "OOoMetaDataParser.h" #import "OOoContentDataParser.h" diff --git a/nss/ExternalProject_nss.mk b/nss/ExternalProject_nss.mk index 46ced7c4aebc..82bf7d49683d 100644 --- a/nss/ExternalProject_nss.mk +++ b/nss/ExternalProject_nss.mk @@ -72,7 +72,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalProject $(call gb_ExternalProject_run,build,\ $(if $(filter FREEBSD LINUX MACOSX,$(OS)),$(if $(filter X,$(CPU)),USE_64=1)) \ $(if $(filter MACOSX,$(OS)),MACOS_SDK_DIR=$(MACOSX_SDK_PATH) \ - $(if $(filter 1060 1070 1080,$(MAC_OS_X_VERSION_MIN_REQUIRED)),NSS_USE_SYSTEM_SQLITE=1)) \ + NSS_USE_SYSTEM_SQLITE=1) \ $(if $(filter SOLARIS,$(OS)),NS_USE_GCC=1) \ $(if $(filter YES,$(CROSS_COMPILING)),\ NSINSTALL="$(call gb_ExternalExecutable_get_command,python) $(SRCDIR)/nss/nsinstall.py") \ diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index ef6db5dd5ee6..ea3a7d9efb12 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -1213,20 +1213,6 @@ SPECIAL_LIB_FILE(gid_File_Lib_Softokn3,softokn3) SPECIAL_LIB_FILE(gid_File_Lib_Smime3,smime3) #ifdef WNT SPECIAL_LIB_FILE(gid_File_Lib_Sqlite3,sqlite3) -#else -/* - For MacOSX >= 10.6 we can apparently use the system sqlite. - - For MacOSX 10.4 we've delivered sqlite into a sqlite subdir for the duration - of the build to avoid #i106132#. Now we need to put it into the program dir of - the install. -*/ -#if !defined(MACOSX) || (MAC_OS_X_VERSION_MIN_REQUIRED < 1060) -File gid_File_Lib_Sqlite3 - Name = "sqlite/" SPECIAL_NAME(sqlite3); - PACKED_LIB_FILE_BODY; -End -#endif //!defined(MACOSX) || (MAC_OS_X_VERSION_MIN_REQUIRED < 1060) #endif //WNT SPECIAL_LIB_FILE(gid_File_Lib_Ssl3,ssl3) #endif //SYSTEM_NSS diff --git a/slideshow/source/engine/OGLTrans/mac/OGLTrans_Shaders.m b/slideshow/source/engine/OGLTrans/mac/OGLTrans_Shaders.m index e3abc2fb8a0b..339c36cdcf63 100644 --- a/slideshow/source/engine/OGLTrans/mac/OGLTrans_Shaders.m +++ b/slideshow/source/engine/OGLTrans/mac/OGLTrans_Shaders.m @@ -26,16 +26,8 @@ * ************************************************************************/ -#import <Foundation/NSObjCRuntime.h> -#if defined (NSFoundationVersionNumber10_5) && MAC_OS_X_VERSION_MAX_ALLOWED < 1050 -@class CALayer; -@class NSViewController; -typedef int NSColorRenderingIntent; -#endif - #import "OGLTrans_Shaders.h" - @implementation OGLShaders - (id) init diff --git a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.mm b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.mm index 0d7fcbb5a514..a0c195b514ff 100644 --- a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.mm +++ b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.mm @@ -26,13 +26,6 @@ * ************************************************************************/ -#import <Foundation/NSObjCRuntime.h> -#if defined (NSFoundationVersionNumber10_5) && MAC_OS_X_VERSION_MAX_ALLOWED < 1050 -@class CALayer; -@class NSViewController; -typedef int NSColorRenderingIntent; -#endif - #include "OGLTrans_TransitionImpl.hxx" #include "OGLTrans_Shaders.h" #include <OpenGL/gl.h> diff --git a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm index 1a55e41b4050..d2421a359f12 100644 --- a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm +++ b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm @@ -205,19 +205,11 @@ private: /** OpenGL handle to the leaving slide's texture */ -#if defined(MAC_OS_X_VERSION_10_5) || defined(MAC_OS_X_VERSION_10_6) GLuint GLleavingSlide; -#else /* build target 10.4 */ - unsigned long int GLleavingSlide; -#endif /** OpenGL handle to the entering slide's texture */ -#if defined(MAC_OS_X_VERSION_10_5) || defined(MAC_OS_X_VERSION_10_6) GLuint GLenteringSlide; -#else /* build target 10.4 */ - unsigned long int GLenteringSlide; -#endif /** pointer to our window which we MIGHT create. */ @@ -782,11 +774,7 @@ void SAL_CALL OGLTransitionerImpl::update( double nTime ) throw (uno::RuntimeExc static_cast<double>(GLWin.Height) ); */ // works but not mandatory -#if defined(MAC_OS_X_VERSION_10_5) GLint swapInt = 1; -#else /* build target 10.4 */ - long swapInt = 1; -#endif [[GLWin.pAquaOpenGLView openGLContext] setValues:&swapInt forParameter:NSOpenGLCPSwapInterval]; // set to vbl sync NSOpenGLContext* context = [GLWin.pAquaOpenGLView openGLContext]; diff --git a/slideshow/source/engine/OGLTrans/mac/aquaOpenGLView.m b/slideshow/source/engine/OGLTrans/mac/aquaOpenGLView.m index 3dd2fa00082d..afdfc9b23e30 100644 --- a/slideshow/source/engine/OGLTrans/mac/aquaOpenGLView.m +++ b/slideshow/source/engine/OGLTrans/mac/aquaOpenGLView.m @@ -3,13 +3,6 @@ * aquaOpenGLView.m */ -#import <Foundation/NSObjCRuntime.h> -#if defined (NSFoundationVersionNumber10_5) && MAC_OS_X_VERSION_MAX_ALLOWED < 1050 -@class CALayer; -@class NSViewController; -typedef int NSColorRenderingIntent; -#endif - #include <Cocoa/Cocoa.h> #include <OpenGL/OpenGL.h> #include <OpenGL/gl.h> @@ -81,12 +74,7 @@ typedef int NSColorRenderingIntent; - (void)prepareOpenGL { // for overriding to initialize OpenGL state, occurs after context creation -#if MACOSX_SDK_VERSION < 1050 - long swapInt = 1; -#else GLint swapInt = 1; -#endif - [[self openGLContext] setValues:&swapInt forParameter:NSOpenGLCPSwapInterval]; // set to vbl sync diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index 4eabc920e021..970d6bdc26e8 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -88,7 +88,6 @@ gb_OBJCXXFLAGS := -x objective-c++ -fobjc-exceptions gb_OBJCFLAGS := -x objective-c -fobjc-exceptions gb_LinkTarget_LDFLAGS := \ - $(if $(filter 1040 1050,$(MAC_OS_X_VERSION_MIN_REQUIRED)),-Wl$(COMMA)-syslibroot$(COMMA)$(gb_SDKDIR)) \ $(SOLARLIB) \ #man ld says: obsolete -Wl,-multiply_defined,suppress \ diff --git a/solenv/inc/premac.h b/solenv/inc/premac.h index f4993f99e46a..f6e37475795f 100644 --- a/solenv/inc/premac.h +++ b/solenv/inc/premac.h @@ -47,19 +47,4 @@ #define StringPtr MacOSStringPtr #define TimeValue MacOSTimeValue -#ifdef __OBJC__ -#import <Foundation/NSObjCRuntime.h> -#if defined (NSFoundationVersionNumber10_5) && MAC_OS_X_VERSION_MAX_ALLOWED < 1050 -@class CALayer; -@class NSViewController; -typedef int NSColorRenderingIntent; -#endif -#endif - -#if defined(MACOSX_SDK_VERSION) && MACOSX_SDK_VERSION < 1050 -typedef float CGFloat; -typedef int NSInteger; -typedef unsigned NSUInteger; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ 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; |