Scope all LCL enums

Examples/form.simba

@@ -4,17 +4,17 @@ var
   Form: TLazForm;
 
 // Called when the mouse the mouse is pressed on the form
-procedure FormMouseDown(Sender: TObject; Button: TLazMouseButton; Shift: TLazShiftState; X, Y: Integer);
+procedure FormMouseDown(Sender: TObject; Button: ELazMouseButton; Shift: ELazShiftStates; X, Y: Integer);
 begin
   WriteLn('FormMouseDown: ', Button, ', ', Shift, ' at ', X, ', ', Y);
-  if (ssShift in Shift) then
+  if (ELazShiftStates.Shift in Shift) then
     WriteLn('Shift is pressed too!');
-  if (ssCtrl in Shift) then
+  if (ELazShiftStates.Ctrl in Shift) then
     WriteLn('Control is pressed too!');
 end;
 
 // Called when the mouse the mouse is released on the form
-procedure FormMouseUp(Sender: TObject; Button: TLazMouseButton; Shift: TLazShiftState; X, Y: Integer);
+procedure FormMouseUp(Sender: TObject; Button: ELazMouseButton; Shift: ELazShiftStates; X, Y: Integer);
 begin
   WriteLn('FormMouseUp: ', Button, ', ', Shift, ' at ', X, ', ', Y);
 end;
@@ -57,9 +57,9 @@ begin
   Form.SetOnMouseUp(@FormMouseUp);
   Form.SetWidth(700);
   Form.SetHeight(700);
-  Form.SetPosition(poScreenCenter);
+  Form.SetPosition(ELazFormPosition.ScreenCenter);
   Form.SetColor(Colors.DARK_GREY);
-  Form.SetBorderStyle(bsSingle); // Do not allow resizing
+  Form.SetBorderStyle(ELazFormBorderStyle.Single); // Do not allow resizing
 
   SimbaImg := TImage.CreateFromTarget([0,0,400,400]);
 
@@ -112,16 +112,16 @@ begin
   Panel := TLazPanel.Create(Form);
   Panel.SetParent(Form);
   Panel.SetBounds(25,25, 250,250);
-  Panel.SetBevelOuter(bvNone);
+  Panel.SetBevelOuter(ELazPanelBevel.None);
 
   Lbl := TLazLabel.Create(Panel);
   Lbl.SetParent(Panel);
   Lbl.SetCaption('List box:');
-  Lbl.SetAlign(alTop);
+  Lbl.SetAlign(ELazAlign.Top);
 
   List := TLazListBox.Create(Panel);
   List.SetParent(Panel);
-  List.SetAlign(alClient);
+  List.SetAlign(ELazAlign.Client);
   List.GetItems().Add('Item 1');
   List.GetItems().Add('Item 2');
   List.GetItems().Add('Item 3');
@@ -142,6 +142,7 @@ begin
   Button.SetParent(Tab1);
   Button.SetAutoSize(True);
   Button.SetCaption('This button is on tab 1!');
+  Button.SetCursor(ELazCursor.SIZE);
 
   Button := TLazButton.Create(Tab2);
   Button.SetParent(Tab2);

Examples/form_imagebox.simba

@@ -9,7 +9,7 @@ begin
     Canvas.DrawBoxFilled([300,300,350,350], Colors.LIME);
 end;
 
-procedure ImgBoxMouseMove(Sender: TImageBox; Shift: TLazShiftState; X, Y: Integer);
+procedure ImgBoxMouseMove(Sender: TImageBox; Shift: ELazShiftStates; X, Y: Integer);
 begin
   Sender.Repaint();
 end;
@@ -25,11 +25,11 @@ begin
   Form.SetCaption('ImageBox example');
   Form.SetWidth(700);
   Form.SetHeight(500);
-  Form.SetPosition(poScreenCenter);
+  Form.SetPosition(ELazFormPosition.ScreenCenter);
 
   ImgBox := TImageBox.Create(Form);
   ImgBox.SetParent(Form);
