Skip to content

Commit 709fc9d

Browse files
TorwentTorwent
committed
fix: TLazSpinEdit inherited duplicate properties
1 parent 8efde19 commit 709fc9d

File tree

1 file changed

+25
-26
lines changed

1 file changed

+25
-26
lines changed

‎Source/script/imports/lcl/simba.import_lcl_misc.pas‎

Lines changed: 25 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -41,54 +41,54 @@ implementation
4141
PPanelButtons = ^TPanelButtons;
4242
PControl = ^TControl;
4343

44-
procedure _LapeCustomFloatSpinEdit_DecimalPlaces_Read(const Params: PParamArray; const Result: Pointer); LAPE_WRAPPER_CALLING_CONV
44+
procedure _LapeFloatSpinEdit_DecimalPlaces_Read(const Params: PParamArray; const Result: Pointer); LAPE_WRAPPER_CALLING_CONV
4545
begin
46-
PInteger(Result)^ := PCustomFloatSpinEdit(Params^[0])^.DecimalPlaces;
46+
PInteger(Result)^ := PFloatSpinEdit(Params^[0])^.DecimalPlaces;
4747
end;
4848

49-
procedure _LapeCustomFloatSpinEdit_DecimalPlaces_Write(const Params: PParamArray); LAPE_WRAPPER_CALLING_CONV
49+
procedure _LapeFloatSpinEdit_DecimalPlaces_Write(const Params: PParamArray); LAPE_WRAPPER_CALLING_CONV
5050
begin
51-
PCustomFloatSpinEdit(Params^[0])^.DecimalPlaces := PInteger(Params^[1])^;
51+
PFloatSpinEdit(Params^[0])^.DecimalPlaces := PInteger(Params^[1])^;
5252
end;
5353

54-
procedure _LapeCustomFloatSpinEdit_Increment_Read(const Params: PParamArray; const Result: Pointer); LAPE_WRAPPER_CALLING_CONV
54+
procedure _LapeFloatSpinEdit_Increment_Read(const Params: PParamArray; const Result: Pointer); LAPE_WRAPPER_CALLING_CONV
5555
begin
56-
PDouble(Result)^ := PCustomFloatSpinEdit(Params^[0])^.Increment;
56+
PDouble(Result)^ := PFloatSpinEdit(Params^[0])^.Increment;
5757
end;
5858

59-
procedure _LapeCustomFloatSpinEdit_Increment_Write(const Params: PParamArray); LAPE_WRAPPER_CALLING_CONV
59+
procedure _LapeFloatSpinEdit_Increment_Write(const Params: PParamArray); LAPE_WRAPPER_CALLING_CONV
6060
begin
61-
PCustomFloatSpinEdit(Params^[0])^.Increment := PDouble(Params^[1])^;
61+
PFloatSpinEdit(Params^[0])^.Increment := PDouble(Params^[1])^;
6262
end;
6363

64-
procedure _LapeCustomFloatSpinEdit_MinValue_Read(const Params: PParamArray; const Result: Pointer); LAPE_WRAPPER_CALLING_CONV
64+
procedure _LapeFloatSpinEdit_MinValue_Read(const Params: PParamArray; const Result: Pointer); LAPE_WRAPPER_CALLING_CONV
6565
begin
66-
PDouble(Result)^ := PCustomFloatSpinEdit(Params^[0])^.MinValue;
66+
PDouble(Result)^ := PFloatSpinEdit(Params^[0])^.MinValue;
6767
end;
6868

69-
procedure _LapeCustomFloatSpinEdit_MinValue_Write(const Params: PParamArray); LAPE_WRAPPER_CALLING_CONV
69+
procedure _LapeFloatSpinEdit_MinValue_Write(const Params: PParamArray); LAPE_WRAPPER_CALLING_CONV
7070
begin
71-
PCustomFloatSpinEdit(Params^[0])^.MinValue := PDouble(Params^[1])^;
71+
PFloatSpinEdit(Params^[0])^.MinValue := PDouble(Params^[1])^;
7272
end;
7373

74-
procedure _LapeCustomFloatSpinEdit_MaxValue_Read(const Params: PParamArray; const Result: Pointer); LAPE_WRAPPER_CALLING_CONV
74+
procedure _LapeFloatSpinEdit_MaxValue_Read(const Params: PParamArray; const Result: Pointer); LAPE_WRAPPER_CALLING_CONV
7575
begin
76-
PDouble(Result)^ := PCustomFloatSpinEdit(Params^[0])^.MaxValue;
76+
PDouble(Result)^ := PFloatSpinEdit(Params^[0])^.MaxValue;
7777
end;
7878

79-
procedure _LapeCustomFloatSpinEdit_MaxValue_Write(const Params: PParamArray); LAPE_WRAPPER_CALLING_CONV
79+
procedure _LapeFloatSpinEdit_MaxValue_Write(const Params: PParamArray); LAPE_WRAPPER_CALLING_CONV
8080
begin
81-
PCustomFloatSpinEdit(Params^[0])^.MaxValue := PDouble(Params^[1])^;
81+
PFloatSpinEdit(Params^[0])^.MaxValue := PDouble(Params^[1])^;
8282
end;
8383

