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

Merged revision(s) 63028 #7125b6ce7e, 63409 #1912324bc7 from trunk:

Browse Source 
cocoa: update override of setDocumentView() method to be compatible with fpc prior to and after fpc3.2
........
cocoa: fix compilation for the newly released fpc3.2.0
........

git-svn-id: branches/fixes_2_0@63418 -
This commit is contained in:
dmitry 2020-06-22 02:32:58 +00:00
parent 27188db548
commit a1b4ea9057
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,7 +31,6 @@ uses
cocoa_extra, CocoaPrivate; cocoa_extra, CocoaPrivate;
type type
{ TCocoaScrollView } { TCocoaScrollView }
TCocoaScrollView = objcclass(NSScrollView) TCocoaScrollView = objcclass(NSScrollView)
@ -50,9 +49,7 @@ type
procedure resetCursorRects; override; procedure resetCursorRects; override;
function lclClientFrame: TRect; override; function lclClientFrame: TRect; override;
function lclContentView: NSView; override; function lclContentView: NSView; override;
procedure setDocumentView(aView: procedure setDocumentView(aView: NSView); override;
{$if FPC_FULLVERSION < 30200}NSView{$else}id{$endif}
); override;
procedure scrollContentViewBoundsChanged(notify: NSNotification); message 'scrollContentViewBoundsChanged:'; procedure scrollContentViewBoundsChanged(notify: NSNotification); message 'scrollContentViewBoundsChanged:';
procedure resetScrollRect; message 'resetScrollRect'; procedure resetScrollRect; message 'resetScrollRect';
@ -648,7 +645,7 @@ begin
Result:=documentView; Result:=documentView;
end; end;
procedure TCocoaScrollView.setDocumentView(aView: {$if FPC_FULLVERSION < 30200}NSView{$else}id{$endif}); procedure TCocoaScrollView.setDocumentView(aView: NSView);
begin begin
inherited setDocumentView(aView); inherited setDocumentView(aView);
resetScrollRect; resetScrollRect;