-  ImgBox.SetAlign(alClient);
+  ImgBox.SetAlign(ELazAlign.Client);
   ImgBox.SetBackgroundFromTarget(Target);
   ImgBox.SetOnImgPaint(@ImgBoxPaint);
   ImgBox.SetOnImgMouseMove(@ImgBoxMouseMove);

Source/codetools/msimplepaspar.pas

@@ -2546,7 +2546,12 @@ procedure TmwSimplePasPar.SetType;
 begin
   Expected(tokSet);
   Expected(tokOf);
-  OrdinalType;
+  if (Lexer.TokenID = tokEnum) then
+  begin
+    NextToken();
+    EnumeratedScopedType;
+  end else
+    OrdinalType;
 end;
 
 procedure TmwSimplePasPar.ArrayType;

Source/codetools/simba.ide_codetools_insight.pas

@@ -193,7 +193,7 @@ procedure TCodeinsight.Run;
   I: Integer;
 begin
   FScriptParser.Run();
-
+  WriteLn(FScriptParser.DebugTree());
   for I := 0 to FScriptParser.Locals.Count - 1 do
     if (FScriptParser.Locals[I] is TDeclaration_WithVariable) then
       FScriptParser.Locals.Extend(GetMembersOfType(ParseExpression(FScriptParser.Locals[I].Text, [EParseExpressionFlag.WantMethodResult])));
@@ -303,6 +303,12 @@ function TCodeinsight.GetMembersOfType(Decl: TDeclaration): TDeclarationArray;
 
   function CheckEnum(Decl: TDeclaration): TDeclarationArray;
   begin
+    if (Decl is TDeclaration_TypeSet) then
+    begin
+      //TDeclaration_TypeSet(Decl).Dump;
+      Result := Decl.Items.GetByClass(TDeclaration_EnumElement, False, True)
+    end
+    else
     if (Decl is TDeclaration_TypeEnum) then
       Result := Decl.Items.GetByClass(TDeclaration_EnumElement)
     else
@@ -352,6 +358,7 @@ function TCodeinsight.GetMembersOfType(Decl: TDeclaration): TDeclarationArray;
 
   for Depth := 1 to MAX_DEPTH do
   begin
+    Writeln(Decl.ClassName);
     Result := Result + CheckEnum(Decl);
     Result := Result + CheckRecord(Decl);
     Result := Result + CheckMethods(Decl, Depth > 1);

Source/editor/simba.editor_autocomplete.pas

@@ -481,11 +481,17 @@ function TSimbaAutoComplete.GetHintText(Decl: TDeclaration; IsHint: Boolean): St
   end;
 
   function GetEnumElementText(Decl: TDeclaration_EnumElement): String;
+  var
+    OwnerDecl: TDeclaration;
   begin
-    if (Decl.Owner <> nil) then
-      Result := ': ' + Decl.Owner.Name
-    else
-      Result := '';
+    Result := '';
+
+    OwnerDecl := Decl.GetOwnerByClass(TDeclaration_TypeSet);
+    if (OwnerDecl = nil) then
+      OwnerDecl := Decl.Owner;
+
+    if (OwnerDecl <> nil) and (OwnerDecl.Name <> '') then
+      Result := ': ' + OwnerDecl.Name;
   end;
 
   function GetTypeText(Decl: TDeclaration_Type): String;

Source/imagebox/simba.imagebox.pas

@@ -166,7 +166,6 @@   TSimbaImageBox = class(TCustomControl)
     property MouseX: Integer read FMouseX;
     property MouseY: Integer read FMouseY;
     property MousePoint: TPoint read GetMousePoint;
-    property Cursor;
 
     property OnImgKeyDown: TImageBoxKeyEvent read FOnImgKeyDown write FOnImgKeyDown;
     property OnImgKeyUp: TImageBoxKeyEvent read FOnImgKeyUp write FOnImgKeyUp;

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

@@ -637,10 +637,10 @@ procedure ImportLCLComCtrls(Compiler: TSimbaScript_Compiler);
 begin
   with Compiler do
   begin
