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

MaskEdit: rename a private methods and it's associated field, since the old names might be confusing after r64863 #2a08f9594b.

Browse Source 
git-svn-id: trunk@64864 -
This commit is contained in:
bart 2021-03-23 17:40:33 +00:00
parent 2a08f9594b
commit 5d98b3c2f6
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lcl/maskedit.pp
View File

@ -186,7 +186,7 @@ const
TCustomMaskEdit = Class(TCustomEdit) TCustomMaskEdit = Class(TCustomEdit)
private private
FRealMask : String; // Real mask inserted FRealEditMask : String; // Real EditMask inserted
FMask : TInternalMask; // Actual internal mask FMask : TInternalMask; // Actual internal mask
FMaskLength : Integer; // Length of internal mask FMaskLength : Integer; // Length of internal mask
FFirstFreePos : Integer; // First position where user can enter text (it is 1-based) FFirstFreePos : Integer; // First position where user can enter text (it is 1-based)
@ -215,7 +215,7 @@ const
procedure AddToMask(AMaskType: TMaskedType); procedure AddToMask(AMaskType: TMaskedType);
function GetModified: Boolean; function GetModified: Boolean;
function GetMask(Index: Integer): TIntMaskRec; //use this to read FMask values function GetMask(Index: Integer): TIntMaskRec; //use this to read FMask values
procedure SetMask(Value : String); procedure SetEditMask(Value : String);
function GetIsMasked : Boolean; function GetIsMasked : Boolean;
procedure SetModified(AValue: Boolean); procedure SetModified(AValue: Boolean);
procedure SetSpaceChar(Value : Char); procedure SetSpaceChar(Value : Char);
@ -283,7 +283,7 @@ const
property IsMasked: Boolean read GetIsMasked; property IsMasked: Boolean read GetIsMasked;
property SpaceChar: Char read FSpaceChar write SetSpaceChar; property SpaceChar: Char read FSpaceChar write SetSpaceChar;
property MaxLength: Integer read GetMaxLength write SetMaxLength; property MaxLength: Integer read GetMaxLength write SetMaxLength;
property EditMask: string read FRealMask write SetMask; property EditMask: string read FRealEditMask write SetEditMask;
property ValidationErrorMode: TMaskEditValidationErrorMode read FValidationErrorMode write FValidationErrorMode default mvemException; experimental; property ValidationErrorMode: TMaskEditValidationErrorMode read FValidationErrorMode write FValidationErrorMode default mvemException; experimental;
public public
procedure CutToClipBoard; override; procedure CutToClipBoard; override;
@ -502,7 +502,7 @@ begin
FSettingInitialText := False; FSettingInitialText := False;
FTextChangedBySetText := False; FTextChangedBySetText := False;
FInRealSetTextWhileMasked := False; FInRealSetTextWhileMasked := False;
FRealMask := ''; FRealEditMask := '';
ClearInternalMask(FMask, FMaskLength); ClearInternalMask(FMask, FMaskLength);
ClearInternalMask(FSavedMask, FSavedMaskLength); ClearInternalMask(FSavedMask, FSavedMaskLength);
FSpaceChar := '_'; FSpaceChar := '_';
@ -575,7 +575,7 @@ begin
end; end;
// Prepare the real internal Mask // Prepare the real internal Mask
procedure TCustomMaskEdit.SetMask(Value : String); procedure TCustomMaskEdit.SetEditMask(Value : String);
Var Var
S : ShortString; S : ShortString;
I : Integer; I : Integer;
@ -589,15 +589,15 @@ begin
FInitialMask := Value; FInitialMask := Value;
Exit; Exit;
end; end;
if FRealMask <> Value then if FRealEditMask <> Value then
begin begin
FRealMask := Value; FRealEditMask := Value;
FValidationFailed := False; FValidationFailed := False;
FMaskIsPushed := False; FMaskIsPushed := False;
ClearInternalMask(FMask, FMaskLength); ClearInternalMask(FMask, FMaskLength);
ClearInternalMask(FSavedMask, FSavedMaskLength); ClearInternalMask(FSavedMask, FSavedMaskLength);
SplitEditMask(FRealMask, Value, FMaskSave, FSpaceChar); SplitEditMask(FRealEditMask, Value, FMaskSave, FSpaceChar);
// Construct Actual Internal Mask // Construct Actual Internal Mask
// init // init
@ -1765,7 +1765,7 @@ procedure TCustomMaskEdit.Loaded;
begin begin
inherited Loaded; inherited Loaded;
FSettingInitialText := True; FSettingInitialText := True;
if (FInitialMask <> '') then SetMask(FInitialMask); if (FInitialMask <> '') then SetEditMask(FInitialMask);
if (FInitialText <> '') then SetTextApplyMask(FInitialText); if (FInitialText <> '') then SetTextApplyMask(FInitialText);
FSettingInitialText := False; FSettingInitialText := False;
end; end;