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

cocoa: fix compilation for fpc320rc1 headers. bug #36864

Browse Source 
git-svn-id: trunk@62885 -
This commit is contained in:
dmitry 2020-04-05 03:47:06 +00:00
parent a43056f291
commit e1d1474d82
8 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lcl/interfaces/cocoa/cocoa_extra.pas
View File

@ -74,7 +74,7 @@ type
procedure setEnabled_(aenabled: ObjCBool); message 'setEnabled:'; procedure setEnabled_(aenabled: ObjCBool); message 'setEnabled:';
end; end;
{$if FPC_FULLVERSION < 30301} {$if FPC_FULLVERSION < 30200}
NSAppearance = objcclass external(NSObject) NSAppearance = objcclass external(NSObject)
function name: NSString; message 'name'; function name: NSString; message 'name';
class function currentAppearance: NSAppearance; message 'currentAppearance'; class function currentAppearance: NSAppearance; message 'currentAppearance';
@ -299,6 +299,14 @@ const
NSTableViewAnimationSlideLeft = $30; // Animates a row in by sliding from the left. Animates a row out by sliding towards the left. NSTableViewAnimationSlideLeft = $30; // Animates a row in by sliding from the left. Animates a row out by sliding towards the left.
NSTableViewAnimationSlideRight = $40; // Animates a row in by sliding from the right. Animates a row out by sliding towards the right. NSTableViewAnimationSlideRight = $40; // Animates a row in by sliding from the right. Animates a row out by sliding towards the right.
{$if FPC_FULLVERSION >= 30200}
// all of the sudden those are gone! in FPC 3.2.0rc
const
NSVariableStatusItemLength = -1;
NSSquareStatusItemLength = -2;
{$endif}
implementation implementation
function NSNormalWindowLevel: NSInteger; function NSNormalWindowLevel: NSInteger;

2
lcl/interfaces/cocoa/cocoalclintf.inc
View File

@ -285,7 +285,7 @@ begin
Continue; Continue;
end; end;
aButton := anAlert.addButtonWithTitle(NSLocalizedString(NSSTR(ButtonCaption[Buttons[I]]))); aButton := anAlert.addButtonWithTitle(NSSTR(ButtonCaption[Buttons[I]]));
aButton.setKeyEquivalentModifierMask(0); aButton.setKeyEquivalentModifierMask(0);
if I = DefaultIndex then if I = DefaultIndex then

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

@ -1549,7 +1549,7 @@ begin
mn := GetManTicks(self); mn := GetManTicks(self);
if mn.AddTick(atick) then if mn.AddTick(atick) then
begin begin
if mn.draw then self.setNeedsDisplay; if mn.draw then self.setNeedsDisplay_(true);
end; end;
end; end;
@ -1560,7 +1560,7 @@ begin
mn := GetManTicks(self); mn := GetManTicks(self);
if mn.draw=adraw then Exit; if mn.draw=adraw then Exit;
mn.draw:=adraw; mn.draw:=adraw;
self.setNeedsDisplay; self.setNeedsDisplay_(true);
end; end;
procedure TCocoaSlider.lclExpectedKeys(var wantTabs, wantArrows, wantReturn, procedure TCocoaSlider.lclExpectedKeys(var wantTabs, wantArrows, wantReturn,

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

@ -50,7 +50,9 @@ 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: NSView); override; procedure setDocumentView(aView:
{$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';
@ -646,7 +648,7 @@ begin
Result:=documentView; Result:=documentView;
end; end;
procedure TCocoaScrollView.setDocumentView(aView: NSView); procedure TCocoaScrollView.setDocumentView(aView: {$if FPC_FULLVERSION < 30200}NSView{$else}id{$endif});
begin begin
inherited setDocumentView(aView); inherited setDocumentView(aView);
resetScrollRect; resetScrollRect;

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

@ -233,8 +233,8 @@ type
procedure setCheckAction(aSelector: SEL); message 'setCheckAction:'; procedure setCheckAction(aSelector: SEL); message 'setCheckAction:';
procedure setTextAction(aSelector: SEL); message 'setTextAction:'; procedure setTextAction(aSelector: SEL); message 'setTextAction:';
procedure resizeSubviewsWithOldSize(oldSize: NSSize); override; procedure resizeSubviewsWithOldSize(oldSize: NSSize); override;
procedure setIdentifier(identifier_: NSString); message 'setIdentifier:'; {$if FPC_FULLVERSION >= 30300}override;{$endif} procedure setIdentifier(identifier_: NSString); message 'setIdentifier:'; {$if FPC_FULLVERSION >= 30200}override;{$endif}
function identifier: NSString; message 'identifier'; {$if FPC_FULLVERSION >= 30300}override;{$endif} function identifier: NSString; message 'identifier'; {$if FPC_FULLVERSION >= 30200}override;{$endif}
function textFrame: NSRect; message 'textFrame'; function textFrame: NSRect; message 'textFrame';
procedure lclSetEnabled(AEnabled: Boolean); override; procedure lclSetEnabled(AEnabled: Boolean); override;
end; end;

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

@ -1041,7 +1041,7 @@ end;
procedure TCocoaWindowContentDocument.setNeedsDisplay_(aflag: LCLObjCBoolean); procedure TCocoaWindowContentDocument.setNeedsDisplay_(aflag: LCLObjCBoolean);
begin begin
inherited setNeedsDisplay; inherited setNeedsDisplay_(aflag);
if Assigned(overlay) then overlay.setNeedsDisplay_(aflag); if Assigned(overlay) then overlay.setNeedsDisplay_(aflag);
end; end;

2
lcl/interfaces/cocoa/cocoawscomctrls.pas
View File

@ -2091,7 +2091,7 @@ begin
lSlider.setTickMarkPosition(NSTickMarkAbove) lSlider.setTickMarkPosition(NSTickMarkAbove)
else else
lSlider.setTickMarkPosition(NSTickMarkBelow); lSlider.setTickMarkPosition(NSTickMarkBelow);
lSlider.setNeedsDisplay; lSlider.setNeedsDisplay_(true);
end; end;
{------------------------------------------------------------------------------ {------------------------------------------------------------------------------

2
lcl/interfaces/cocoa/cocoawsstdctrls.pas
View File

@ -2270,7 +2270,7 @@ var
begin begin
view := GetListBox(ACustomListBox); view := GetListBox(ACustomListBox);
ListBoxSetStyle(view, TCustomListBox(ACustomListBox).Style); ListBoxSetStyle(view, TCustomListBox(ACustomListBox).Style);
view.setNeedsDisplay; view.setNeedsDisplay_(true);
end; end;
class procedure TCocoaWSCustomListBox.SetTopIndex(const ACustomListBox: TCustomListBox; const NewTopIndex: integer); class procedure TCocoaWSCustomListBox.SetTopIndex(const ACustomListBox: TCustomListBox; const NewTopIndex: integer);