-    addGlobalType('(tmBottomRight, tmTopLeft, tmBoth)', 'TLazTickMark');
-    addGlobalType('(tsNone, tsAuto, tsManual)', 'TLazStickStyle');
-    addGlobalType('(tpTop, tpBottom, tpLeft, tpRight)', 'TLazTabPosition');
-    addGlobalType('(trHorizontal, trVertical)', 'TLazTrackBarOrientation');
+    addGlobalType('enum(BottomRight, TopLeft, Both)', 'ELazTickMark');
+    addGlobalType('enum(None, Auto, Manual)', 'ELazStickStyle');
+    addGlobalType('enum(Top, Bottom, Left, Right)', 'ELazTabPosition');
+    addGlobalType('enum(Horizontal, Vertical)', 'ELazTrackBarOrientation');
 
     addGlobalType('procedure(Sender: TObject; var AllowChange: Boolean) of object', 'TLazTabChangingEvent', FFI_DEFAULT_ABI);
 
@@ -663,24 +663,24 @@ procedure ImportLCLComCtrls(Compiler: TSimbaScript_Compiler);
     addClassVar('TLazTrackBar', 'Max', 'Integer', @_LapeTrackBar_Max_Read, @_LapeTrackBar_Max_Write);
     addClassVar('TLazTrackBar', 'Min', 'Integer', @_LapeTrackBar_Min_Read, @_LapeTrackBar_Min_Write);
     addClassVar('TLazTrackBar', 'OnChange', 'TLazNotifyEvent', @_LapeTrackBar_OnChange_Read, @_LapeTrackBar_OnChange_Write);
-    addClassVar('TLazTrackBar', 'Orientation', 'TLazTrackBarOrientation', @_LapeTrackBar_Orientation_Read, @_LapeTrackBar_Orientation_Write);
+    addClassVar('TLazTrackBar', 'Orientation', 'ELazTrackBarOrientation', @_LapeTrackBar_Orientation_Read, @_LapeTrackBar_Orientation_Write);
     addClassVar('TLazTrackBar', 'PageSize', 'Integer', @_LapeTrackBar_PageSize_Read, @_LapeTrackBar_PageSize_Write);
     addClassVar('TLazTrackBar', 'Position', 'Integer', @_LapeTrackBar_Position_Read, @_LapeTrackBar_Position_Write);
     addClassVar('TLazTrackBar', 'Reversed', 'Boolean', @_LapeTrackBar_Reversed_Read, @_LapeTrackBar_Reversed_Write);
     addClassVar('TLazTrackBar', 'SelEnd', 'Integer', @_LapeTrackBar_SelEnd_Read, @_LapeTrackBar_SelEnd_Write);
     addClassVar('TLazTrackBar', 'SelStart', 'Integer', @_LapeTrackBar_SelStart_Read, @_LapeTrackBar_SelStart_Write);
     addClassVar('TLazTrackBar', 'ShowSelRange', 'Boolean', @_LapeTrackBar_ShowSelRange_Read, @_LapeTrackBar_ShowSelRange_Write);
-    addClassVar('TLazTrackBar', 'TickMarks', 'TLazTickMark', @_LapeTrackBar_TickMarks_Read, @_LapeTrackBar_TickMarks_Write);
-    addClassVar('TLazTrackBar', 'TickStyle', 'TLazStickStyle', @_LapeTrackBar_TickStyle_Read, @_LapeTrackBar_TickStyle_Write);
+    addClassVar('TLazTrackBar', 'TickMarks', 'ELazTickMark', @_LapeTrackBar_TickMarks_Read, @_LapeTrackBar_TickMarks_Write);
+    addClassVar('TLazTrackBar', 'TickStyle', 'ELazStickStyle', @_LapeTrackBar_TickStyle_Read, @_LapeTrackBar_TickStyle_Write);
 
     addClass('TLazCheckListBox', 'TLazCustomListBox');
     addClassConstructor('TLazCheckListBox', '(AOwner: TLazComponent)', @_LapeCheckListBox_Create);
     addGlobalFunc('procedure TLazCheckListBox.Toggle(AIndex: Integer);', @_LapeCheckListBox_Toggle);
