Changeset 268

Timestamp:

Jun 26, 2020, 11:16:48 AM (4 years ago)

Author:

chronos

Message:

• Fixed: Memory leaks.
• Fixed: TMenuItem freeing error on application termination.

File:

• branches/highdpi/Packages/DpiControls/UDpiControls.pas (modified) (6 diffs)

branches/highdpi/Packages/DpiControls/UDpiControls.pas

@@ -565 +565 @@
   public
     NativeEdit: TEdit;
+    destructor Destroy; override;
     property SelLength: Integer read GetSelLength write SetSelLength;
     property SelStart: Integer read GetSelStart write SetSelStart;
@@ -1159 +1160 @@
 end;
 
+destructor TDpiEdit.Destroy;
+begin
+  FreeAndNil(NativeEdit);
+  inherited;
+end;
+
 function TDpiEdit.GetSelLength: Integer;
 begin
@@ -1400 +1407 @@
 destructor TDpiMenuItem.Destroy;
 begin
-  FreeAndNil(NativeMenuItem);
   FreeAndNil(FItems);
-  inherited Destroy;
+  // TODO: Release menu items
+  //FreeAndNil(NativeMenuItem);
+  inherited;
 end;
 
@@ -1454 +1462 @@
 begin
   if Assigned(NativePopupMenu) then FreeAndNil(NativePopupMenu);
-  inherited Destroy;
+  inherited;
 end;
 
@@ -1992 +2000 @@
 begin
   Bitmap := NativeGraphicClass.Create;
-  Bitmap.LoadFromFile(FileName);
-  Width := Bitmap.Width;
-  Height := Bitmap.Height;
-  if Self is TDpiBitmap then begin
-    StretchDrawBitmap(TRasterImage(Bitmap), TBitmap(GetNativeGraphic));
-    //TBitmap(GetNativeGraphic).Canvas.StretchDraw(Bounds(0, 0,
-    //TBitmap(GetNativeGraphic).Width, TBitmap(GetNativeGraphic).Height), Bitmap);
-  end else raise Exception.Create('Unsupported class ' + Self.ClassName);
-  FreeAndNil(Bitmap);
+  try
+    Bitmap.LoadFromFile(FileName);
+    Width := Bitmap.Width;
+    Height := Bitmap.Height;
+    if Self is TDpiBitmap then begin
+      StretchDrawBitmap(TRasterImage(Bitmap), TBitmap(GetNativeGraphic));
+      //TBitmap(GetNativeGraphic).Canvas.StretchDraw(Bounds(0, 0,
+      //TBitmap(GetNativeGraphic).Width, TBitmap(GetNativeGraphic).Height), Bitmap);
+    end else raise Exception.Create('Unsupported class ' + Self.ClassName);
+  finally
+    FreeAndNil(Bitmap);
+  end;
 end;
 
@@ -2008 +2019 @@
 begin
   Bitmap := NativeGraphicClass.Create;
-  Bitmap.Width := Width;
-  Bitmap.Height := Height;
-  if Self is TDpiBitmap then begin
-    if Bitmap is TRasterImage then
-      (Bitmap as TRasterImage).Canvas.StretchDraw(Bounds(0, 0, Bitmap.Width, Bitmap.Height), TBitmap(GetNativeGraphic))
-      else raise Exception.Create('Expected TRasterImage but got ' + Bitmap.ClassName);
-  end else raise Exception.Create('Unsupported class ' + Self.ClassName);
-  Bitmap.SaveToFile(FileName);
-  FreeAndNil(Bitmap);
+  try
+    Bitmap.Width := Width;
+    Bitmap.Height := Height;
+    if Self is TDpiBitmap then begin
+      if Bitmap is TRasterImage then
+        (Bitmap as TRasterImage).Canvas.StretchDraw(Bounds(0, 0, Bitmap.Width, Bitmap.Height), TBitmap(GetNativeGraphic))
+        else raise Exception.Create('Expected TRasterImage but got ' + Bitmap.ClassName);
+    end else raise Exception.Create('Unsupported class ' + Self.ClassName);
+    Bitmap.SaveToFile(FileName);
+  finally
+    FreeAndNil(Bitmap);
+  end;
 end;