paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-06-10 14:18:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

cocoa: updating LCL overrides to recognize different boolean types used in FPC headers. #34609

Browse Source 
git-svn-id: trunk@59725 -
This commit is contained in:
dmitry 2018-12-04 04:18:34 +00:00
parent eb0a09cc7e
commit c7ae0282b6
8 changed files with 92 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lcl/interfaces/cocoa/cocoabuttons.pas
View File

@ -69,7 +69,7 @@ type
adjustFontToControlSize: Boolean; adjustFontToControlSize: Boolean;
procedure dealloc; override; procedure dealloc; override;
function initWithFrame(frameRect: NSRect): id; override; function initWithFrame(frameRect: NSRect): id; override;
function acceptsFirstResponder: Boolean; override; function acceptsFirstResponder: LCLObjCBoolean; override;
procedure drawRect(dirtyRect: NSRect); override; procedure drawRect(dirtyRect: NSRect); override;
function lclGetCallback: ICommonCallback; override; function lclGetCallback: ICommonCallback; override;
procedure lclClearCallback; override; procedure lclClearCallback; override;
@ -234,7 +234,7 @@ begin
end; end;
end; end;
function TCocoaButton.acceptsFirstResponder: Boolean; function TCocoaButton.acceptsFirstResponder: LCLObjCBoolean;
begin begin
Result := True; Result := True;
end; end;

8
lcl/interfaces/cocoa/cocoaint.pas
View File

@ -68,10 +68,10 @@ type
modals : NSMutableDictionary; modals : NSMutableDictionary;
procedure dealloc; override; procedure dealloc; override;
function isRunning: Boolean; override; function isRunning: LCLObjCBoolean; override;
procedure run; override; procedure run; override;
procedure sendEvent(theEvent: NSEvent); 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; function runModalForWindow(theWindow: NSWindow): NSInteger; override;
end; end;
@ -398,7 +398,7 @@ begin
inherited dealloc; inherited dealloc;
end; end;
function TCocoaApplication.isRunning: Boolean; function TCocoaApplication.isRunning: LCLObjCBoolean;
begin begin
Result:=isrun; Result:=isrun;
end; end;
@ -471,7 +471,7 @@ begin
end; end;
function TCocoaApplication.nextEventMatchingMask_untilDate_inMode_dequeue( function TCocoaApplication.nextEventMatchingMask_untilDate_inMode_dequeue(
mask: NSUInteger; expiration: NSDate; mode: NSString; deqFlag: Boolean mask: NSUInteger; expiration: NSDate; mode: NSString; deqFlag: LCLObjCBoolean
): NSEvent; ): NSEvent;
var var
cb : ICommonCallback; cb : ICommonCallback;

42
lcl/interfaces/cocoa/cocoaprivate.pas
View File