-    addGlobalFunc('procedure TLazCheckListBox.CheckAll(AState: TLazCheckBoxState; aAllowGrayed: Boolean = True; aAllowDisabled: Boolean = True);', @_LapeCheckListBox_CheckAll);
+    addGlobalFunc('procedure TLazCheckListBox.CheckAll(AState: ELazCheckBoxState; aAllowGrayed: Boolean = True; aAllowDisabled: Boolean = True);', @_LapeCheckListBox_CheckAll);
     addClassVar('TLazCheckListBox', 'AllowGrayed', 'Boolean', @_LapeCheckListBox_AllowGrayed_Read, @_LapeCheckListBox_AllowGrayed_Write);
     addClassVar('TLazCheckListBox', 'Checked', 'Boolean', @_LapeCheckListBox_Checked_Read, @_LapeCheckListBox_Checked_Write, True);
     addClassVar('TLazCheckListBox', 'ItemEnabled', 'Boolean', @_LapeCheckListBox_ItemEnabled_Read, @_LapeCheckListBox_ItemEnabled_Write, True);
-    addClassVar('TLazCheckListBox', 'State', 'TLazCheckBoxState', @_LapeCheckListBox_State_Read, @_LapeCheckListBox_State_Write, True);
+    addClassVar('TLazCheckListBox', 'State', 'ELazCheckBoxState', @_LapeCheckListBox_State_Read, @_LapeCheckListBox_State_Write, True);
     addClassVar('TLazCheckListBox', 'OnClickCheck', 'TLazNotifyEvent', @_LapeCheckListBox_OnClickCheck_Read, @_LapeCheckListBox_OnClickCheck_Write);
 
     addClass('TLazTabSheet', 'TLazWinControl');
@@ -701,15 +701,15 @@ procedure ImportLCLComCtrls(Compiler: TSimbaScript_Compiler);
     addClassVar('TLazPageControl', 'Tab', 'TLazTabSheet', @_LapePageControl_Tab_Index_Read, nil, True);
     addClassVar('TLazPageControl', 'TabCount', 'Integer', @_LapePageControl_PageCount_Read);
     addClassVar('TLazPageControl', 'ShowTabs', 'Boolean', @_LapePageControl_ShowTabs_Read, @_LapePageControl_ShowTabs_Write);
-    addClassVar('TLazPageControl', 'TabPosition', 'TLazTabPosition', @_LapePageControl_TabPosition_Read, @_LapePageControl_TabPosition_Write);
+    addClassVar('TLazPageControl', 'TabPosition', 'ELazTabPosition', @_LapePageControl_TabPosition_Read, @_LapePageControl_TabPosition_Write);
     addClassVar('TLazPageControl', 'MultiLine', 'Boolean', @_LapePageControl_MultiLine_Read, @_LapePageControl_MultiLine_Write);
     addClassVar('TLazPageControl', 'TabWidth', 'Integer', @_LapePageControl_TabWidth_Read, @_LapePageControl_TabWidth_Write);
     addClassVar('TLazPageControl', 'TabHeight', 'Integer', @_LapePageControl_TabHeight_Read, @_LapePageControl_TabHeight_Write);
 
     addClass('TLazStatusBar', 'TLazWinControl');
     addClass('TLazStatusPanel');
     addGlobalFunc('function TLazStatusPanel.StatusBar: TLazStatusBar;', @_LapeStatusPanel_StatusBar);
-    addClassVar('TLazStatusPanel', 'Alignment', 'TLazAlignment', @_LapeStatusPanel_Alignment_Read, @_LapeStatusPanel_Alignment_Write);
+    addClassVar('TLazStatusPanel', 'Alignment', 'ELazAlignment', @_LapeStatusPanel_Alignment_Read, @_LapeStatusPanel_Alignment_Write);
     addClassVar('TLazStatusPanel', 'Text', 'String', @_LapeStatusPanel_Text_Read, @_LapeStatusPanel_Text_Write);
     addClassVar('TLazStatusPanel', 'Width', 'Integer', @_LapeStatusPanel_Width_Read, @_LapeStatusPanel_Width_Write);
 

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

@@ -438,14 +438,30 @@ procedure _LapeControl_ShowHint_Write(const Params: PParamArray); LAPE_WRAPPER_C
   PControl(Params^[0])^.ShowHint := PBoolean(Params^[1])^;
 end;
 
+{$scopedenums on}
+type  ELazCursor = (Default, None, Arrow, Cross, IBeam, Size, SizeNESW, SizeNS, SizeNWSE, SizeWE, SizeNW, SizeN, SizeNE, SizeW, SizeE, SizeSW, SizeS, SizeSE, UpArrow, HourGlass, Drag, NoDrop, HSplit, VSplit, MultiDrag, AppStart, Help, HandPoint);
+const ELazCurorToTCursor: array[ELazCursor] of TCursor = (crDefault, crNone, crArrow, crCross, crIBeam, crSize, crSizeNESW, crSizeNS, crSizeNWSE, crSizeWE, crSizeNW, crSizeN, crSizeNE, crSizeW, crSizeE, crSizeSW, crSizeS, crSizeSE, crUpArrow, crHourGlass, crDrag, crNoDrop, crHSplit, crVSplit, crMultiDrag, crAppStart, crHelp, crHandPoint);
+{$scopedenums off}
+
 procedure _LapeControl_Cursor_Read(const Params: PParamArray; const Result: Pointer); LAPE_WRAPPER_CALLING_CONV
+
+  function CursorToEnum(val: TCursor): ELazCursor;
+  var
+    e: ELazCursor;
+  begin
+    for e in ELazCursor do
+      if (ELazCurorToTCursor[e] = Val) then
+        Exit(e);
+    Result := ELazCursor.Default;
+  end;
+
 begin
-  PCursor(Result)^ := PControl(Params^[0])^.Cursor;
+  ELazCursor(Result^) := CursorToEnum(PControl(Params^[0])^.Cursor);
 end;
 
 procedure _LapeControl_Cursor_Write(const Params: PParamArray); LAPE_WRAPPER_CALLING_CONV
 begin
-  PControl(Params^[0])^.Cursor := PCursor(Params^[1])^;
+  PControl(Params^[0])^.Cursor := ELazCurorToTCursor[ELazCursor(Params^[1]^)];
 end;
 
 procedure _LapeWinControl_Brush_Read(const Params: PParamArray; const Result: Pointer); LAPE_WRAPPER_CALLING_CONV
@@ -797,29 +813,21 @@ procedure ImportLCLControls(Compiler: TSimbaScript_Compiler);
 begin
   with Compiler do
   begin
-    addGlobalType('(ssShift, ssAlt, ssCtrl, ssLeft, ssRight, ssMiddle, ssDouble, ssMeta, ssSuper, ssHyper, ssAltGr, ssCaps, ssNum, ssScroll, ssTriple, ssQuad, ssExtra1, ssExtra2)', 'TLazShiftStateEnum');
-    addGlobalType('set of TLazShiftStateEnum', 'TLazShiftState');
-    addGlobalType('(mbLeft, mbRight, mbMiddle, mbExtra1, mbExtra2)', 'TLazMouseButton');
-
-    addGlobalType('procedure(Sender: TObject; var Key: Int16; Shift: TLazShiftState) of object', 'TLazKeyEvent', FFI_DEFAULT_ABI);
+    addGlobalType('set of enum(Shift, Alt, Ctrl, Left, Right, Middle, Double, Meta, Super, Hyper, AltGr, Caps, Num, Scroll, Triple, Quad, Extra1, Extra2)', 'ELazShiftStates');
+    addGlobalType('enum(Left, Right, Middle, Extra1, Extra2)', 'ELazMouseButton');
+    addGlobalType('enum(Default, None, Arrow, Cross, IBeam, Size, SizeNESW, SizeNS, SizeNWSE, SizeWE, SizeNW, SizeN, SizeNE, SizeW, SizeE, SizeSW, SizeS, SizeSE, UpArrow, HourGlass, Drag, NoDrop, HSplit, VSplit, MultiDrag, AppStart, Help, HandPoint)', 'ELazCursor');
+    addGlobalType('enum(Horizontal, Vertical)', 'ELazScrollBarKind');
+    addGlobalType('enum(None, Top, Bottom, Left, Right, Client, Custom)', 'ELazAlign');
+    addGlobalType('enum(Top, Left, Right, Bottom)', 'ELazAnchorKind');
+    addGlobalType('set of ELazAnchorKind', 'ELazAnchors');
+
+    addGlobalType('enum(asrTop, asrBottom, asrCenter)', 'ELazAnchorSideReference');
+    addGlobalType('procedure(Sender: TObject; var Key: Int16; Shift: ELazShiftStates) of object', 'TLazKeyEvent', FFI_DEFAULT_ABI);
     addGlobalType('procedure(Sender: TObject; var Key: Char) of object', 'TLazKeyPressEvent', FFI_DEFAULT_ABI);
-    addGlobalType('procedure(Sender: TObject; Button: TLazMouseButton; Shift: TLazShiftState; X, Y: Integer) of object', 'TLazMouseEvent', FFI_DEFAULT_ABI);
-    addGlobalType('procedure(Sender: TObject; Shift: TLazShiftState; X, Y: Integer) of object', 'TLazMouseMoveEvent', FFI_DEFAULT_ABI);
-    addGlobalType('procedure(Sender: TObject; Shift: TLazShiftState; WheelDelta: Integer; MousePos: TPoint; var Handled: Boolean) of object', 'TLazMouseWheelEvent', FFI_DEFAULT_ABI);
-    addGlobalType('procedure(Sender: TObject; Shift: TLazShiftState; MousePos: TPoint; var Handled: Boolean) of object', 'TLazMouseWheelUpDownEvent', FFI_DEFAULT_ABI);
-
-    addGlobalType('(sbHorizontal, sbVertical)', 'TLazScrollBarKind');
-    addGlobalType('(alNone, alTop, alBottom, alLeft, alRight, alClient, alCustom)', 'TLazAlign');
-    addGlobalType('(akTop, akLeft, akRight, akBottom)', 'TLazAnchorKind');
-    addGlobalType('set of TLazAnchorKind', 'TLazAnchors');
-    addGlobalType('(asrTop, asrBottom, asrCenter)', 'TLazAnchorSideReference');
-    addGlobalType('Integer', 'TLazCursor');
-    addGlobalVar(crDefault, 'crDefault').isConstant := True;
-    addGlobalVar(crNone, 'crNone').isConstant := True;
-    addGlobalVar(crSize, 'crSize').isConstant := True;
-    addGlobalVar(crCross, 'crCross').isConstant := True;
-    addGlobalVar(crHandPoint, 'crHandPoint').isConstant := True;
-    addGlobalVar(crIBeam, 'crIBeam').isConstant := True;
+    addGlobalType('procedure(Sender: TObject; Button: ELazMouseButton; Shift: ELazShiftStates; X, Y: Integer) of object', 'TLazMouseEvent', FFI_DEFAULT_ABI);
+    addGlobalType('procedure(Sender: TObject; Shift: ELazShiftStates; X, Y: Integer) of object', 'TLazMouseMoveEvent', FFI_DEFAULT_ABI);
+    addGlobalType('procedure(Sender: TObject; Shift: ELazShiftStates; WheelDelta: Integer; MousePos: TPoint; var Handled: Boolean) of object', 'TLazMouseWheelEvent', FFI_DEFAULT_ABI);
+    addGlobalType('procedure(Sender: TObject; Shift: ELazShiftStates; MousePos: TPoint; var Handled: Boolean) of object', 'TLazMouseWheelUpDownEvent', FFI_DEFAULT_ABI);
 
     addClass('TLazControlBorderSpacing');
     addClassVar('TLazControlBorderSpacing', 'Left', 'Integer', @_LapeControlBorderSpacing_Left_Read, @_LapeControlBorderSpacing_Left_Write);
@@ -832,11 +840,11 @@ procedure ImportLCLControls(Compiler: TSimbaScript_Compiler);
     addClass('TLazWinControl', 'TLazControl');
 
     addClass('TLazAnchorSide');
-    addClassVar('TLazAnchorSide', 'Side', 'TLazAnchorSideReference', @_LapeAnchorSide_Side_Read, @_LapeAnchorSide_Side_Write);
-    addClassVar('TLazAnchorSide', 'Kind', 'TLazAnchorKind', @_LapeAnchorSide_Kind_Read);
+    addClassVar('TLazAnchorSide', 'Side', 'ELazAnchorSideReference', @_LapeAnchorSide_Side_Read, @_LapeAnchorSide_Side_Write);
+    addClassVar('TLazAnchorSide', 'Kind', 'ELazAnchorKind', @_LapeAnchorSide_Kind_Read);
     addClassVar('TLazAnchorSide', 'Control', 'TLazControl', @_LapeAnchorSide_Control_Read);
 
-    addClassVar('TLazControl', 'Anchors', 'TLazAnchors',  @_LapeControl_Anchors_Read, @_LapeControl_Anchors_Write);
+    addClassVar('TLazControl', 'Anchors', 'ELazAnchors',  @_LapeControl_Anchors_Read, @_LapeControl_Anchors_Write);
     addClassVar('TLazControl', 'AnchorSideLeft', 'TLazAnchorSide',  @_LapeControl_AnchorSideLeft_Read);
     addClassVar('TLazControl', 'AnchorSideTop', 'TLazAnchorSide',  @_LapeControl_AnchorSideTop_Read);
     addClassVar('TLazControl', 'AnchorSideRight', 'TLazAnchorSide',  @_LapeControl_AnchorSideRight_Read);
@@ -857,8 +865,8 @@ procedure ImportLCLControls(Compiler: TSimbaScript_Compiler);
     addGlobalFunc('procedure TLazControl.Show;', @_LapeControl_Show);
     addGlobalFunc('procedure TLazControl.Update;', @_LapeControl_Update);
 
-    addClassVar('TLazControl', 'Cursor', 'TLazCursor', @_LapeControl_Cursor_Read, @_LapeControl_Cursor_Write);
-    addClassVar('TLazControl', 'Align', 'TLazAlign', @_LapeControl_Align_Read, @_LapeControl_Align_Write);
+    addClassVar('TLazControl', 'Cursor', 'ELazCursor', @_LapeControl_Cursor_Read, @_LapeControl_Cursor_Write);
+    addClassVar('TLazControl', 'Align', 'ELazAlign', @_LapeControl_Align_Read, @_LapeControl_Align_Write);
     addClassVar('TLazControl', 'AutoSize', 'Boolean', @_LapeControl_AutoSize_Read, @_LapeControl_AutoSize_Write);
     addClassVar('TLazControl', 'BoundsRect', 'TLazRect', @_LapeControl_BoundsRect_Read, @_LapeControl_BoundsRect_Write);
     addClassVar('TLazControl', 'Caption', 'String', @_LapeControl_Caption_Read, @_LapeControl_Caption_Write);
@@ -912,7 +920,7 @@ procedure ImportLCLControls(Compiler: TSimbaScript_Compiler);
     addClassVar('TLazCustomControl', 'OnPaint', 'TLazNotifyEvent', @_LapeCustomControl_OnPaint_Read, @_LapeCustomControl_OnPaint_Write);
 
     addClass('TLazControlScrollBar');
-    addClassConstructor('TLazControlScrollBar' ,'(AControl: TLazWinControl; AKind: TLazScrollBarKind)', @_LapeControlScrollBar_Create);
+    addClassConstructor('TLazControlScrollBar' ,'(AControl: TLazWinControl; AKind: ELazScrollBarKind)', @_LapeControlScrollBar_Create);
     addGlobalFunc('function TLazControlScrollBar.GetOtherScrollBar: TLazControlScrollBar;', @_LapeControlScrollBar_GetOtherScrollBar);
     addClassVar('TLazControlScrollBar', 'Size', 'Integer', @_LapeControlScrollBar_Size_Read);
     addGlobalFunc('function TLazControlScrollBar.ClientSize: Integer;', @_LapeControlScrollBar_ClientSize);