diff --git a/lcl/interfaces/carbon/carbonproc.pp b/lcl/interfaces/carbon/carbonproc.pp index 26735dc2e9..2020da16ca 100644 --- a/lcl/interfaces/carbon/carbonproc.pp +++ b/lcl/interfaces/carbon/carbonproc.pp @@ -1340,7 +1340,7 @@ var sz : SInt16; begin //Note: the GetThemeFont is deprecated in 10.5. CoreText functions should be used! - MacOSAll.GetThemeFont(kThemeSystemFont, GetApplicationScript, @s, sz{%H-{%H-}}, st); + MacOSAll.GetThemeFont(kThemeSystemFont, GetApplicationScript, @s, sz{%H-}, st{%H-}); CarbonDefaultFont := s; CarbonDefaultFontSize := sz; end; diff --git a/lcl/interfaces/carbon/pascocoa/appkit/NSApplication.inc b/lcl/interfaces/carbon/pascocoa/appkit/NSApplication.inc index c445fb0c6d..62894254e6 100644 --- a/lcl/interfaces/carbon/pascocoa/appkit/NSApplication.inc +++ b/lcl/interfaces/carbon/pascocoa/appkit/NSApplication.inc @@ -69,7 +69,7 @@ type NSPrintingSuccess = 1, NSPrintingFailure = 3, NSPrintingReplyLater = 2 - ); + {%H-}); { An Application's startup function } @@ -461,17 +461,17 @@ end; function NSApplication.isActive: LongBool; begin - Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSApplication_isActive)), [])); + Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSApplication_isActive)), [])); end; function NSApplication.isHidden: LongBool; begin - Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSApplication_isHidden)), [])); + Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSApplication_isHidden)), [])); end; function NSApplication.isRunning: LongBool; begin - Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSApplication_isRunning)), [])); + Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSApplication_isRunning)), [])); end; procedure NSApplication.deactivate; diff --git a/lcl/interfaces/carbon/pascocoa/appkit/NSButtonCell.inc b/lcl/interfaces/carbon/pascocoa/appkit/NSButtonCell.inc index b0e8199a95..8eb4eaaf3e 100644 --- a/lcl/interfaces/carbon/pascocoa/appkit/NSButtonCell.inc +++ b/lcl/interfaces/carbon/pascocoa/appkit/NSButtonCell.inc @@ -28,7 +28,7 @@ type { These constants were accidentally reversed so that NSMomentaryPushButton lit and NSMomentaryLight pushed. These names are now deprecated } - NSMomentaryPushButton = 0, + NSMomentaryPushButton = 0{%H-}, NSMomentaryLight = 7 ); @@ -60,7 +60,7 @@ type NSSmallIconButtonBezelStyle = 2 - ); + {%H-}); _BCFlags = record {$ifdef __BIG_ENDIAN__} diff --git a/lcl/interfaces/carbon/pascocoa/appkit/NSGraphics.inc b/lcl/interfaces/carbon/pascocoa/appkit/NSGraphics.inc index be0369024c..9018195b16 100644 --- a/lcl/interfaces/carbon/pascocoa/appkit/NSGraphics.inc +++ b/lcl/interfaces/carbon/pascocoa/appkit/NSGraphics.inc @@ -50,7 +50,7 @@ type type NSWindowOrderingMode = ( NSWindowAbove = 1, - NSWindowBelow = 1, + NSWindowBelow = 1{%H-}, NSWindowOut = 0 ); diff --git a/lcl/interfaces/carbon/pascocoa/appkit/NSGraphicsContext.inc b/lcl/interfaces/carbon/pascocoa/appkit/NSGraphicsContext.inc index 40df0c7089..2c60071d92 100644 --- a/lcl/interfaces/carbon/pascocoa/appkit/NSGraphicsContext.inc +++ b/lcl/interfaces/carbon/pascocoa/appkit/NSGraphicsContext.inc @@ -229,7 +229,7 @@ end; class function NSGraphicsContext.currentContextDrawingToScreen: LongBool; begin - Result := LongBool(objc_msgSend(getClass, sel_registerName(PChar(StrNSGraphicsContext_currentContextDrawingToScreen)), [])); + Result := {%H-}LongBool(objc_msgSend(getClass, sel_registerName(PChar(StrNSGraphicsContext_currentContextDrawingToScreen)), [])); end; class procedure NSGraphicsContext.saveGraphicsState_; @@ -259,7 +259,7 @@ end; function NSGraphicsContext.isDrawingToScreen: LongBool; begin - Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSGraphicsContext_isDrawingToScreen)), [])); + Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSGraphicsContext_isDrawingToScreen)), [])); end; procedure NSGraphicsContext.saveGraphicsState; @@ -300,7 +300,7 @@ end; {.$ifdef MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4} function NSGraphicsContext.isFlipped: LongBool; begin - Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSGraphicsContext_isFlipped)), [])); + Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSGraphicsContext_isFlipped)), [])); end; {.$endif} @@ -316,7 +316,7 @@ end; function NSGraphicsContext.shouldAntialias: LongBool; begin - Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSGraphicsContext_shouldAntialias)), [])); + Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSGraphicsContext_shouldAntialias)), [])); end; procedure NSGraphicsContext.setImageInterpolation(_interpolation: NSImageInterpolation); diff --git a/lcl/interfaces/carbon/pascocoa/appkit/NSText.inc b/lcl/interfaces/carbon/pascocoa/appkit/NSText.inc index d6fcdeb7c0..411f62e5dd 100644 --- a/lcl/interfaces/carbon/pascocoa/appkit/NSText.inc +++ b/lcl/interfaces/carbon/pascocoa/appkit/NSText.inc @@ -39,7 +39,7 @@ type type NSWritingDirection = ( NSWritingDirectionNatural = 1, - NSWritingDirectionLeftToRight = 0, + NSWritingDirectionLeftToRight = 0{%H-}, NSWritingDirectionRightToLeft ); diff --git a/lcl/interfaces/carbon/pascocoa/foundation/NSArray.inc b/lcl/interfaces/carbon/pascocoa/foundation/NSArray.inc index bab41004d3..c685bcdba9 100644 --- a/lcl/interfaces/carbon/pascocoa/foundation/NSArray.inc +++ b/lcl/interfaces/carbon/pascocoa/foundation/NSArray.inc @@ -211,7 +211,7 @@ end; function NSArray.count: LongWord; begin - Result := LongWord(objc_msgSend(Handle, sel_registerName(PChar(StrNSArray_count)), [])); + Result := {%H-}LongWord(objc_msgSend(Handle, sel_registerName(PChar(StrNSArray_count)), [])); end; function NSArray.objectAtIndex(__index: LongWord): lobjc.id; diff --git a/lcl/interfaces/carbon/pascocoa/foundation/NSAttributedString.inc b/lcl/interfaces/carbon/pascocoa/foundation/NSAttributedString.inc index 9a3ccada26..1befc3a84d 100644 --- a/lcl/interfaces/carbon/pascocoa/foundation/NSAttributedString.inc +++ b/lcl/interfaces/carbon/pascocoa/foundation/NSAttributedString.inc @@ -127,7 +127,7 @@ end; function NSAttributedString.length: LongWord; begin - Result := LongWord(objc_msgSend(Handle, sel_registerName(PChar(StrNSAttributedString_length)), [])); + Result := {%H-}LongWord(objc_msgSend(Handle, sel_registerName(PChar(StrNSAttributedString_length)), [])); end; function NSAttributedString.attribute_atIndex_effectiveRange(_attrName: CFStringRef; _location: LongWord; _range: NSRangePointer): lobjc.id; diff --git a/lcl/interfaces/carbon/pascocoa/foundation/NSBundle.inc b/lcl/interfaces/carbon/pascocoa/foundation/NSBundle.inc index 935ef0f030..2176abf0cf 100644 --- a/lcl/interfaces/carbon/pascocoa/foundation/NSBundle.inc +++ b/lcl/interfaces/carbon/pascocoa/foundation/NSBundle.inc @@ -207,13 +207,13 @@ end; function NSBundle.load: LongBool; begin - Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSBundle_load)), [])); + Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSBundle_load)), [])); end; {.$ifdef MAC_OS_X_VERSION_10_2 <= MAC_OS_X_VERSION_MAX_ALLOWED} function NSBundle.isLoaded: LongBool; begin - Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSBundle_isLoaded)), [])); + Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSBundle_isLoaded)), [])); end; {.$endif} diff --git a/lcl/interfaces/carbon/pascocoa/foundation/NSData.inc b/lcl/interfaces/carbon/pascocoa/foundation/NSData.inc index 9be4376a28..30dc84acdd 100644 --- a/lcl/interfaces/carbon/pascocoa/foundation/NSData.inc +++ b/lcl/interfaces/carbon/pascocoa/foundation/NSData.inc @@ -161,7 +161,7 @@ end; function NSData.length: LongWord; begin - Result := LongWord(objc_msgSend(Handle, sel_registerName(PChar(StrNSData_length)), [])); + Result := {%H-}LongWord(objc_msgSend(Handle, sel_registerName(PChar(StrNSData_length)), [])); end; function NSData.bytes: Pointer; diff --git a/lcl/interfaces/carbon/pascocoa/foundation/NSDictionary.inc b/lcl/interfaces/carbon/pascocoa/foundation/NSDictionary.inc index 344a966cd3..8f8e1958d5 100644 --- a/lcl/interfaces/carbon/pascocoa/foundation/NSDictionary.inc +++ b/lcl/interfaces/carbon/pascocoa/foundation/NSDictionary.inc @@ -141,7 +141,7 @@ end; function NSDictionary.count: LongWord; begin - Result := LongWord(objc_msgSend(Handle, sel_registerName(PChar(StrNSDictionary_count)), [])); + Result := {%H-}LongWord(objc_msgSend(Handle, sel_registerName(PChar(StrNSDictionary_count)), [])); end; function NSDictionary.keyEnumerator: lobjc.id; diff --git a/lcl/interfaces/carbon/pascocoa/foundation/NSObject.inc b/lcl/interfaces/carbon/pascocoa/foundation/NSObject.inc index 5c76ab82b6..5708349412 100644 --- a/lcl/interfaces/carbon/pascocoa/foundation/NSObject.inc +++ b/lcl/interfaces/carbon/pascocoa/foundation/NSObject.inc @@ -297,7 +297,7 @@ end; function NSObject.version: PtrInt; begin - Result := PtrInt(objc_msgSend(Handle, sel_registerName(PChar(Str_version)), [])); + Result := {%H-}PtrInt(objc_msgSend(Handle, sel_registerName(PChar(Str_version)), [])); end; procedure NSObject.setVersion(aVersion: PtrInt); diff --git a/lcl/interfaces/carbon/pascocoa/foundation/NSString.inc b/lcl/interfaces/carbon/pascocoa/foundation/NSString.inc index d5a261d0bb..a519e2ed6d 100644 --- a/lcl/interfaces/carbon/pascocoa/foundation/NSString.inc +++ b/lcl/interfaces/carbon/pascocoa/foundation/NSString.inc @@ -374,9 +374,9 @@ const StrNSString_initWithUTF8String = 'initWithUTF8String:'; StrNSString_initWithString = 'initWithString:'; StrNSString_initWithFormat = 'initWithFormat:'; - StrNSString_initWithFormat_arguments = 'initWithFormat:arguments:'; + {%H-}StrNSString_initWithFormat_arguments = 'initWithFormat:arguments:'; StrNSString_initWithFormat_locale = 'initWithFormat:locale:'; - StrNSString_initWithFormat_locale_arguments = 'initWithFormat:locale:arguments:'; + {%H-}StrNSString_initWithFormat_locale_arguments = 'initWithFormat:locale:arguments:'; StrNSString_initWithData_encoding = 'initWithData:encoding:'; StrNSString_initWithBytes_length_encoding = 'initWithBytes:length:encoding:'; StrNSString_initWithBytesNoCopy_length_encoding_freeWhenDone = 'initWithBytesNoCopy:length:encoding:freeWhenDone:'; @@ -445,7 +445,7 @@ end; function NSString.length: LongWord; begin - Result := LongWord(objc_msgSend(Handle, sel_registerName(PChar(StrNSString_length)), [])); + Result := {%H-}LongWord(objc_msgSend(Handle, sel_registerName(PChar(StrNSString_length)), [])); end; function NSString.characterAtIndex(__index: LongWord): unichar; @@ -710,7 +710,7 @@ end; function NSString.intValue: Integer; begin - Result := Integer(objc_msgSend(Handle, sel_registerName(PChar(StrNSString_intValue)), [])); + Result := {%H-}Integer(objc_msgSend(Handle, sel_registerName(PChar(StrNSString_intValue)), [])); end; function NSString.componentsSeparatedByString(_separator: CFStringRef): CFArrayRef; @@ -819,17 +819,17 @@ end; function NSString.hash: LongWord; begin - Result := LongWord(objc_msgSend(Handle, sel_registerName(PChar(StrNSString_hash)), [])); + Result := {%H-}LongWord(objc_msgSend(Handle, sel_registerName(PChar(StrNSString_hash)), [])); end; function NSString.fastestEncoding: NSStringEncoding; begin - Result := NSStringEncoding(objc_msgSend(Handle, sel_registerName(PChar(StrNSString_fastestEncoding)), [])); + Result := {%H-}NSStringEncoding(objc_msgSend(Handle, sel_registerName(PChar(StrNSString_fastestEncoding)), [])); end; function NSString.smallestEncoding: NSStringEncoding; begin - Result := NSStringEncoding(objc_msgSend(Handle, sel_registerName(PChar(StrNSString_smallestEncoding)), [])); + Result := {%H-}NSStringEncoding(objc_msgSend(Handle, sel_registerName(PChar(StrNSString_smallestEncoding)), [])); end; function NSString.dataUsingEncoding_allowLossyConversion(_encoding: NSStringEncoding; _lossy: LongBool): CFDataRef; @@ -933,12 +933,12 @@ end; class function NSString.defaultCStringEncoding: NSStringEncoding; begin - Result := NSStringEncoding(objc_msgSend(getClass, sel_registerName(PChar(StrNSString_defaultCStringEncoding)), [])); + Result := {%H-}NSStringEncoding(objc_msgSend(getClass, sel_registerName(PChar(StrNSString_defaultCStringEncoding)), [])); end; class function NSString.availableStringEncodings: NSStringEncoding; begin - Result := NSStringEncoding(objc_msgSend(getClass, sel_registerName(PChar(StrNSString_availableStringEncodings)), [])); + Result := {%H-}NSStringEncoding(objc_msgSend(getClass, sel_registerName(PChar(StrNSString_availableStringEncodings)), [])); end; constructor NSString.localizedNameOfStringEncoding(_encoding: NSStringEncoding); @@ -1323,7 +1323,7 @@ end; function NSString.cStringLength: LongWord; begin - Result := LongWord(objc_msgSend(Handle, sel_registerName(PChar(StrNSString_cStringLength)), [])); + Result := {%H-}LongWord(objc_msgSend(Handle, sel_registerName(PChar(StrNSString_cStringLength)), [])); end; procedure NSString.getCString(_bytes: PChar); diff --git a/lcl/interfaces/carbon/pascocoa/foundation/NSValue.inc b/lcl/interfaces/carbon/pascocoa/foundation/NSValue.inc index c67132a6af..c53b326cca 100644 --- a/lcl/interfaces/carbon/pascocoa/foundation/NSValue.inc +++ b/lcl/interfaces/carbon/pascocoa/foundation/NSValue.inc @@ -284,22 +284,22 @@ end; function NSNumber.intValue: Integer; begin - Result := Integer(objc_msgSend(Handle, sel_registerName(PChar(StrNSNumber_intValue)), [])); + Result := {%H-}Integer(objc_msgSend(Handle, sel_registerName(PChar(StrNSNumber_intValue)), [])); end; function NSNumber.unsignedIntValue: LongWord; begin - Result := LongWord(objc_msgSend(Handle, sel_registerName(PChar(StrNSNumber_unsignedIntValue)), [])); + Result := {%H-}LongWord(objc_msgSend(Handle, sel_registerName(PChar(StrNSNumber_unsignedIntValue)), [])); end; function NSNumber.longValue: Integer; begin - Result := Integer(objc_msgSend(Handle, sel_registerName(PChar(StrNSNumber_longValue)), [])); + Result := {%H-}Integer(objc_msgSend(Handle, sel_registerName(PChar(StrNSNumber_longValue)), [])); end; function NSNumber.unsignedLongValue: LongWord; begin - Result := LongWord(objc_msgSend(Handle, sel_registerName(PChar(StrNSNumber_unsignedLongValue)), [])); + Result := {%H-}LongWord(objc_msgSend(Handle, sel_registerName(PChar(StrNSNumber_unsignedLongValue)), [])); end; function NSNumber.longLongValue: Int64; @@ -324,7 +324,7 @@ end; function NSNumber.boolValue: LongBool; begin - Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSNumber_boolValue)), [])); + Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSNumber_boolValue)), [])); end; function NSNumber.stringValue: CFStringRef;