From fc3071a2768944932d5d3b842c8db01546da492f Mon Sep 17 00:00:00 2001
From: rich2014 <rich2014.git@outlook.com>
Date: Sun, 17 Dec 2023 18:08:01 +0800
Subject: [PATCH] Cocoa/Scroller: replace deprecated functions

---
 lcl/interfaces/cocoa/cocoascrollers.pas | 6 ++++--
 lcl/interfaces/cocoa/cocoawinapi.inc    | 8 ++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/lcl/interfaces/cocoa/cocoascrollers.pas b/lcl/interfaces/cocoa/cocoascrollers.pas
index b2288784b7..2d42495e23 100644
--- a/lcl/interfaces/cocoa/cocoascrollers.pas
+++ b/lcl/interfaces/cocoa/cocoascrollers.pas
@@ -569,7 +569,8 @@ begin
   else
   begin
     f := frame;
-    w := NSScroller.scrollerWidth;
+    w := NSScroller.scrollerWidthForControlSize_scrollerStyle(
+           fhscroll.controlSize, fhscroll.preferredScrollerStyle);
     r := NSMakeRect(0, 0, Max(f.size.width,w+1), w); // width<height to create a horizontal scroller
     allocScroller( self, fhscroll, r, avisible);
     fhscroll.setAutoresizingMask(NSViewWidthSizable);
@@ -588,7 +589,8 @@ begin
   else
   begin
     f := frame;
-    w := NSScroller.scrollerWidth;
+    w := NSScroller.scrollerWidthForControlSize_scrollerStyle(
+           fvscroll.controlSize, fvscroll.preferredScrollerStyle);
     r := NSMakeRect(0, 0, w, Max(f.size.height,w+1)); // height<width to create a vertical scroller
     allocScroller( self, fvscroll, r, avisible);
     fvscroll.setAutoresizingMask(NSViewHeightSizable or NSViewMinXMargin);
diff --git a/lcl/interfaces/cocoa/cocoawinapi.inc b/lcl/interfaces/cocoa/cocoawinapi.inc
index 520180ad47..a40b5a35c9 100644
--- a/lcl/interfaces/cocoa/cocoawinapi.inc
+++ b/lcl/interfaces/cocoa/cocoawinapi.inc
@@ -1548,10 +1548,10 @@ begin
     else if (BarKind = SB_Horz) and Assigned(NSScrollView(obj).horizontalScroller) then
       Result:=round(NSScrollView(obj).verticalScroller.frame.size.height)
     else
-      Result := Round(NSScroller.scrollerWidth);
+      Result := GetSystemMetrics(SM_CXVSCROLL);
   end
   else
-    Result := Round(NSScroller.scrollerWidth);
+    Result := GetSystemMetrics(SM_CXVSCROLL);
 end;
 
 function TCocoaWidgetSet.GetScrollbarVisible(Handle: HWND; SBStyle: Integer): boolean;
@@ -2601,7 +2601,7 @@ begin
     SM_CYHSCROLL,
     SM_CXVSCROLL,
     SM_CYVSCROLL:
-      Result := Round(NSScroller.scrollerWidthForControlSize(NSRegularControlSize));
+      Result := Round(NSScroller.scrollerWidthForControlSize_scrollerStyle(NSRegularControlSize, NSScrollerStyleLegacy));
     SM_CXSCREEN,
     SM_CXFULLSCREEN:
       Result := Round(NSPrimaryScreenFrame.size.width);
@@ -2631,7 +2631,7 @@ begin
       end;
     SM_CXDRAG,SM_CYDRAG: Result := 5;
     SM_CXHTHUMB, SM_CYVTHUMB:
-      Result := Round(NSScroller.scrollerWidthForControlSize(NSRegularControlSize));
+      Result := Round(NSScroller.scrollerWidthForControlSize_scrollerStyle(NSRegularControlSize, NSScrollerStyleLegacy));
     SM_SWSCROLLBARSPACING:
       Result := 0;
     SM_LCLHasFormAlphaBlend: