Changeset 38 for branches/overos/UWindow.pas

Timestamp:

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

Author:

chronos

Message:

• Modified: Code cleanup.

File:

• branches/overos/UWindow.pas (modified) (8 diffs)

branches/overos/UWindow.pas

@@ -1 +1 @@
 unit UWindow;
 
-{$mode delphi}{$H+}
-
 interface
 
 uses
-  Classes, SysUtils, fgl, UTypes, UMouse, UControls, UGraphics;
+  Classes, SysUtils, Generics.Collections, UTypes, UMouse, UControls, UGraphics;
 
 type
@@ -96 +94 @@
   public
     Canvas: TCanvas;
-    Windows: TFPGObjectList<TWindow>;
+    Windows: TObjectList<TWindow>;
     Size: TSize;
     procedure Paint;
@@ -116 +114 @@
 begin
   if FWindow = AValue then Exit;
-  Canvas.Free;
+  FreeAndNil(Canvas);
   FWindow := AValue;
   Canvas := TCanvasWindow.Create;
@@ -173 +171 @@
 destructor TTitleBar.Destroy;
 begin
-  ButtonClose.Free;
-  ButtonMaximize.Free;
-  ButtonMinimize.Free;
+  FreeAndNil(ButtonClose);
+  FreeAndNil(ButtonMaximize);
+  FreeAndNil(ButtonMinimize);
   inherited;
 end;
@@ -293 +291 @@
 begin
   inherited;
-  Canvas.Free;
+  FreeAndNil(Canvas);
   Canvas := TCanvasWindow.Create;
   TCanvasWindow(Canvas).Window := Self;
@@ -304 +302 @@
 begin
   Visible := False;
-  TitleBar.Free;
+  FreeAndNil(TitleBar);
   Screen := nil;
-  inherited Destroy;
+  inherited;
 end;
 
@@ -448 +446 @@
 constructor TScreen.Create;
 begin
-  Windows := TFPGObjectList<TWindow>.Create;
-  Windows.FreeObjects := False;
+  Windows := TObjectList<TWindow>.Create;
+  Windows.OwnsObjects := False;
   Canvas := TCanvas.Create;
 end;
@@ -459 +457 @@
   for I := Windows.Count - 1 downto 0 do
     Windows[I].Free;
-  Windows.Free;
-  Canvas.Free;
-  inherited Destroy;
+  FreeAndNil(Windows);
+  FreeAndNil(Canvas);
+  inherited;
 end;