@ -42,6 +42,20 @@ const
SPINEDIT_EDIT_SPACING_FOR_SELECTION = 4; SPINEDIT_EDIT_SPACING_FOR_SELECTION = 4;
STATUSBAR_DEFAULT_HEIGHT = 18; 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 type
{ ICommonCallback } { ICommonCallback }
@ -186,13 +200,13 @@ type
callback: ICommonCallback; callback: ICommonCallback;
auxMouseByParent: Boolean; auxMouseByParent: Boolean;
procedure dealloc; override; procedure dealloc; override;
function acceptsFirstResponder: Boolean; override; function acceptsFirstResponder: LCLObjCBoolean; override;
procedure drawRect(dirtyRect: NSRect); override; procedure drawRect(dirtyRect: NSRect); override;
function lclGetCallback: ICommonCallback; override; function lclGetCallback: ICommonCallback; override;
procedure lclClearCallback; override; procedure lclClearCallback; override;
function lclIsMouseInAuxArea(Event: NSevent): Boolean; override; function lclIsMouseInAuxArea(Event: NSevent): Boolean; override;
// mouse // mouse
function acceptsFirstMouse(event: NSEvent): Boolean; override; function acceptsFirstMouse(event: NSEvent): LCLObjCBoolean; override;
procedure mouseDown(event: NSEvent); override; procedure mouseDown(event: NSEvent); override;
procedure mouseUp(event: NSEvent); override; procedure mouseUp(event: NSEvent); override;
procedure rightMouseDown(event: NSEvent); override; procedure rightMouseDown(event: NSEvent); override;
@ -251,7 +265,7 @@ type
TCocoaGroupBox = objcclass(NSBox) TCocoaGroupBox = objcclass(NSBox)
public public
callback: ICommonCallback; callback: ICommonCallback;
function acceptsFirstResponder: Boolean; override; function acceptsFirstResponder: LCLObjCBoolean; override;
function lclGetCallback: ICommonCallback; override; function lclGetCallback: ICommonCallback; override;
procedure lclClearCallback; override; procedure lclClearCallback; override;
procedure resetCursorRects; override; procedure resetCursorRects; override;
@ -270,14 +284,14 @@ type
TCocoaProgressIndicator = objcclass(NSProgressIndicator) TCocoaProgressIndicator = objcclass(NSProgressIndicator)
callback: ICommonCallback; callback: ICommonCallback;
function acceptsFirstResponder: Boolean; override; function acceptsFirstResponder: LCLObjCBoolean; override;
function lclGetCallback: ICommonCallback; override; function lclGetCallback: ICommonCallback; override;
procedure lclClearCallback; override; procedure lclClearCallback; override;
procedure resetCursorRects; override; procedure resetCursorRects; override;
function lclGetFrameToLayoutDelta: TRect; override; function lclGetFrameToLayoutDelta: TRect; override;
procedure lclSetFrame(const r: TRect); override; procedure lclSetFrame(const r: TRect); override;
// mouse // mouse
function acceptsFirstMouse(event: NSEvent): Boolean; override; function acceptsFirstMouse(event: NSEvent): LCLObjCBoolean; override;
procedure mouseDown(event: NSEvent); override; procedure mouseDown(event: NSEvent); override;
procedure mouseUp(event: NSEvent); override; procedure mouseUp(event: NSEvent); override;
procedure rightMouseDown(event: NSEvent); override; procedure rightMouseDown(event: NSEvent); override;
@ -311,7 +325,7 @@ type
procedure dealloc; override; procedure dealloc; override;
procedure drawRect(dirtyRect: NSRect); override; procedure drawRect(dirtyRect: NSRect); override;
function acceptsFirstResponder: Boolean; override; function acceptsFirstResponder: LCLObjCBoolean; override;
function lclGetCallback: ICommonCallback; override; function lclGetCallback: ICommonCallback; override;
procedure lclClearCallback; override; procedure lclClearCallback; override;
procedure resetCursorRects; override; procedure resetCursorRects; override;
@ -322,7 +336,7 @@ type
procedure SnapToInteger(AExtraFactor: Integer = 0); message 'SnapToInteger:'; procedure SnapToInteger(AExtraFactor: Integer = 0); message 'SnapToInteger:';
procedure sliderAction(sender: id); message 'sliderAction:'; procedure sliderAction(sender: id); message 'sliderAction:';
// mouse // mouse
function acceptsFirstMouse(event: NSEvent): Boolean; override; function acceptsFirstMouse(event: NSEvent): LCLObjCBoolean; override;
procedure mouseDown(event: NSEvent); override; procedure mouseDown(event: NSEvent); override;
procedure mouseUp(event: NSEvent); override; procedure mouseUp(event: NSEvent); override;
procedure rightMouseDown(event: NSEvent); override; procedure rightMouseDown(event: NSEvent); override;
@ -448,7 +462,7 @@ begin
Result.Bottom := -4; Result.Bottom := -4;
end; end;
function TCocoaGroupBox.acceptsFirstResponder: Boolean; function TCocoaGroupBox.acceptsFirstResponder: LCLObjCBoolean;
begin begin
Result := True; Result := True;
end; end;
@ -509,12 +523,12 @@ begin
inherited dealloc; inherited dealloc;
end; end;
function TCocoaCustomControl.acceptsFirstResponder: Boolean; function TCocoaCustomControl.acceptsFirstResponder: LCLObjCBoolean;
begin begin
Result := True; Result := True;
end; end;
function TCocoaCustomControl.acceptsFirstMouse(event: NSEvent): Boolean; function TCocoaCustomControl.acceptsFirstMouse(event: NSEvent): LCLObjCBoolean;
begin begin
// By default, a mouse-down event in a window that isn’t the key window // 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 // simply brings the window forward and makes it key; the event isn’t sent
@ -1167,7 +1181,7 @@ end;
{ TCocoaProgressIndicator } { TCocoaProgressIndicator }
function TCocoaProgressIndicator.acceptsFirstResponder: Boolean; function TCocoaProgressIndicator.acceptsFirstResponder: LCLObjCBoolean;
begin begin
Result:=True; Result:=True;
end; end;
@ -1212,7 +1226,7 @@ begin
inherited lclSetFrame(r); inherited lclSetFrame(r);
end; end;
function TCocoaProgressIndicator.acceptsFirstMouse(event: NSEvent): Boolean; function TCocoaProgressIndicator.acceptsFirstMouse(event: NSEvent): LCLObjCBoolean;
begin begin
Result:=true; Result:=true;
end; end;
@ -1338,7 +1352,7 @@ begin
inherited drawRect(dirtyRect); inherited drawRect(dirtyRect);
end; end;
function TCocoaSlider.acceptsFirstResponder: Boolean; function TCocoaSlider.acceptsFirstResponder: LCLObjCBoolean;
begin begin
Result := True; Result := True;
end; end;
@ -1408,7 +1422,7 @@ begin
end; end;
end; end;
function TCocoaSlider.acceptsFirstMouse(event: NSEvent): Boolean; function TCocoaSlider.acceptsFirstMouse(event: NSEvent): LCLObjCBoolean;
begin begin
Result:=true; Result:=true;
end; end;

