Changeset 420 for trunk/Packages/Common/UTheme.pas

Timestamp:

Dec 28, 2021, 4:46:47 PM (3 years ago)

Author:

chronos

Message:

• Modified: Updated Common package to version 0.9.
• Modified: Code cleanup.

File:

• trunk/Packages/Common/UTheme.pas (modified) (4 diffs)

trunk/Packages/Common/UTheme.pas

@@ -5 +5 @@
 uses
   Classes, SysUtils, Graphics, ComCtrls, Controls, ExtCtrls, Menus, StdCtrls,
-  Spin, Forms, Contnrs, Grids;
+  Spin, Forms, fgl, Grids;
 
 type
@@ -19 +19 @@
   { TThemes }
 
-  TThemes = class(TObjectList)
+  TThemes = class(TFPGObjectList<TTheme>)
     function AddNew(Name: string): TTheme;
     function FindByName(Name: string): TTheme;
@@ -74 +74 @@
 procedure TThemes.LoadToStrings(Strings: TStrings);
 var
-  Theme: TTheme;
+  I: Integer;
 begin
-  Strings.Clear;
-  for Theme in Self do
-    Strings.AddObject(Theme.Name, Theme);
+  Strings.BeginUpdate;
+  try
+    while Strings.Count < Count do Strings.Add('');
+    while Strings.Count > Count do Strings.Delete(Strings.Count - 1);
+    for I := 0 to Count - 1 do begin
+      Strings[I] := Items[I].Name;
+      Strings.Objects[I] := Items[I];
+    end;
+  finally
+    Strings.EndUpdate;
+  end;
 end;
 
@@ -123 +131 @@
 destructor TThemeManager.Destroy;
 begin
-  Themes.Free;
-  inherited Destroy;
+  FreeAndNil(Themes);
+  inherited;
 end;