paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-05-11 22:42:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

LazControls/SpinEditExBase: Fix compilation issue with FPC 3.2.0. Issue #39491.

Browse Source
This commit is contained in:
wp_xyz 2021-11-27 11:18:08 +01:00
parent c301731931
commit 7f45938388
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
components/lazcontrols/spinex.inc
View File

@ -237,13 +237,6 @@ begin
SpinUpDown(False); SpinUpDown(False);
end; end;
{ This is added as a virtual method because the 64-bit compiler on Windows cannot
determine which overloaded function to call when T is Currency. }
function TSpinEditExBase.SameValue(AValue1, AValue2: T): Boolean;
begin
Result := Math.SameValue(AValue1, AValue2);
end;
procedure TSpinEditExBase.SetValue(const AValue: T); procedure TSpinEditExBase.SetValue(const AValue: T);
var var
ValueFromText: T; ValueFromText: T;
@ -531,6 +524,11 @@ begin
Result := AValue - FIncrement; Result := AValue - FIncrement;
end; end;
function TCustomFloatSpinEditEx.SameValue(AValue1, AValue2: Double): Boolean;
begin
Result := Math.SameValue(AValue1, AValue2);
end;
procedure TCustomFloatSpinEditEx.SetDecimals(ADecimals: Integer); procedure TCustomFloatSpinEditEx.SetDecimals(ADecimals: Integer);
begin begin
if (FDecimals = ADecimals) or (ADecimals < 0) then Exit; if (FDecimals = ADecimals) or (ADecimals < 0) then Exit;
@ -664,6 +662,11 @@ begin
Result := AValue - FIncrement; Result := AValue - FIncrement;
end; end;
function TCustomSpinEditEx.SameValue(AValue1, AValue2: Int64): Boolean;
begin
Result := (AValue1 = AValue2);
end;
function TCustomSpinEditEx.TextIsNumber(const S: String; out ANumber: Int64 function TCustomSpinEditEx.TextIsNumber(const S: String; out ANumber: Int64
): Boolean; ): Boolean;
var var

4
components/lazcontrols/spinex.pp
View File

@ -141,7 +141,7 @@ type
procedure EditMouseWheelDown(Shift: TShiftState; MousePos: TPoint; var Handled: Boolean); override; procedure EditMouseWheelDown(Shift: TShiftState; MousePos: TPoint; var Handled: Boolean); override;
function SafeInc(AValue: T): T; virtual; abstract; function SafeInc(AValue: T): T; virtual; abstract;
function SafeDec(AValue: T): T; virtual abstract; function SafeDec(AValue: T): T; virtual abstract;
function SameValue(AValue1, AValue2: T): boolean; virtual; function SameValue(AValue1, AValue2: T): boolean; virtual; abstract;
procedure SetValue(const AValue: T); virtual; procedure SetValue(const AValue: T); virtual;
procedure SetNullValue(AValue: T); virtual; procedure SetNullValue(AValue: T); virtual;
procedure SetMaxValue(const AValue: T); virtual; procedure SetMaxValue(const AValue: T); virtual;
@ -209,6 +209,7 @@ type
function TextIsNumber(const S: String; out ANumber: Double): Boolean; override; function TextIsNumber(const S: String; out ANumber: Double): Boolean; override;
function SafeInc(AValue: Double): Double; override; function SafeInc(AValue: Double): Double; override;
function SafeDec(AValue: Double): Double; override; function SafeDec(AValue: Double): Double; override;
function SameValue(AValue1, AValue2: Double): Boolean; override;
procedure SetDecimals(ADecimals: Integer); virtual; procedure SetDecimals(ADecimals: Integer); virtual;
public public
function ValueToStr(const AValue: Double): String; override; function ValueToStr(const AValue: Double): String; override;
@ -320,6 +321,7 @@ type
protected protected
function SafeInc(AValue: Int64): Int64; override; function SafeInc(AValue: Int64): Int64; override;
function SafeDec(AValue: Int64): Int64; override; function SafeDec(AValue: Int64): Int64; override;
function SameValue(AValue1, AValue2: Int64): Boolean; override;
function TextIsNumber(const S: String; out ANumber: Int64): Boolean; override; function TextIsNumber(const S: String; out ANumber: Int64): Boolean; override;
public public
function ValueToStr(const AValue: Int64): String; override; function ValueToStr(const AValue: Int64): String; override;