16
lcl/interfaces/cocoa/cocoascrollers.pas
View File

@ -44,7 +44,7 @@ type
function initWithFrame(ns: NSRect): id; override; function initWithFrame(ns: NSRect): id; override;
procedure dealloc; override; procedure dealloc; override;
procedure setFrame(aframe: NSRect); override; procedure setFrame(aframe: NSRect); override;
function acceptsFirstResponder: Boolean; override; function acceptsFirstResponder: LCLObjCBoolean; override;
function lclGetCallback: ICommonCallback; override; function lclGetCallback: ICommonCallback; override;
procedure lclClearCallback; override; procedure lclClearCallback; override;
procedure resetCursorRects; override; procedure resetCursorRects; override;
@ -87,7 +87,7 @@ type
function allocHorizontalScroller(avisible: Boolean): NSScroller; message 'allocHorizontalScroller:'; function allocHorizontalScroller(avisible: Boolean): NSScroller; message 'allocHorizontalScroller:';
function allocVerticalScroller(avisible: Boolean): NSScroller; message 'allocVerticalScroller:'; function allocVerticalScroller(avisible: Boolean): NSScroller; message 'allocVerticalScroller:';
// mouse // mouse
function acceptsFirstMouse(event: NSEvent): Boolean; override; function acceptsFirstMouse(event: NSEvent): LCLObjCBoolean; override;
procedure mouseDown(event: NSEvent); override; procedure mouseDown(event: NSEvent); override;
procedure mouseUp(event: NSEvent); override; procedure mouseUp(event: NSEvent); override;
procedure rightMouseDown(event: NSEvent); override; procedure rightMouseDown(event: NSEvent); override;
@ -115,14 +115,14 @@ type
procedure actionScrolling(sender: NSObject); message 'actionScrolling:'; procedure actionScrolling(sender: NSObject); message 'actionScrolling:';
function IsHorizontal: Boolean; message 'IsHorizontal'; function IsHorizontal: Boolean; message 'IsHorizontal';
function acceptsFirstResponder: Boolean; override; function acceptsFirstResponder: LCLObjCBoolean; override;
function lclGetCallback: ICommonCallback; override; function lclGetCallback: ICommonCallback; override;
procedure lclClearCallback; override; procedure lclClearCallback; override;
procedure resetCursorRects; override; procedure resetCursorRects; override;
function lclPos: Integer; message 'lclPos'; function lclPos: Integer; message 'lclPos';
procedure lclSetPos(aPos: integer); message 'lclSetPos:'; procedure lclSetPos(aPos: integer); message 'lclSetPos:';
// mouse // mouse
function acceptsFirstMouse(event: NSEvent): Boolean; override; function acceptsFirstMouse(event: NSEvent): LCLObjCBoolean; override;
procedure mouseDown(event: NSEvent); override; procedure mouseDown(event: NSEvent); override;
procedure mouseUp(event: NSEvent); override; procedure mouseUp(event: NSEvent); override;
procedure rightMouseDown(event: NSEvent); override; procedure rightMouseDown(event: NSEvent); override;
@ -553,7 +553,7 @@ begin
end; end;
end; end;
function TCocoaManualScrollView.acceptsFirstMouse(event: NSEvent): Boolean; function TCocoaManualScrollView.acceptsFirstMouse(event: NSEvent): LCLObjCBoolean;
begin begin
Result:=true; Result:=true;
end; end;
@ -789,7 +789,7 @@ begin
end; end;
end; end;
function TCocoaScrollView.acceptsFirstResponder: Boolean; function TCocoaScrollView.acceptsFirstResponder: LCLObjCBoolean;
begin begin
Result := True; Result := True;
end; end;
@ -862,7 +862,7 @@ begin
end; end;
end; end;
function TCocoaScrollBar.acceptsFirstMouse(event: NSEvent): Boolean; function TCocoaScrollBar.acceptsFirstMouse(event: NSEvent): LCLObjCBoolean;
begin begin
Result:=true; Result:=true;
end; end;
@ -975,7 +975,7 @@ begin
inherited scrollWheel(event); inherited scrollWheel(event);
end; end;
function TCocoaScrollBar.acceptsFirstResponder: Boolean; function TCocoaScrollBar.acceptsFirstResponder: LCLObjCBoolean;
begin begin
Result := True; Result := True;
end; end;