84-
procedure _LapeCustomFloatSpinEdit_Value_Read(const Params: PParamArray; const Result: Pointer); LAPE_WRAPPER_CALLING_CONV
84+
procedure _LapeFloatSpinEdit_Value_Read(const Params: PParamArray; const Result: Pointer); LAPE_WRAPPER_CALLING_CONV
8585
begin
86-
PDouble(Result)^ := PCustomFloatSpinEdit(Params^[0])^.Value;
86+
PDouble(Result)^ := PFloatSpinEdit(Params^[0])^.Value;
8787
end;
8888

89-
procedure _LapeCustomFloatSpinEdit_Value_Write(const Params: PParamArray); LAPE_WRAPPER_CALLING_CONV
89+
procedure _LapeFloatSpinEdit_Value_Write(const Params: PParamArray); LAPE_WRAPPER_CALLING_CONV
9090
begin
91-
PCustomFloatSpinEdit(Params^[0])^.Value := PDouble(Params^[1])^;
91+
PFloatSpinEdit(Params^[0])^.Value := PDouble(Params^[1])^;
9292
end;
9393

9494
procedure _LapeCustomFloatSpinEdit_ValueEmpty_Read(const Params: PParamArray; const Result: Pointer); LAPE_WRAPPER_CALLING_CONV
@@ -804,15 +804,15 @@ procedure ImportLCLMisc(Script: TSimbaScript);
804804
with Script.Compiler do
805805
begin
806806
addClass('TLazCustomFloatSpinEdit', 'TLazCustomEdit', TCustomFloatSpinEdit);
807-
addProperty('TLazCustomFloatSpinEdit', 'DecimalPlaces', 'Integer', @_LapeCustomFloatSpinEdit_DecimalPlaces_Read, @_LapeCustomFloatSpinEdit_DecimalPlaces_Write);
808-
addProperty('TLazCustomFloatSpinEdit', 'Increment', 'Double', @_LapeCustomFloatSpinEdit_Increment_Read, @_LapeCustomFloatSpinEdit_Increment_Write);
809-
addProperty('TLazCustomFloatSpinEdit', 'MinValue', 'Double', @_LapeCustomFloatSpinEdit_MinValue_Read, @_LapeCustomFloatSpinEdit_MinValue_Write);
810-
addProperty('TLazCustomFloatSpinEdit', 'MaxValue', 'Double', @_LapeCustomFloatSpinEdit_MaxValue_Read, @_LapeCustomFloatSpinEdit_MaxValue_Write);
811-
addProperty('TLazCustomFloatSpinEdit', 'Value', 'Double', @_LapeCustomFloatSpinEdit_Value_Read, @_LapeCustomFloatSpinEdit_Value_Write);
812807
addProperty('TLazCustomFloatSpinEdit', 'ValueEmpty', 'Boolean', @_LapeCustomFloatSpinEdit_ValueEmpty_Read, @_LapeCustomFloatSpinEdit_ValueEmpty_Write);
813808
addClassConstructor('TLazCustomFloatSpinEdit', '(TheOwner: TLazComponent)', @_LapeCustomFloatSpinEdit_Create);
814809

815810
addClass('TLazFloatSpinEdit', 'TLazCustomFloatSpinEdit', TFloatSpinEdit);
811+
addProperty('TLazFloatSpinEdit', 'DecimalPlaces', 'Integer', @_LapeFloatSpinEdit_DecimalPlaces_Read, @_LapeFloatSpinEdit_DecimalPlaces_Write);
812+
addProperty('TLazFloatSpinEdit', 'Increment', 'Double', @_LapeFloatSpinEdit_Increment_Read, @_LapeFloatSpinEdit_Increment_Write);
813+
addProperty('TLazFloatSpinEdit', 'MinValue', 'Double', @_LapeFloatSpinEdit_MinValue_Read, @_LapeFloatSpinEdit_MinValue_Write);
814+
addProperty('TLazFloatSpinEdit', 'MaxValue', 'Double', @_LapeFloatSpinEdit_MaxValue_Read, @_LapeFloatSpinEdit_MaxValue_Write);
815+
addProperty('TLazFloatSpinEdit', 'Value', 'Double', @_LapeFloatSpinEdit_Value_Read, @_LapeFloatSpinEdit_Value_Write);
816816
addClassConstructor('TLazFloatSpinEdit', '(TheOwner: TLazComponent)', @_LapeFloatSpinEdit_Create);
817817

818818
addClass('TLazCustomSpinEdit', 'TLazCustomFloatSpinEdit', TCustomSpinEdit);
@@ -825,7 +825,6 @@ procedure ImportLCLMisc(Script: TSimbaScript);
825825
addClass('TLazSpinEdit', 'TLazCustomSpinEdit', TSpinEdit);
826826
addClassConstructor('TLazSpinEdit', '(TheOwner: TLazComponent)', @_LapeSpinEdit_Create);
827827

828-
829828
addClass('TLazDateEdit', 'TLazCustomControl', TDateEdit);
830829
addProperty('TLazDateEdit', 'Date', 'TDateTime', @_LapeDateEdit_Date_Read, @_LapeDateEdit_Date_Write);
831830
addProperty('TLazDateEdit', 'MinDate', 'TDateTime', @_LapeDateEdit_MinDate_Read, @_LapeDateEdit_MinDate_Write);

0 commit comments

Comments
 (0)