diff --git a/lcl/interfaces/cocoa/cocoabuttons.pas b/lcl/interfaces/cocoa/cocoabuttons.pas index c5df097b9f..40023ed995 100644 --- a/lcl/interfaces/cocoa/cocoabuttons.pas +++ b/lcl/interfaces/cocoa/cocoabuttons.pas @@ -69,7 +69,7 @@ type adjustFontToControlSize: Boolean; procedure dealloc; override; function initWithFrame(frameRect: NSRect): id; override; - function acceptsFirstResponder: Boolean; override; + function acceptsFirstResponder: LCLObjCBoolean; override; procedure drawRect(dirtyRect: NSRect); override; function lclGetCallback: ICommonCallback; override; procedure lclClearCallback; override; @@ -234,7 +234,7 @@ begin end; end; -function TCocoaButton.acceptsFirstResponder: Boolean; +function TCocoaButton.acceptsFirstResponder: LCLObjCBoolean; begin Result := True; end; diff --git a/lcl/interfaces/cocoa/cocoaint.pas b/lcl/interfaces/cocoa/cocoaint.pas index 60b81aba46..695e9bd7c1 100644 --- a/lcl/interfaces/cocoa/cocoaint.pas +++ b/lcl/interfaces/cocoa/cocoaint.pas @@ -68,10 +68,10 @@ type modals : NSMutableDictionary; procedure dealloc; override; - function isRunning: Boolean; override; + function isRunning: LCLObjCBoolean; override; procedure run; override; procedure sendEvent(theEvent: NSEvent); override; - function nextEventMatchingMask_untilDate_inMode_dequeue(mask: NSUInteger; expiration: NSDate; mode: NSString; deqFlag: Boolean): NSEvent; override; + function nextEventMatchingMask_untilDate_inMode_dequeue(mask: NSUInteger; expiration: NSDate; mode: NSString; deqFlag: LCLObjCBoolean): NSEvent; override; function runModalForWindow(theWindow: NSWindow): NSInteger; override; end; @@ -398,7 +398,7 @@ begin inherited dealloc; end; -function TCocoaApplication.isRunning: Boolean; +function TCocoaApplication.isRunning: LCLObjCBoolean; begin Result:=isrun; end; @@ -471,7 +471,7 @@ begin end; function TCocoaApplication.nextEventMatchingMask_untilDate_inMode_dequeue( - mask: NSUInteger; expiration: NSDate; mode: NSString; deqFlag: Boolean + mask: NSUInteger; expiration: NSDate; mode: NSString; deqFlag: LCLObjCBoolean ): NSEvent; var cb : ICommonCallback; diff --git a/lcl/interfaces/cocoa/cocoaprivate.pas b/lcl/interfaces/cocoa/cocoaprivate.pas index c11ffa77bc..321596ae3f 100644 --- a/lcl/interfaces/cocoa/cocoaprivate.pas +++ b/lcl/interfaces/cocoa/cocoaprivate.pas @@ -42,6 +42,20 @@ const SPINEDIT_EDIT_SPACING_FOR_SELECTION = 4; STATUSBAR_DEFAULT_HEIGHT = 18; +{$if (FPC_VERSION>3) or ((FPC_VERSION=3) and (FPC_RELEASE>=2))} +{$define HASBOOLEAN8} +{$endif} + +type + // Due to backwards incompatible changes in FPC sources + // (switching from Boolean to Boolean8), LCL has to adopt + // either type, depending on FPC version + LCLObjCBoolean = {$ifdef HASBOOLEAN8} + Boolean8 // FPC 3.2.0 and earlier are using "boolean8" type + {$else} + Boolean // FPC 3.0.4 and earlier are using "boolean" type + {$endif}; + type { ICommonCallback } @@ -186,13 +200,13 @@ type callback: ICommonCallback; auxMouseByParent: Boolean; procedure dealloc; override; - function acceptsFirstResponder: Boolean; override; + function acceptsFirstResponder: LCLObjCBoolean; override; procedure drawRect(dirtyRect: NSRect); override; function lclGetCallback: ICommonCallback; override; procedure lclClearCallback; override; function lclIsMouseInAuxArea(Event: NSevent): Boolean; override; // mouse - function acceptsFirstMouse(event: NSEvent): Boolean; override; + function acceptsFirstMouse(event: NSEvent): LCLObjCBoolean; override; procedure mouseDown(event: NSEvent); override; procedure mouseUp(event: NSEvent); override; procedure rightMouseDown(event: NSEvent); override; @@ -251,7 +265,7 @@ type TCocoaGroupBox = objcclass(NSBox) public callback: ICommonCallback; - function acceptsFirstResponder: Boolean; override; + function acceptsFirstResponder: LCLObjCBoolean; override; function lclGetCallback: ICommonCallback; override; procedure lclClearCallback; override; procedure resetCursorRects; override; @@ -270,14 +284,14 @@ type TCocoaProgressIndicator = objcclass(NSProgressIndicator) callback: ICommonCallback; - function acceptsFirstResponder: Boolean; override; + function acceptsFirstResponder: LCLObjCBoolean; override; function lclGetCallback: ICommonCallback; override; procedure lclClearCallback; override; procedure resetCursorRects; override; function lclGetFrameToLayoutDelta: TRect; override; procedure lclSetFrame(const r: TRect); override; // mouse - function acceptsFirstMouse(event: NSEvent): Boolean; override; + function acceptsFirstMouse(event: NSEvent): LCLObjCBoolean; override; procedure mouseDown(event: NSEvent); override; procedure mouseUp(event: NSEvent); override; procedure rightMouseDown(event: NSEvent); override; @@ -311,7 +325,7 @@ type procedure dealloc; override; procedure drawRect(dirtyRect: NSRect); override; - function acceptsFirstResponder: Boolean; override; + function acceptsFirstResponder: LCLObjCBoolean; override; function lclGetCallback: ICommonCallback; override; procedure lclClearCallback; override; procedure resetCursorRects; override; @@ -322,7 +336,7 @@ type procedure SnapToInteger(AExtraFactor: Integer = 0); message 'SnapToInteger:'; procedure sliderAction(sender: id); message 'sliderAction:'; // mouse - function acceptsFirstMouse(event: NSEvent): Boolean; override; + function acceptsFirstMouse(event: NSEvent): LCLObjCBoolean; override; procedure mouseDown(event: NSEvent); override; procedure mouseUp(event: NSEvent); override; procedure rightMouseDown(event: NSEvent); override; @@ -448,7 +462,7 @@ begin Result.Bottom := -4; end; -function TCocoaGroupBox.acceptsFirstResponder: Boolean; +function TCocoaGroupBox.acceptsFirstResponder: LCLObjCBoolean; begin Result := True; end; @@ -509,12 +523,12 @@ begin inherited dealloc; end; -function TCocoaCustomControl.acceptsFirstResponder: Boolean; +function TCocoaCustomControl.acceptsFirstResponder: LCLObjCBoolean; begin Result := True; end; -function TCocoaCustomControl.acceptsFirstMouse(event: NSEvent): Boolean; +function TCocoaCustomControl.acceptsFirstMouse(event: NSEvent): LCLObjCBoolean; begin // By default, a mouse-down event in a window that isn’t the key window // simply brings the window forward and makes it key; the event isn’t sent @@ -1167,7 +1181,7 @@ end; { TCocoaProgressIndicator } -function TCocoaProgressIndicator.acceptsFirstResponder: Boolean; +function TCocoaProgressIndicator.acceptsFirstResponder: LCLObjCBoolean; begin Result:=True; end; @@ -1212,7 +1226,7 @@ begin inherited lclSetFrame(r); end; -function TCocoaProgressIndicator.acceptsFirstMouse(event: NSEvent): Boolean; +function TCocoaProgressIndicator.acceptsFirstMouse(event: NSEvent): LCLObjCBoolean; begin Result:=true; end; @@ -1338,7 +1352,7 @@ begin inherited drawRect(dirtyRect); end; -function TCocoaSlider.acceptsFirstResponder: Boolean; +function TCocoaSlider.acceptsFirstResponder: LCLObjCBoolean; begin Result := True; end; @@ -1408,7 +1422,7 @@ begin end; end; -function TCocoaSlider.acceptsFirstMouse(event: NSEvent): Boolean; +function TCocoaSlider.acceptsFirstMouse(event: NSEvent): LCLObjCBoolean; begin Result:=true; end; diff --git a/lcl/interfaces/cocoa/cocoascrollers.pas b/lcl/interfaces/cocoa/cocoascrollers.pas index b2dd1336cf..01113044fa 100644 --- a/lcl/interfaces/cocoa/cocoascrollers.pas +++ b/lcl/interfaces/cocoa/cocoascrollers.pas @@ -44,7 +44,7 @@ type function initWithFrame(ns: NSRect): id; override; procedure dealloc; override; procedure setFrame(aframe: NSRect); override; - function acceptsFirstResponder: Boolean; override; + function acceptsFirstResponder: LCLObjCBoolean; override; function lclGetCallback: ICommonCallback; override; procedure lclClearCallback; override; procedure resetCursorRects; override; @@ -87,7 +87,7 @@ type function allocHorizontalScroller(avisible: Boolean): NSScroller; message 'allocHorizontalScroller:'; function allocVerticalScroller(avisible: Boolean): NSScroller; message 'allocVerticalScroller:'; // mouse - function acceptsFirstMouse(event: NSEvent): Boolean; override; + function acceptsFirstMouse(event: NSEvent): LCLObjCBoolean; override; procedure mouseDown(event: NSEvent); override; procedure mouseUp(event: NSEvent); override; procedure rightMouseDown(event: NSEvent); override; @@ -115,14 +115,14 @@ type procedure actionScrolling(sender: NSObject); message 'actionScrolling:'; function IsHorizontal: Boolean; message 'IsHorizontal'; - function acceptsFirstResponder: Boolean; override; + function acceptsFirstResponder: LCLObjCBoolean; override; function lclGetCallback: ICommonCallback; override; procedure lclClearCallback; override; procedure resetCursorRects; override; function lclPos: Integer; message 'lclPos'; procedure lclSetPos(aPos: integer); message 'lclSetPos:'; // mouse - function acceptsFirstMouse(event: NSEvent): Boolean; override; + function acceptsFirstMouse(event: NSEvent): LCLObjCBoolean; override; procedure mouseDown(event: NSEvent); override; procedure mouseUp(event: NSEvent); override; procedure rightMouseDown(event: NSEvent); override; @@ -553,7 +553,7 @@ begin end; end; -function TCocoaManualScrollView.acceptsFirstMouse(event: NSEvent): Boolean; +function TCocoaManualScrollView.acceptsFirstMouse(event: NSEvent): LCLObjCBoolean; begin Result:=true; end; @@ -789,7 +789,7 @@ begin end; end; -function TCocoaScrollView.acceptsFirstResponder: Boolean; +function TCocoaScrollView.acceptsFirstResponder: LCLObjCBoolean; begin Result := True; end; @@ -862,7 +862,7 @@ begin end; end; -function TCocoaScrollBar.acceptsFirstMouse(event: NSEvent): Boolean; +function TCocoaScrollBar.acceptsFirstMouse(event: NSEvent): LCLObjCBoolean; begin Result:=true; end; @@ -975,7 +975,7 @@ begin inherited scrollWheel(event); end; -function TCocoaScrollBar.acceptsFirstResponder: Boolean; +function TCocoaScrollBar.acceptsFirstResponder: LCLObjCBoolean; begin Result := True; end; diff --git a/lcl/interfaces/cocoa/cocoatables.pas b/lcl/interfaces/cocoa/cocoatables.pas index ff3d1df3ca..ef4d086c1c 100644 --- a/lcl/interfaces/cocoa/cocoatables.pas +++ b/lcl/interfaces/cocoa/cocoatables.pas @@ -77,7 +77,7 @@ type smallimages : NSMutableDictionary; - function acceptsFirstResponder: Boolean; override; + function acceptsFirstResponder: LCLObjCBoolean; override; function lclGetCallback: ICommonCallback; override; procedure lclClearCallback; override; @@ -446,7 +446,7 @@ begin // as well as number of total items in the table should be marked as modified end; -function TCocoaTableListView.acceptsFirstResponder: Boolean; +function TCocoaTableListView.acceptsFirstResponder: LCLObjCBoolean; begin Result := True; end; diff --git a/lcl/interfaces/cocoa/cocoatextedits.pas b/lcl/interfaces/cocoa/cocoatextedits.pas index 7e39a2899e..199da11198 100644 --- a/lcl/interfaces/cocoa/cocoatextedits.pas +++ b/lcl/interfaces/cocoa/cocoatextedits.pas @@ -59,7 +59,7 @@ type TCocoaTextField = objcclass(NSTextField) callback: ICommonCallback; - function acceptsFirstResponder: Boolean; override; + function acceptsFirstResponder: LCLObjCBoolean; override; function lclGetCallback: ICommonCallback; override; procedure lclClearCallback; override; procedure resetCursorRects; override; @@ -82,7 +82,7 @@ type TCocoaSecureTextField = objcclass(NSSecureTextField) public callback: ICommonCallback; - function acceptsFirstResponder: Boolean; override; + function acceptsFirstResponder: LCLObjCBoolean; override; procedure resetCursorRects; override; // key procedure keyUp(event: NSEvent); override; @@ -107,7 +107,7 @@ type supressTextChangeEvent: Integer; // if above zero, then don't send text change event - function acceptsFirstResponder: Boolean; override; + function acceptsFirstResponder: LCLObjCBoolean; override; function lclGetCallback: ICommonCallback; override; procedure lclClearCallback; override; procedure resetCursorRects; override; @@ -219,7 +219,7 @@ type callback: IComboboxCallBack; list: TCocoaComboBoxList; resultNS: NSString; //use to return values to combo - function acceptsFirstResponder: Boolean; override; + function acceptsFirstResponder: LCLObjCBoolean; override; procedure textDidChange(notification: NSNotification); override; // NSComboBoxDataSourceProtocol function comboBox_objectValueForItemAtIndex_(combo: TCocoaComboBox; row: NSInteger): id; message 'comboBox:objectValueForItemAtIndex:'; @@ -240,7 +240,7 @@ type procedure setStringValue(avalue: NSString); override; function lclGetFrameToLayoutDelta: TRect; override; // mouse - function acceptsFirstMouse(event: NSEvent): Boolean; override; + function acceptsFirstMouse(event: NSEvent): LCLObjCBoolean; override; procedure mouseDown(event: NSEvent); override; procedure mouseUp(event: NSEvent); override; procedure rightMouseDown(event: NSEvent); override; @@ -275,7 +275,7 @@ type isOwnerDrawn: Boolean; isOwnerMeasure: Boolean; - function acceptsFirstResponder: Boolean; override; + function acceptsFirstResponder: LCLObjCBoolean; override; procedure dealloc; override; function lclGetCallback: ICommonCallback; override; procedure lclClearCallback; override; @@ -284,7 +284,7 @@ type procedure comboboxAction(sender: id); message 'comboboxAction:'; function stringValue: NSString; override; // mouse - function acceptsFirstMouse(event: NSEvent): Boolean; override; + function acceptsFirstMouse(event: NSEvent): LCLObjCBoolean; override; procedure mouseDown(event: NSEvent); override; procedure mouseUp(event: NSEvent); override; procedure rightMouseDown(event: NSEvent); override; @@ -325,7 +325,7 @@ type TCocoaSpinEditStepper = objcclass(NSStepper) callback: ICommonCallback; - function acceptsFirstMouse(event: NSEvent): Boolean; override; + function acceptsFirstMouse(event: NSEvent): LCLObjCBoolean; override; procedure mouseDown(event: NSEvent); override; procedure mouseUp(event: NSEvent); override; procedure rightMouseDown(event: NSEvent); override; @@ -356,7 +356,7 @@ type // NSTextFieldDelegateProtocol procedure controlTextDidChange(obj: NSNotification); override; // lcl - function acceptsFirstResponder: Boolean; override; + function acceptsFirstResponder: LCLObjCBoolean; override; function lclGetCallback: ICommonCallback; override; procedure lclClearCallback; override; procedure resetCursorRects; override; @@ -365,7 +365,7 @@ type // NSViewFix function fittingSize: NSSize; override; // mouse - function acceptsFirstMouse(event: NSEvent): Boolean; override; + function acceptsFirstMouse(event: NSEvent): LCLObjCBoolean; override; procedure mouseDown(event: NSEvent); override; procedure mouseUp(event: NSEvent); override; procedure rightMouseDown(event: NSEvent); override; @@ -416,7 +416,7 @@ end; { TCocoaSpinEditStepper } -function TCocoaSpinEditStepper.acceptsFirstMouse(event: NSEvent): Boolean; +function TCocoaSpinEditStepper.acceptsFirstMouse(event: NSEvent): LCLObjCBoolean; begin Result:=true; end; @@ -722,7 +722,7 @@ end; { TCocoaTextField } -function TCocoaTextField.acceptsFirstResponder: Boolean; +function TCocoaTextField.acceptsFirstResponder: LCLObjCBoolean; begin Result := True; end; @@ -850,7 +850,7 @@ begin inherited flagsChanged(event); end; -function TCocoaTextView.acceptsFirstResponder: Boolean; +function TCocoaTextView.acceptsFirstResponder: LCLObjCBoolean; begin Result := True; end; @@ -968,7 +968,7 @@ end; { TCocoaSecureTextField } -function TCocoaSecureTextField.acceptsFirstResponder: Boolean; +function TCocoaSecureTextField.acceptsFirstResponder: LCLObjCBoolean; begin Result := True; end; @@ -1151,7 +1151,7 @@ begin end; end; -function TCocoaComboBox.acceptsFirstResponder: Boolean; +function TCocoaComboBox.acceptsFirstResponder: LCLObjCBoolean; begin Result := True; end; @@ -1261,7 +1261,7 @@ begin inherited keyUp(event); end; -function TCocoaComboBox.acceptsFirstMouse(event: NSEvent): Boolean; +function TCocoaComboBox.acceptsFirstMouse(event: NSEvent): LCLObjCBoolean; begin Result:=true; end; @@ -1338,7 +1338,7 @@ end; { TCocoaReadOnlyComboBox } -function TCocoaReadOnlyComboBox.acceptsFirstResponder: Boolean; +function TCocoaReadOnlyComboBox.acceptsFirstResponder: LCLObjCBoolean; begin Result := True; end; @@ -1409,7 +1409,7 @@ begin Result:=inherited stringValue; end; -function TCocoaReadOnlyComboBox.acceptsFirstMouse(event: NSEvent): Boolean; +function TCocoaReadOnlyComboBox.acceptsFirstMouse(event: NSEvent): LCLObjCBoolean; begin Result:=true; end; @@ -1791,7 +1791,7 @@ begin if Assigned(callback) then callback.SendOnTextChanged; end; -function TCocoaSpinEdit.acceptsFirstResponder: Boolean; +function TCocoaSpinEdit.acceptsFirstResponder: LCLObjCBoolean; begin Result := True; end; @@ -1869,7 +1869,7 @@ begin {$ENDIF} end; -function TCocoaSpinEdit.acceptsFirstMouse(event: NSEvent): Boolean; +function TCocoaSpinEdit.acceptsFirstMouse(event: NSEvent): LCLObjCBoolean; begin Result:=true; end; diff --git a/lcl/interfaces/cocoa/cocoawindows.pas b/lcl/interfaces/cocoa/cocoawindows.pas index beaecda885..ff8eb9b465 100644 --- a/lcl/interfaces/cocoa/cocoawindows.pas +++ b/lcl/interfaces/cocoa/cocoawindows.pas @@ -89,10 +89,10 @@ type procedure windowDidMove(notification: NSNotification); message 'windowDidMove:'; public callback: IWindowCallback; - function acceptsFirstResponder: Boolean; override; - function canBecomeKeyWindow: Boolean; override; - function becomeFirstResponder: Boolean; override; - function resignFirstResponder: Boolean; override; + function acceptsFirstResponder: LCLObjCBoolean; override; + function canBecomeKeyWindow: LCLObjCBoolean; override; + function becomeFirstResponder: LCLObjCBoolean; override; + function resignFirstResponder: LCLObjCBoolean; override; function lclGetCallback: ICommonCallback; override; procedure lclClearCallback; override; // mouse @@ -142,10 +142,10 @@ type keepWinLevel : NSInteger; //LCLForm: TCustomForm; procedure dealloc; override; - function acceptsFirstResponder: Boolean; override; - function canBecomeKeyWindow: Boolean; override; - function becomeFirstResponder: Boolean; override; - function resignFirstResponder: Boolean; override; + function acceptsFirstResponder: LCLObjCBoolean; override; + function canBecomeKeyWindow: LCLObjCBoolean; override; + function becomeFirstResponder: LCLObjCBoolean; override; + function resignFirstResponder: LCLObjCBoolean; override; function lclGetCallback: ICommonCallback; override; procedure lclClearCallback; override; // mouse @@ -173,9 +173,9 @@ type procedure flagsChanged(event: NSEvent); override; // NSDraggingDestinationCategory function draggingEntered(sender: NSDraggingInfoProtocol): NSDragOperation; override; - function performDragOperation(sender: NSDraggingInfoProtocol): Boolean; override; + function performDragOperation(sender: NSDraggingInfoProtocol): LCLObjCBoolean; override; // windows - function makeFirstResponder(r: NSResponder): Boolean; override; + function makeFirstResponder(r: NSResponder): LCLObjCBoolean; override; // menu support procedure lclItemSelected(sender: id); message 'lclItemSelected:'; @@ -188,7 +188,7 @@ type TCocoaDesignOverlay = objcclass(NSView) callback : ICommonCallback; procedure drawRect(r: NSRect); override; - function acceptsFirstResponder: Boolean; override; + function acceptsFirstResponder: LCLObjCBoolean; override; function hitTest(aPoint: NSPoint): NSView; override; function lclGetCallback: ICommonCallback; override; procedure lclClearCallback; override; @@ -207,7 +207,7 @@ type fswin: NSWindow; // window that was used as a content prior to switching to old-school fullscreen popup_parent: HWND; // if not 0, indicates that we should set the popup parent overlay: NSView; - function performKeyEquivalent(event: NSEvent): Boolean; override; + function performKeyEquivalent(event: NSEvent): LCLObjCBoolean; override; procedure resolvePopupParent(); message 'resolvePopupParent'; function lclOwnWindow: NSWindow; message 'lclOwnWindow'; procedure lclSetFrame(const r: TRect); override; @@ -216,7 +216,7 @@ type procedure viewDidMoveToWindow; override; procedure viewWillMoveToWindow(newWindow: CocoaAll.NSWindow); override; procedure dealloc; override; - procedure setHidden(aisHidden: Boolean); override; + procedure setHidden(aisHidden: LCLObjCBoolean); override; procedure didAddSubview(aview: NSView); override; end; @@ -333,7 +333,7 @@ begin inherited drawRect(r); end; -function TCocoaDesignOverlay.acceptsFirstResponder: Boolean; +function TCocoaDesignOverlay.acceptsFirstResponder: LCLObjCBoolean; begin Result:=false; // no focus end; @@ -384,7 +384,7 @@ begin callback.DidResignKeyNotification; end; -function TCocoaWindowContent.performKeyEquivalent(event: NSEvent): Boolean; +function TCocoaWindowContent.performKeyEquivalent(event: NSEvent): LCLObjCBoolean; var resp : NSResponder; wn : NSWindow; @@ -513,7 +513,7 @@ begin inherited dealloc; end; -procedure TCocoaWindowContent.setHidden(aisHidden: Boolean); +procedure TCocoaWindowContent.setHidden(aisHidden: LCLObjCBoolean); var cw : TCocoaWindow; begin @@ -593,24 +593,24 @@ begin callback.Move; end; -function TCocoaPanel.acceptsFirstResponder: Boolean; +function TCocoaPanel.acceptsFirstResponder: LCLObjCBoolean; begin Result := True; end; -function TCocoaPanel.canBecomeKeyWindow: Boolean; +function TCocoaPanel.canBecomeKeyWindow: LCLObjCBoolean; begin Result := Assigned(callback) and callback.CanActivate; end; -function TCocoaPanel.becomeFirstResponder: Boolean; +function TCocoaPanel.becomeFirstResponder: LCLObjCBoolean; begin Result := inherited becomeFirstResponder; // if Assigned(callback) then // callback.BecomeFirstResponder; end; -function TCocoaPanel.resignFirstResponder: Boolean; +function TCocoaPanel.resignFirstResponder: LCLObjCBoolean; begin Result := inherited resignFirstResponder; // if Assigned(callback) then @@ -837,17 +837,17 @@ begin inherited dealloc; end; -function TCocoaWindow.acceptsFirstResponder: Boolean; +function TCocoaWindow.acceptsFirstResponder: LCLObjCBoolean; begin Result := True; end; -function TCocoaWindow.canBecomeKeyWindow: Boolean; +function TCocoaWindow.canBecomeKeyWindow: LCLObjCBoolean; begin Result := Assigned(callback) and callback.CanActivate; end; -function TCocoaWindow.becomeFirstResponder: Boolean; +function TCocoaWindow.becomeFirstResponder: LCLObjCBoolean; begin Result := inherited becomeFirstResponder; // uncommenting the following lines starts an endless focus loop @@ -856,7 +856,7 @@ begin // callback.BecomeFirstResponder; end; -function TCocoaWindow.resignFirstResponder: Boolean; +function TCocoaWindow.resignFirstResponder: LCLObjCBoolean; begin Result := inherited resignFirstResponder; // if Assigned(callback) then @@ -1046,7 +1046,7 @@ begin Result := sender.draggingSourceOperationMask(); end; -function TCocoaWindow.performDragOperation(sender: NSDraggingInfoProtocol): Boolean; +function TCocoaWindow.performDragOperation(sender: NSDraggingInfoProtocol): LCLObjCBoolean; var draggedURLs{, lClasses}: NSArray; lFiles: array of string; @@ -1086,7 +1086,7 @@ begin Result := True; end; -function TCocoaWindow.makeFirstResponder(r: NSResponder): Boolean; +function TCocoaWindow.makeFirstResponder(r: NSResponder): LCLObjCBoolean; var cbnew: ICommonCallback; begin diff --git a/lcl/interfaces/cocoa/cocoawsmenus.pas b/lcl/interfaces/cocoa/cocoawsmenus.pas index f5eb437fee..f01cd6caf7 100644 --- a/lcl/interfaces/cocoa/cocoawsmenus.pas +++ b/lcl/interfaces/cocoa/cocoawsmenus.pas @@ -76,13 +76,13 @@ type menuItemCallback: IMenuItemCallback; attachedAppleMenuItems: Boolean; FMenuItemTarget: TMenuItem; - procedure UncheckSiblings(AIsChangingToChecked: Boolean = False); message 'UncheckSiblings:'; + procedure UncheckSiblings(AIsChangingToChecked: LCLObjCBoolean = False); message 'UncheckSiblings:'; function GetMenuItemHandle(): TMenuItem; message 'GetMenuItemHandle'; procedure lclItemSelected(sender: id); message 'lclItemSelected:'; function lclGetCallback: IMenuItemCallback; override; procedure lclClearCallback; override; procedure attachAppleMenuItems(); message 'attachAppleMenuItems'; - function isValidAppleMenu(): Boolean; message 'isValidAppleMenu'; + function isValidAppleMenu(): LCLObjCBoolean; message 'isValidAppleMenu'; procedure menuNeedsUpdate(AMenu: NSMenu); message 'menuNeedsUpdate:'; end;