4
lcl/interfaces/cocoa/cocoatables.pas
View File

@ -77,7 +77,7 @@ type
smallimages : NSMutableDictionary; smallimages : NSMutableDictionary;
function acceptsFirstResponder: Boolean; override; function acceptsFirstResponder: LCLObjCBoolean; override;
function lclGetCallback: ICommonCallback; override; function lclGetCallback: ICommonCallback; override;
procedure lclClearCallback; override; procedure lclClearCallback; override;
@ -446,7 +446,7 @@ begin
// as well as number of total items in the table should be marked as modified // as well as number of total items in the table should be marked as modified
end; end;
function TCocoaTableListView.acceptsFirstResponder: Boolean; function TCocoaTableListView.acceptsFirstResponder: LCLObjCBoolean;
begin begin
Result := True; Result := True;
end; end;

40
lcl/interfaces/cocoa/cocoatextedits.pas
View File

@ -59,7 +59,7 @@ type
TCocoaTextField = objcclass(NSTextField) TCocoaTextField = objcclass(NSTextField)
callback: ICommonCallback; callback: ICommonCallback;
function acceptsFirstResponder: Boolean; override; function acceptsFirstResponder: LCLObjCBoolean; override;
function lclGetCallback: ICommonCallback; override; function lclGetCallback: ICommonCallback; override;
procedure lclClearCallback; override; procedure lclClearCallback; override;
procedure resetCursorRects; override; procedure resetCursorRects; override;
@ -82,7 +82,7 @@ type
TCocoaSecureTextField = objcclass(NSSecureTextField) TCocoaSecureTextField = objcclass(NSSecureTextField)
public public
callback: ICommonCallback; callback: ICommonCallback;
function acceptsFirstResponder: Boolean; override; function acceptsFirstResponder: LCLObjCBoolean; override;
procedure resetCursorRects; override; procedure resetCursorRects; override;
// key // key
procedure keyUp(event: NSEvent); override; procedure keyUp(event: NSEvent); override;
@ -107,7 +107,7 @@ type
supressTextChangeEvent: Integer; // if above zero, then don't send text change event supressTextChangeEvent: Integer; // if above zero, then don't send text change event
function acceptsFirstResponder: Boolean; override; function acceptsFirstResponder: LCLObjCBoolean; override;
function lclGetCallback: ICommonCallback; override; function lclGetCallback: ICommonCallback; override;
procedure lclClearCallback; override; procedure lclClearCallback; override;
procedure resetCursorRects; override; procedure resetCursorRects; override;
@ -219,7 +219,7 @@ type
callback: IComboboxCallBack; callback: IComboboxCallBack;
list: TCocoaComboBoxList; list: TCocoaComboBoxList;
resultNS: NSString; //use to return values to combo resultNS: NSString; //use to return values to combo
function acceptsFirstResponder: Boolean; override; function acceptsFirstResponder: LCLObjCBoolean; override;
procedure textDidChange(notification: NSNotification); override; procedure textDidChange(notification: NSNotification); override;
// NSComboBoxDataSourceProtocol // NSComboBoxDataSourceProtocol
function comboBox_objectValueForItemAtIndex_(combo: TCocoaComboBox; row: NSInteger): id; message 'comboBox:objectValueForItemAtIndex:'; function comboBox_objectValueForItemAtIndex_(combo: TCocoaComboBox; row: NSInteger): id; message 'comboBox:objectValueForItemAtIndex:';
@ -240,7 +240,7 @@ type
procedure setStringValue(avalue: NSString); override; procedure setStringValue(avalue: NSString); override;
function lclGetFrameToLayoutDelta: TRect; override; function lclGetFrameToLayoutDelta: TRect; override;
// mouse // mouse
function acceptsFirstMouse(event: NSEvent): Boolean; override; function acceptsFirstMouse(event: NSEvent): LCLObjCBoolean; override;
procedure mouseDown(event: NSEvent); override; procedure mouseDown(event: NSEvent); override;
procedure mouseUp(event: NSEvent); override; procedure mouseUp(event: NSEvent); override;
procedure rightMouseDown(event: NSEvent); override; procedure rightMouseDown(event: NSEvent); override;
@ -275,7 +275,7 @@ type
isOwnerDrawn: Boolean; isOwnerDrawn: Boolean;
isOwnerMeasure: Boolean; isOwnerMeasure: Boolean;
function acceptsFirstResponder: Boolean; override; function acceptsFirstResponder: LCLObjCBoolean; override;
procedure dealloc; override; procedure dealloc; override;
function lclGetCallback: ICommonCallback; override; function lclGetCallback: ICommonCallback; override;
procedure lclClearCallback; override; procedure lclClearCallback; override;
@ -284,7 +284,7 @@ type
procedure comboboxAction(sender: id); message 'comboboxAction:'; procedure comboboxAction(sender: id); message 'comboboxAction:';
function stringValue: NSString; override; function stringValue: NSString; override;
// mouse // mouse
function acceptsFirstMouse(event: NSEvent): Boolean; override; function acceptsFirstMouse(event: NSEvent): LCLObjCBoolean; override;
procedure mouseDown(event: NSEvent); override; procedure mouseDown(event: NSEvent); override;
procedure mouseUp(event: NSEvent); override; procedure mouseUp(event: NSEvent); override;
procedure rightMouseDown(event: NSEvent); override; procedure rightMouseDown(event: NSEvent); override;
@ -325,7 +325,7 @@ type
TCocoaSpinEditStepper = objcclass(NSStepper) TCocoaSpinEditStepper = objcclass(NSStepper)
callback: ICommonCallback; callback: ICommonCallback;
function acceptsFirstMouse(event: NSEvent): Boolean; override; function acceptsFirstMouse(event: NSEvent): LCLObjCBoolean; override;
procedure mouseDown(event: NSEvent); override; procedure mouseDown(event: NSEvent); override;
procedure mouseUp(event: NSEvent); override; procedure mouseUp(event: NSEvent); override;
procedure rightMouseDown(event: NSEvent); override; procedure rightMouseDown(event: NSEvent); override;
@ -356,7 +356,7 @@ type
// NSTextFieldDelegateProtocol // NSTextFieldDelegateProtocol
procedure controlTextDidChange(obj: NSNotification); override; procedure controlTextDidChange(obj: NSNotification); override;
// lcl // lcl
function acceptsFirstResponder: Boolean; override; function acceptsFirstResponder: LCLObjCBoolean; override;
function lclGetCallback: ICommonCallback; override; function lclGetCallback: ICommonCallback; override;
procedure lclClearCallback; override; procedure lclClearCallback; override;
procedure resetCursorRects; override; procedure resetCursorRects; override;
@ -365,7 +365,7 @@ type
// NSViewFix // NSViewFix
function fittingSize: NSSize; override; function fittingSize: NSSize; override;
// mouse // mouse
function acceptsFirstMouse(event: NSEvent): Boolean; override; function acceptsFirstMouse(event: NSEvent): LCLObjCBoolean; override;
procedure mouseDown(event: NSEvent); override; procedure mouseDown(event: NSEvent); override;
procedure mouseUp(event: NSEvent); override; procedure mouseUp(event: NSEvent); override;
procedure rightMouseDown(event: NSEvent); override; procedure rightMouseDown(event: NSEvent); override;
@ -416,7 +416,7 @@ end;
{ TCocoaSpinEditStepper } { TCocoaSpinEditStepper }
function TCocoaSpinEditStepper.acceptsFirstMouse(event: NSEvent): Boolean; function TCocoaSpinEditStepper.acceptsFirstMouse(event: NSEvent): LCLObjCBoolean;
begin begin
Result:=true; Result:=true;
end; end;
@ -722,7 +722,7 @@ end;
{ TCocoaTextField } { TCocoaTextField }
function TCocoaTextField.acceptsFirstResponder: Boolean; function TCocoaTextField.acceptsFirstResponder: LCLObjCBoolean;
begin begin
Result := True; Result := True;
end; end;
@ -850,7 +850,7 @@ begin
inherited flagsChanged(event); inherited flagsChanged(event);
end; end;
function TCocoaTextView.acceptsFirstResponder: Boolean; function TCocoaTextView.acceptsFirstResponder: LCLObjCBoolean;
begin begin
Result := True; Result := True;
end; end;
@ -968,7 +968,7 @@ end;
{ TCocoaSecureTextField } { TCocoaSecureTextField }
function TCocoaSecureTextField.acceptsFirstResponder: Boolean; function TCocoaSecureTextField.acceptsFirstResponder: LCLObjCBoolean;
begin begin
Result := True; Result := True;
end; end;
@ -1151,7 +1151,7 @@ begin
end; end;
end; end;
function TCocoaComboBox.acceptsFirstResponder: Boolean; function TCocoaComboBox.acceptsFirstResponder: LCLObjCBoolean;
begin begin
Result := True; Result := True;
end; end;
@ -1261,7 +1261,7 @@ begin
inherited keyUp(event); inherited keyUp(event);
end; end;
function TCocoaComboBox.acceptsFirstMouse(event: NSEvent): Boolean; function TCocoaComboBox.acceptsFirstMouse(event: NSEvent): LCLObjCBoolean;
begin begin
Result:=true; Result:=true;
end; end;
@ -1338,7 +1338,7 @@ end;
{ TCocoaReadOnlyComboBox } { TCocoaReadOnlyComboBox }
function TCocoaReadOnlyComboBox.acceptsFirstResponder: Boolean; function TCocoaReadOnlyComboBox.acceptsFirstResponder: LCLObjCBoolean;
begin begin
Result := True; Result := True;
end; end;
@ -1409,7 +1409,7 @@ begin
Result:=inherited stringValue; Result:=inherited stringValue;
end; end;
function TCocoaReadOnlyComboBox.acceptsFirstMouse(event: NSEvent): Boolean; function TCocoaReadOnlyComboBox.acceptsFirstMouse(event: NSEvent): LCLObjCBoolean;
begin begin
Result:=true; Result:=true;
end; end;
@ -1791,7 +1791,7 @@ begin
if Assigned(callback) then callback.SendOnTextChanged; if Assigned(callback) then callback.SendOnTextChanged;
end; end;
function TCocoaSpinEdit.acceptsFirstResponder: Boolean; function TCocoaSpinEdit.acceptsFirstResponder: LCLObjCBoolean;
begin begin
Result := True; Result := True;
end; end;
@ -1869,7 +1869,7 @@ begin
{$ENDIF} {$ENDIF}
end; end;
function TCocoaSpinEdit.acceptsFirstMouse(event: NSEvent): Boolean; function TCocoaSpinEdit.acceptsFirstMouse(event: NSEvent): LCLObjCBoolean;
begin begin
Result:=true; Result:=true;
end; end;

