Changeset 38 for branches/overos/UControls.pas

Timestamp:

Jun 30, 2023, 3:36:57 PM (11 months ago)

Author:

chronos

Message:

• Modified: Code cleanup.

File:

• branches/overos/UControls.pas (modified) (5 diffs)

branches/overos/UControls.pas

@@ -1 +1 @@
 unit UControls;
 
-{$mode delphi}
-
 interface
 
 uses
-  Classes, SysUtils, UTypes, UGraphics, fgl, UMouse;
+  Classes, SysUtils, UTypes, UGraphics, Generics.Collections, UMouse;
 
 type
@@ -28 +26 @@
   public
     Canvas: TCanvas;
-    Controls: TFPGObjectList<TControl>;
+    Controls: TObjectList<TControl>;
     procedure MouseButtonDown(Pos: TPosition; Button: TMouseButton); virtual;
     procedure MouseButtonUp(Pos: TPosition; Button: TMouseButton); virtual;
@@ -91 +89 @@
   end;
 
+
 implementation
 
@@ -214 +213 @@
 constructor TControl.Create;
 begin
-  Controls := TFPGObjectList<TControl>.Create;
-  Controls.FreeObjects := False;
+  Controls := TObjectList<TControl>.Create;
+  Controls.OwnsObjects := False;
   Canvas := TCanvasControl.Create;
   TCanvasControl(Canvas).Control := Self;
@@ -227 +226 @@
     Controls[I].Free;
   ParentControl := nil;
-  Canvas.Free;
-  Controls.Free;
-  inherited Destroy;
+  FreeAndNil(Canvas);
+  FreeAndNil(Controls);
+  inherited;
 end;