Skip to content

Commit c199675

Browse files
committed
remove (scoped) enum element prefixes in lcl imports
1 parent 8a3f9ea commit c199675

File tree

4 files changed

+19
-19
lines changed

4 files changed

+19
-19
lines changed

Source/script/imports/lcl/simba.import_lcl_controls.pas

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -893,7 +893,7 @@ procedure ImportLCLControls(Script: TSimbaScript);
893893
addGlobalType('enum(Top, Left, Right, Bottom)', 'ELazAnchorKind');
894894
addGlobalType('set of ELazAnchorKind', 'ELazAnchors');
895895

896-
addGlobalType('enum(asrTop, asrBottom, asrCenter)', 'ELazAnchorSideReference');
896+
addGlobalType('enum(Top, Bottom, Center)', 'ELazAnchorSideReference');
897897
addGlobalType('procedure(Sender: TLazObject; var Key: Int16; Shift: ELazShiftStates) of object', 'TLazKeyEvent', FFI_DEFAULT_ABI);
898898
addGlobalType('procedure(Sender: TLazObject; var Key: Char) of object', 'TLazKeyPressEvent', FFI_DEFAULT_ABI);
899899
addGlobalType('procedure(Sender: TLazObject; Button: ELazMouseButton; Shift: ELazShiftStates; X, Y: Integer) of object', 'TLazMouseEvent', FFI_DEFAULT_ABI);

Source/script/imports/lcl/simba.import_lcl_graphics.pas

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -762,16 +762,16 @@ procedure ImportLCLGraphics(Script: TSimbaScript);
762762
begin
763763
with Script.Compiler do
764764
begin
765-
addGlobalType('record Left, Top ,Right, Bottom: Integer; end', 'TLazRect');
766-
addGlobalType('enum(fqDefault, fqDraft, fqProof, fqNonAntialiased, fqAntialiased, fqCleartype, fqCleartypeNatural)', 'ELazFontQuality');
767-
addGlobalType('set of enum(fsBold, fsItalic, fsStrikeOut, fsUnderline)', 'ELazFontStyles');
768-
addGlobalType('enum(fpDefault, fpVariable, fpFixed)', 'ELazFontPitch');
769-
addGlobalType('enum(psSolid, psDash, psDot, psDashDot, psDashDotDot, psInsideFrame, psPattern, psClear)', 'ELazPenStyle');
770-
addGlobalType('enum(pmBlack, pmWhite, pmNop, pmNot, pmCopy, pmNotCopy, pmMergePenNot, pmMaskPenNot, pmMergeNotPen, pmMaskNotPen, pmMerge, pmNotMerge, pmMask, pmNotMask, pmXor, pmNotXor)', 'ELazPenMode');
771-
addGlobalType('enum(bsSolid, bsClear, bsHorizontal, bsVertical, bsFDiagonal, bsBDiagonal, bsCross, bsDiagCross, bsImage, bsPattern)', 'ELazBrushStyle');
772-
addGlobalType('enum(tmAuto, tmFixed)', 'ELazTransparentMode');
773-
addGlobalType('enum(amDontCare, amOn, amOff)', 'ELazAntialiasingMode');
774-
addGlobalType('enum(tlTop, tlCenter, tlBottom)', 'ELazTextLayout');
765+
addGlobalType('record Left, Top, Right, Bottom: Integer; end', 'TLazRect');
766+
addGlobalType('enum(Default, Draft, Proof, NonAntialiased, Antialiased, Cleartype, CleartypeNatural)', 'ELazFontQuality');
767+
addGlobalType('set of enum(Bold, Italic, StrikeOut, Underline)', 'ELazFontStyles');
768+
addGlobalType('enum(Default, Variable, Fixed)', 'ELazFontPitch');
769+
addGlobalType('enum(Solid, Dash, Dot, DashDot, DashDotDot, InsideFrame, Pattern, Clear)', 'ELazPenStyle');
770+
addGlobalType('enum(Black, White, Nop, Nott, Copy, NotCopy, MergePenNot, MaskPenNot, MergeNotPen, MaskNotPen, Merge, NotMerge, Mask, NotMask, Xorr, NotXor)', 'ELazPenMode');
771+
addGlobalType('enum(Solid, Clear, Horizontal, Vertical, FDiagonal, BDiagonal, Cross, DiagCross, Image, Pattern)', 'ELazBrushStyle');
772+
addGlobalType('enum(Auto, Fixed)', 'ELazTransparentMode');
773+
addGlobalType('enum(DontCare, On, Off)', 'ELazAntialiasingMode');
774+
addGlobalType('enum(Top, Center, Bottom)', 'ELazTextLayout');
775775

