From e5b2c70c00a4b8b878e4aefb46db5d91fd81d0d2 Mon Sep 17 00:00:00 2001 From: rich2014 Date: Tue, 18 Jul 2023 19:05:39 +0800 Subject: [PATCH] Cocoa: fix typos --- lcl/interfaces/cocoa/cocoaprivate.pas | 2 +- lcl/interfaces/cocoa/cocoascrollers.pas | 2 +- lcl/interfaces/cocoa/cocoawinapi.inc | 2 +- lcl/interfaces/cocoa/cocoawindows.pas | 1 - lcl/interfaces/cocoa/cocoawscomctrls.pas | 2 +- lcl/interfaces/cocoa/cocoawscommon.pas | 2 +- 6 files changed, 5 insertions(+), 6 deletions(-) diff --git a/lcl/interfaces/cocoa/cocoaprivate.pas b/lcl/interfaces/cocoa/cocoaprivate.pas index f3ff457d37..cff888dc34 100644 --- a/lcl/interfaces/cocoa/cocoaprivate.pas +++ b/lcl/interfaces/cocoa/cocoaprivate.pas @@ -603,7 +603,7 @@ end; function getNSStringObject( const aString: id ) : NSString; begin - if aString.isKindOfClass( NSAttributedString.classClass ) then + if aString.isKindOfClass( NSAttributedString ) then Result:= NSAttributedString( aString ).string_ else Result:= NSString( aString ); diff --git a/lcl/interfaces/cocoa/cocoascrollers.pas b/lcl/interfaces/cocoa/cocoascrollers.pas index be398ab109..a00cd55c72 100644 --- a/lcl/interfaces/cocoa/cocoascrollers.pas +++ b/lcl/interfaces/cocoa/cocoascrollers.pas @@ -290,7 +290,7 @@ begin if sc.frame.size.height = 0 then Exit; // do nothing ps := pt.y / sc.frame.size.height; end; - sz := (sc.maxInt - sc.minInt - sc.pageInt);; + sz := (sc.maxInt - sc.minInt - sc.pageInt); newPos := Round(sc.minInt + sz * ps); sc.lclSetPos(NewPos); end; diff --git a/lcl/interfaces/cocoa/cocoawinapi.inc b/lcl/interfaces/cocoa/cocoawinapi.inc index 3db4d21eb0..9ae02f9822 100644 --- a/lcl/interfaces/cocoa/cocoawinapi.inc +++ b/lcl/interfaces/cocoa/cocoawinapi.inc @@ -2726,7 +2726,7 @@ begin SM_LCLHasFormAlphaBlend: Result := 1; else - DebugLn('TCocoaWidgetSet.GetSystemMetrics TODO ', DbgS(NIndex));; + DebugLn('TCocoaWidgetSet.GetSystemMetrics TODO ', DbgS(NIndex)); end; {$IFDEF VerboseWinAPI} diff --git a/lcl/interfaces/cocoa/cocoawindows.pas b/lcl/interfaces/cocoa/cocoawindows.pas index c0e12e00b2..6a42659c0f 100644 --- a/lcl/interfaces/cocoa/cocoawindows.pas +++ b/lcl/interfaces/cocoa/cocoawindows.pas @@ -1059,7 +1059,6 @@ end; // between LCL and COCOA, see also: // https://wiki.lazarus.freepascal.org/Cocoa_Internals/Application#Focus_Change // 4. makeFirstResponder() is Reentrant and Thread-safe -// function TCocoaWindow.makeFirstResponder( aResponder : NSResponder ): ObjCBOOL; var lastResponder : NSResponder; diff --git a/lcl/interfaces/cocoa/cocoawscomctrls.pas b/lcl/interfaces/cocoa/cocoawscomctrls.pas index 42e458c53b..a57893046a 100644 --- a/lcl/interfaces/cocoa/cocoawscomctrls.pas +++ b/lcl/interfaces/cocoa/cocoawscomctrls.pas @@ -1051,7 +1051,7 @@ begin sz := lTableLV.intercellSpacing; // Windows compatibility. on Windows there's no extra space between columns sz.width := 0; - lTableLV.setIntercellSpacing(sz);; + lTableLV.setIntercellSpacing(sz); lTableLV.release; {$IFDEF COCOA_DEBUG_LISTVIEW} WriteLn(Format('[TCocoaWSCustomListView.CreateHandle] headerView=%d', [PtrInt(lTableLV.headerView)])); diff --git a/lcl/interfaces/cocoa/cocoawscommon.pas b/lcl/interfaces/cocoa/cocoawscommon.pas index 4169358cb2..8d0d8f5a11 100644 --- a/lcl/interfaces/cocoa/cocoawscommon.pas +++ b/lcl/interfaces/cocoa/cocoawscommon.pas @@ -402,7 +402,7 @@ var control: TControl; begin GetCursorPos(P); - control:= FindControlAtPosition(P, true);; + control:= FindControlAtPosition(P, true); if Assigned(control) then TCocoaCursor(Screen.Cursors[control.Cursor]).SetCursor; end;