52
lcl/interfaces/cocoa/cocoawindows.pas
View File

@ -89,10 +89,10 @@ type
procedure windowDidMove(notification: NSNotification); message 'windowDidMove:'; procedure windowDidMove(notification: NSNotification); message 'windowDidMove:';
public public
callback: IWindowCallback; callback: IWindowCallback;
function acceptsFirstResponder: Boolean; override; function acceptsFirstResponder: LCLObjCBoolean; override;
function canBecomeKeyWindow: Boolean; override; function canBecomeKeyWindow: LCLObjCBoolean; override;
function becomeFirstResponder: Boolean; override; function becomeFirstResponder: LCLObjCBoolean; override;
function resignFirstResponder: Boolean; override; function resignFirstResponder: LCLObjCBoolean; override;
function lclGetCallback: ICommonCallback; override; function lclGetCallback: ICommonCallback; override;
procedure lclClearCallback; override; procedure lclClearCallback; override;
// mouse // mouse
@ -142,10 +142,10 @@ type
keepWinLevel : NSInteger; keepWinLevel : NSInteger;
//LCLForm: TCustomForm; //LCLForm: TCustomForm;
procedure dealloc; override; procedure dealloc; override;
function acceptsFirstResponder: Boolean; override; function acceptsFirstResponder: LCLObjCBoolean; override;
function canBecomeKeyWindow: Boolean; override; function canBecomeKeyWindow: LCLObjCBoolean; override;
function becomeFirstResponder: Boolean; override; function becomeFirstResponder: LCLObjCBoolean; override;
function resignFirstResponder: Boolean; override; function resignFirstResponder: LCLObjCBoolean; override;
function lclGetCallback: ICommonCallback; override; function lclGetCallback: ICommonCallback; override;
procedure lclClearCallback; override; procedure lclClearCallback; override;
// mouse // mouse
@ -173,9 +173,9 @@ type
procedure flagsChanged(event: NSEvent); override; procedure flagsChanged(event: NSEvent); override;
// NSDraggingDestinationCategory // NSDraggingDestinationCategory
function draggingEntered(sender: NSDraggingInfoProtocol): NSDragOperation; override; function draggingEntered(sender: NSDraggingInfoProtocol): NSDragOperation; override;
function performDragOperation(sender: NSDraggingInfoProtocol): Boolean; override; function performDragOperation(sender: NSDraggingInfoProtocol): LCLObjCBoolean; override;
// windows // windows
function makeFirstResponder(r: NSResponder): Boolean; override; function makeFirstResponder(r: NSResponder): LCLObjCBoolean; override;
// menu support // menu support
procedure lclItemSelected(sender: id); message 'lclItemSelected:'; procedure lclItemSelected(sender: id); message 'lclItemSelected:';
@ -188,7 +188,7 @@ type
TCocoaDesignOverlay = objcclass(NSView) TCocoaDesignOverlay = objcclass(NSView)
callback : ICommonCallback; callback : ICommonCallback;
procedure drawRect(r: NSRect); override; procedure drawRect(r: NSRect); override;
function acceptsFirstResponder: Boolean; override; function acceptsFirstResponder: LCLObjCBoolean; override;
function hitTest(aPoint: NSPoint): NSView; override; function hitTest(aPoint: NSPoint): NSView; override;
function lclGetCallback: ICommonCallback; override; function lclGetCallback: ICommonCallback; override;
procedure lclClearCallback; 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 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 popup_parent: HWND; // if not 0, indicates that we should set the popup parent
overlay: NSView; overlay: NSView;
function performKeyEquivalent(event: NSEvent): Boolean; override; function performKeyEquivalent(event: NSEvent): LCLObjCBoolean; override;
procedure resolvePopupParent(); message 'resolvePopupParent'; procedure resolvePopupParent(); message 'resolvePopupParent';
function lclOwnWindow: NSWindow; message 'lclOwnWindow'; function lclOwnWindow: NSWindow; message 'lclOwnWindow';
procedure lclSetFrame(const r: TRect); override; procedure lclSetFrame(const r: TRect); override;
@ -216,7 +216,7 @@ type
procedure viewDidMoveToWindow; override; procedure viewDidMoveToWindow; override;
procedure viewWillMoveToWindow(newWindow: CocoaAll.NSWindow); override; procedure viewWillMoveToWindow(newWindow: CocoaAll.NSWindow); override;
procedure dealloc; override; procedure dealloc; override;
procedure setHidden(aisHidden: Boolean); override; procedure setHidden(aisHidden: LCLObjCBoolean); override;
procedure didAddSubview(aview: NSView); override; procedure didAddSubview(aview: NSView); override;
end; end;
@ -333,7 +333,7 @@ begin
inherited drawRect(r); inherited drawRect(r);
end; end;
function TCocoaDesignOverlay.acceptsFirstResponder: Boolean; function TCocoaDesignOverlay.acceptsFirstResponder: LCLObjCBoolean;
begin begin
Result:=false; // no focus Result:=false; // no focus
end; end;
@ -384,7 +384,7 @@ begin
callback.DidResignKeyNotification; callback.DidResignKeyNotification;
end; end;
function TCocoaWindowContent.performKeyEquivalent(event: NSEvent): Boolean; function TCocoaWindowContent.performKeyEquivalent(event: NSEvent): LCLObjCBoolean;
var var
resp : NSResponder; resp : NSResponder;
wn : NSWindow; wn : NSWindow;
@ -513,7 +513,7 @@ begin
inherited dealloc; inherited dealloc;
end; end;
procedure TCocoaWindowContent.setHidden(aisHidden: Boolean); procedure TCocoaWindowContent.setHidden(aisHidden: LCLObjCBoolean);
var var
cw : TCocoaWindow; cw : TCocoaWindow;
begin begin
@ -593,24 +593,24 @@ begin
callback.Move; callback.Move;
end; end;
function TCocoaPanel.acceptsFirstResponder: Boolean; function TCocoaPanel.acceptsFirstResponder: LCLObjCBoolean;
begin begin
Result := True; Result := True;
end; end;
function TCocoaPanel.canBecomeKeyWindow: Boolean; function TCocoaPanel.canBecomeKeyWindow: LCLObjCBoolean;
begin begin
Result := Assigned(callback) and callback.CanActivate; Result := Assigned(callback) and callback.CanActivate;
end; end;
function TCocoaPanel.becomeFirstResponder: Boolean; function TCocoaPanel.becomeFirstResponder: LCLObjCBoolean;
begin begin
Result := inherited becomeFirstResponder; Result := inherited becomeFirstResponder;
// if Assigned(callback) then // if Assigned(callback) then
// callback.BecomeFirstResponder; // callback.BecomeFirstResponder;
end; end;
function TCocoaPanel.resignFirstResponder: Boolean; function TCocoaPanel.resignFirstResponder: LCLObjCBoolean;
begin begin
Result := inherited resignFirstResponder; Result := inherited resignFirstResponder;
// if Assigned(callback) then // if Assigned(callback) then
@ -837,17 +837,17 @@ begin
inherited dealloc; inherited dealloc;
end; end;
function TCocoaWindow.acceptsFirstResponder: Boolean; function TCocoaWindow.acceptsFirstResponder: LCLObjCBoolean;
begin begin
Result := True; Result := True;
end; end;
function TCocoaWindow.canBecomeKeyWindow: Boolean; function TCocoaWindow.canBecomeKeyWindow: LCLObjCBoolean;
begin begin
Result := Assigned(callback) and callback.CanActivate; Result := Assigned(callback) and callback.CanActivate;
end; end;
function TCocoaWindow.becomeFirstResponder: Boolean; function TCocoaWindow.becomeFirstResponder: LCLObjCBoolean;
begin begin
Result := inherited becomeFirstResponder; Result := inherited becomeFirstResponder;
// uncommenting the following lines starts an endless focus loop // uncommenting the following lines starts an endless focus loop
@ -856,7 +856,7 @@ begin
// callback.BecomeFirstResponder; // callback.BecomeFirstResponder;
end; end;
function TCocoaWindow.resignFirstResponder: Boolean; function TCocoaWindow.resignFirstResponder: LCLObjCBoolean;
begin begin
Result := inherited resignFirstResponder; Result := inherited resignFirstResponder;
// if Assigned(callback) then // if Assigned(callback) then
@ -1046,7 +1046,7 @@ begin
Result := sender.draggingSourceOperationMask(); Result := sender.draggingSourceOperationMask();
end; end;
function TCocoaWindow.performDragOperation(sender: NSDraggingInfoProtocol): Boolean; function TCocoaWindow.performDragOperation(sender: NSDraggingInfoProtocol): LCLObjCBoolean;
var var
draggedURLs{, lClasses}: NSArray; draggedURLs{, lClasses}: NSArray;
lFiles: array of string; lFiles: array of string;
@ -1086,7 +1086,7 @@ begin
Result := True; Result := True;
end; end;
function TCocoaWindow.makeFirstResponder(r: NSResponder): Boolean; function TCocoaWindow.makeFirstResponder(r: NSResponder): LCLObjCBoolean;
var var
cbnew: ICommonCallback; cbnew: ICommonCallback;
begin begin

