paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-07 16:00:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

carbon: clean up

Browse Source 
git-svn-id: trunk@37012 -
This commit is contained in:
mattias 2012-04-24 13:18:32 +00:00
parent 13eb57d802
commit 87165c275c
14 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lcl/interfaces/carbon/carbonproc.pp
View File

@ -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;

8
lcl/interfaces/carbon/pascocoa/appkit/NSApplication.inc
View File

@ -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;

4
lcl/interfaces/carbon/pascocoa/appkit/NSButtonCell.inc
View File

@ -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__}

2
lcl/interfaces/carbon/pascocoa/appkit/NSGraphics.inc
View File

@ -50,7 +50,7 @@ type
type
NSWindowOrderingMode = (
NSWindowAbove = 1,
NSWindowBelow = 1,
NSWindowBelow = 1{%H-},
NSWindowOut = 0
);

8
lcl/interfaces/carbon/pascocoa/appkit/NSGraphicsContext.inc
View File

@ -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);

2
lcl/interfaces/carbon/pascocoa/appkit/NSText.inc
View File

@ -39,7 +39,7 @@ type
type
NSWritingDirection = (
NSWritingDirectionNatural = 1,
NSWritingDirectionLeftToRight = 0,
NSWritingDirectionLeftToRight = 0{%H-},
NSWritingDirectionRightToLeft
);

2
lcl/interfaces/carbon/pascocoa/foundation/NSArray.inc
View File

@ -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;

2
lcl/interfaces/carbon/pascocoa/foundation/NSAttributedString.inc
View File

@ -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;

4
lcl/interfaces/carbon/pascocoa/foundation/NSBundle.inc
View File

@ -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}

2
lcl/interfaces/carbon/pascocoa/foundation/NSData.inc
View File

@ -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;

2
lcl/interfaces/carbon/pascocoa/foundation/NSDictionary.inc
View File

@ -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;

2
lcl/interfaces/carbon/pascocoa/foundation/NSObject.inc
View File

@ -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);

20
lcl/interfaces/carbon/pascocoa/foundation/NSString.inc
View File

@ -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);

10
lcl/interfaces/carbon/pascocoa/foundation/NSValue.inc
View File

@ -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;