mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-08-13 23:09:38 +02:00
cocoa: update override of setDocumentView() method to be compatible with fpc prior to and after fpc3.2
git-svn-id: trunk@63028 -
This commit is contained in:
parent
38e5ac1a28
commit
7125b6ce7e
@ -31,6 +31,7 @@ uses
|
|||||||
cocoa_extra, CocoaPrivate;
|
cocoa_extra, CocoaPrivate;
|
||||||
|
|
||||||
type
|
type
|
||||||
|
TSetDocumentViewType = {$if FPC_FULLVERSION = 30200}id{$else}NSView{$endif};
|
||||||
|
|
||||||
{ TCocoaScrollView }
|
{ TCocoaScrollView }
|
||||||
|
|
||||||
@ -50,9 +51,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: TSetDocumentViewType); 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 +647,7 @@ begin
|
|||||||
Result:=documentView;
|
Result:=documentView;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
procedure TCocoaScrollView.setDocumentView(aView: {$if FPC_FULLVERSION < 30200}NSView{$else}id{$endif});
|
procedure TCocoaScrollView.setDocumentView(aView: TSetDocumentViewType);
|
||||||
begin
|
begin
|
||||||
inherited setDocumentView(aView);
|
inherited setDocumentView(aView);
|
||||||
resetScrollRect;
|
resetScrollRect;
|
||||||
|
Loading…
Reference in New Issue
Block a user