4
lcl/interfaces/cocoa/cocoawsmenus.pas
View File

@ -76,13 +76,13 @@ type
menuItemCallback: IMenuItemCallback; menuItemCallback: IMenuItemCallback;
attachedAppleMenuItems: Boolean; attachedAppleMenuItems: Boolean;
FMenuItemTarget: TMenuItem; FMenuItemTarget: TMenuItem;
procedure UncheckSiblings(AIsChangingToChecked: Boolean = False); message 'UncheckSiblings:'; procedure UncheckSiblings(AIsChangingToChecked: LCLObjCBoolean = False); message 'UncheckSiblings:';
function GetMenuItemHandle(): TMenuItem; message 'GetMenuItemHandle'; function GetMenuItemHandle(): TMenuItem; message 'GetMenuItemHandle';
procedure lclItemSelected(sender: id); message 'lclItemSelected:'; procedure lclItemSelected(sender: id); message 'lclItemSelected:';
function lclGetCallback: IMenuItemCallback; override; function lclGetCallback: IMenuItemCallback; override;
procedure lclClearCallback; override; procedure lclClearCallback; override;
procedure attachAppleMenuItems(); message 'attachAppleMenuItems'; procedure attachAppleMenuItems(); message 'attachAppleMenuItems';
function isValidAppleMenu(): Boolean; message 'isValidAppleMenu'; function isValidAppleMenu(): LCLObjCBoolean; message 'isValidAppleMenu';
procedure menuNeedsUpdate(AMenu: NSMenu); message 'menuNeedsUpdate:'; procedure menuNeedsUpdate(AMenu: NSMenu); message 'menuNeedsUpdate:';
end; end;