776776
addClass('TLazGraphicsObject', 'TLazObject', TGraphicsObject);
777777
addProperty('TLazGraphicsObject', 'OnChanging', 'TLazNotifyEvent', @_LapeGraphicsObject_OnChanging_Read, @_LapeGraphicsObject_OnChanging_Write);

Source/script/imports/lcl/simba.import_lcl_stdctrls.pas

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1141,13 +1141,13 @@ procedure ImportLCLStdCtrls(Script: TSimbaScript);
11411141
begin
11421142
with Script.Compiler do
11431143
begin
1144-
addGlobalType('enum(ssNone, ssHorizontal, ssVertical, ssBoth, ssAutoHorizontal, ssAutoVertical, ssAutoBoth)', 'ELazScrollStyle');
1145-
addGlobalType('set of enum(odSelected, odGrayed, odDisabled, odChecked, odFocused, odDefault, odHotLight, odInactive, odNoAccel, odNoFocusRect, odReserved1, odReserved2, odComboBoxEdit, odBackgroundPainted)', 'ELazOwnerDrawStates');
1146-
addGlobalType('enum(csDropDown, csSimple, csDropDownList, csOwnerDrawFixed, csOwnerDrawVariable, csOwnerDrawEditableFixed, csOwnerDrawEditableVariable)', 'ELazComboBoxStyle');
1147-
addGlobalType('enum(lbStandard, lbOwnerDrawFixed, lbOwnerDrawVariable, lbVirtual)', 'ELazListBoxStyle');
1148-
addGlobalType('enum(taLeftJustify, taRightJustify, taCenter)', 'ELazAlignment');
1149-
addGlobalType('enum(cbUnchecked, cbChecked, cbGrayed)', 'ELazCheckBoxState');
1150-
addGlobalType('enum(blGlyphLeft, blGlyphRight, blGlyphTop, blGlyphBottom)', 'ELazButtonLayout');
1144+
addGlobalType('enum(None, Horizontal, Vertical, Both, AutoHorizontal, AutoVertical, AutoBoth)', 'ELazScrollStyle');
1145+
addGlobalType('set of enum(Selected, Grayed, Disabled, Checked, Focused, Default, HotLight, Inactive, NoAccel, NoFocusRect, Reserved1, Reserved2, ComboBoxEdit, BackgroundPainted)', 'ELazOwnerDrawStates');
1146+
addGlobalType('enum(DropDown, Simple, DropDownList, OwnerDrawFixed, OwnerDrawVariable, OwnerDrawEditableFixed, OwnerDrawEditableVariable)', 'ELazComboBoxStyle');
1147+
addGlobalType('enum(Standard, OwnerDrawFixed, OwnerDrawVariable, Virtual)', 'ELazListBoxStyle');
1148+
addGlobalType('enum(LeftJustify, RightJustify, Center)', 'ELazAlignment');
1149+
addGlobalType('enum(Unchecked, Checked, Grayed)', 'ELazCheckBoxState');
1150+
addGlobalType('enum(GlyphLeft, GlyphRight, GlyphTop, GlyphBottom)', 'ELazButtonLayout');
11511151

11521152
addGlobalType('procedure(Control: TLazWinControl; Index: Integer; ARect: TLazRect; State: ELazOwnerDrawStates) of object', 'TLazDrawItemEvent', FFI_DEFAULT_ABI);
11531153
addGlobalType('procedure(Control: TLazWinControl; Index: Integer; var AHeight: Integer) of object', 'TLazMeasureItemEvent', FFI_DEFAULT_ABI);

Source/script/imports/lcl/simba.import_lcl_system.pas

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -608,7 +608,7 @@ procedure ImportLCLSystem(Script: TSimbaScript);
608608
addGlobalType('type UInt32', 'TLazHandle');
609609
{$ENDIF}
610610

611-
addGlobalType('enum(soBeginning, soCurrent, soEnd)', 'ELazSeekOrigin');
611+
addGlobalType('enum(Beginning, Current, Ending)', 'ELazSeekOrigin');
612612
addGlobalType('procedure(Sender: TLazObject) of object', 'TLazNotifyEvent', FFI_DEFAULT_ABI);
613613

614614
addClass('TLazComponent', 'TLazObject', TComponent);

0 commit comments

Comments
 (0)