paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-13 23:39:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

LazControls: Undo r64326 and r64334, obsolete after recent fixes in fpc (r48089 and r48088 #6c7790212c)

Browse Source 
git-svn-id: trunk@64344 -
This commit is contained in:
wp 2021-01-06 19:06:32 +00:00
parent fafaeaa996
commit 0e725023a2
2 changed files with 6 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
components/lazcontrols/spinex.inc
View File

@ -202,12 +202,12 @@ end;
function TSpinEditExBase.MaxValueStored: Boolean; function TSpinEditExBase.MaxValueStored: Boolean;
begin begin
Result := true; Result := not SameValue(FMaxValue, DefMaxValue);
end; end;
function TSpinEditExBase.MinValueStored: Boolean; function TSpinEditExBase.MinValueStored: Boolean;
begin begin
Result := true; Result := not SameValue(FMinValue, DefMinValue);
end; end;
procedure TSpinEditExBase.EditMouseWheelUp(Shift: TShiftState; procedure TSpinEditExBase.EditMouseWheelUp(Shift: TShiftState;
@ -257,7 +257,7 @@ end;
function TSpinEditExBase.IncrementStored: Boolean; function TSpinEditExBase.IncrementStored: Boolean;
begin begin
Result := true; Result := not SameValue(FIncrement, DefIncrement);
end; end;
function TSpinEditExBase.IsLimited: Boolean; function TSpinEditExBase.IsLimited: Boolean;
@ -478,21 +478,6 @@ begin
inherited EditKeyPress(Key); inherited EditKeyPress(Key);
end; end;
function TCustomFloatSpinEditEx.IncrementStored: Boolean;
begin
Result := not SameValue(FIncrement, DefIncrement);
end;
function TCustomFloatSpinEditEx.MaxValueStored: Boolean;
begin
Result := not SameValue(FMaxValue, DefMaxValue);
end;
function TCustomFloatSpinEditEx.MinValueStored: Boolean;
begin
Result := not SameValue(FMinValue, DefMinValue);
end;
function TCustomFloatSpinEditEx.TextIsNumber(const S: String; out ANumber: Double function TCustomFloatSpinEditEx.TextIsNumber(const S: String; out ANumber: Double
): Boolean; ): Boolean;
begin begin
@ -634,21 +619,6 @@ begin
Result := StringReplace(ValueS, AThousandSeparator, '', [rfReplaceAll]); Result := StringReplace(ValueS, AThousandSeparator, '', [rfReplaceAll]);
end; end;
function TCustomSpinEditEx.IncrementStored: Boolean;
begin
Result := FIncrement <> DefIncrement;
end;
function TCustomSpinEditEx.MaxValueStored: Boolean;
begin
Result := FMaxValue <> DefMaxValue;
end;
function TCustomSpinEditEx.MinValueStored: Boolean;
begin
Result := FMinValue <> DefMinValue;
end;
procedure TCustomSpinEditEx.SetThousandSeparator(AValue: String); procedure TCustomSpinEditEx.SetThousandSeparator(AValue: String);
begin begin
if FThousandSeparator = AValue then Exit; if FThousandSeparator = AValue then Exit;

12
components/lazcontrols/spinex.pp
View File

@ -120,8 +120,11 @@ type
function GetNullValue: T; function GetNullValue: T;
function GetUpDown: TUpDown; function GetUpDown: TUpDown;
function GetValue: T; function GetValue: T;
function IncrementStored: Boolean;
function IsLimited: Boolean; function IsLimited: Boolean;
function IsOutOfLimits(AValue: T): Boolean; function IsOutOfLimits(AValue: T): Boolean;
function MaxValueStored: Boolean;
function MinValueStored: Boolean;
procedure UpdateControl; procedure UpdateControl;
procedure UpDownChangingEx(Sender: TObject; var {%H-}AllowChange: Boolean; procedure UpDownChangingEx(Sender: TObject; var {%H-}AllowChange: Boolean;
{%H-}NewValue: SmallInt; Direction: TUpDownDirection); {%H-}NewValue: SmallInt; Direction: TUpDownDirection);
@ -135,9 +138,6 @@ type
procedure EditKeyDown(var Key: word; Shift: TShiftState); override; procedure EditKeyDown(var Key: word; Shift: TShiftState); override;
procedure EditMouseWheelUp(Shift: TShiftState; MousePos: TPoint; var Handled: Boolean); override; procedure EditMouseWheelUp(Shift: TShiftState; MousePos: TPoint; var Handled: Boolean); override;
procedure EditMouseWheelDown(Shift: TShiftState; MousePos: TPoint; var Handled: Boolean); override; procedure EditMouseWheelDown(Shift: TShiftState; MousePos: TPoint; var Handled: Boolean); override;
function IncrementStored: Boolean; virtual;
function MaxValueStored: Boolean; virtual;
function MinValueStored: Boolean; virtual;
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;
procedure SetValue(const AValue: T); virtual; procedure SetValue(const AValue: T); virtual;
@ -204,9 +204,6 @@ type
protected protected
function GetFormatsettings: TFormatSettings; function GetFormatsettings: TFormatSettings;
procedure EditKeyPress(var Key: char); override; procedure EditKeyPress(var Key: char); override;
function IncrementStored: Boolean; override;
function MaxValuestored: Boolean; override;
function MinValuestored: Boolean; override;
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;
@ -319,9 +316,6 @@ type
FThousandSeparator: String; FThousandSeparator: String;
procedure SetThousandSeparator(AValue: String); procedure SetThousandSeparator(AValue: String);
protected protected
function IncrementStored: Boolean; override;
function MaxValuestored: Boolean; override;
function MinValuestored: Boolean; override;
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 TextIsNumber(const S: String; out ANumber: Int64): Boolean; override; function TextIsNumber(const S: String; out ANumber: Int64): Boolean; override;