Changeset 267 for branches

Timestamp:

Jun 26, 2020, 10:42:40 AM (4 years ago)

Author:

chronos

Message:

• Fixed: Call inherited in TDpiForm.Destroy destructor.

File:

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

branches/highdpi/Packages/DpiControls/UDpiControls.pas

@@ -1523 +1523 @@
   FreeAndNil(FHorzScrollBar);
   FreeAndNil(FVertScrollBar);
-  inherited Destroy;
+  inherited;
 end;
 
@@ -1604 +1604 @@
 procedure TDpiApplication.DoBeforeFinalization;
 var
-  i: Integer;
-  C: TComponent;
+  I: Integer;
 begin
   if Self = nil then Exit;
-  for i := ComponentCount - 1 downto 0 do begin
-    if i < ComponentCount then begin
-      C := Components[i];
-      // C.Name
-      C.Free;
-    end;
+  for I := ComponentCount - 1 downto 0 do begin
+    if I < ComponentCount then
+      Components[I].Free;
   end;
 end;
@@ -1633 +1629 @@
 destructor TDpiApplication.Destroy;
 begin
+  UnregisterFindGlobalComponentProc(@DpiFindApplicationComponent);
   ExitProc := FOldExitProc;
-  inherited Destroy;
+  inherited;
 end;
 
@@ -2003 +2000 @@
     //TBitmap(GetNativeGraphic).Width, TBitmap(GetNativeGraphic).Height), Bitmap);
   end else raise Exception.Create('Unsupported class ' + Self.ClassName);
-  Bitmap.Free;
+  FreeAndNil(Bitmap);
 end;
 
@@ -2019 +2016 @@
   end else raise Exception.Create('Unsupported class ' + Self.ClassName);
   Bitmap.SaveToFile(FileName);
-  Bitmap.Free;
+  FreeAndNil(Bitmap);
 end;
 
@@ -2080 +2077 @@
     Bitmap.PixelFormat := NativeBitmap.PixelFormat;
     Bitmap.Canvas.StretchDraw(Bounds(0, 0, NewWidth, NewHeight), NativeBitmap);
-    NativeBitmap.Free;
+    FreeAndNil(NativeBitmap);
     NativeBitmap := Bitmap;
     Canvas.NativeCanvas := NativeBitmap.Canvas;
@@ -2671 +2668 @@
 begin
   if FNativeFont = AValue then Exit;
-  if FNativeFontFree then FNativeFont.Free;
+  if FNativeFontFree then FreeAndNil(FNativeFont);
   FNativeFontFree := False;
   FNativeFont := AValue;
@@ -2809 +2806 @@
 begin
   FreeAndNil(Controls);
-  inherited Destroy;
+  inherited;
 end;
 
@@ -3144 +3141 @@
   FreeAndNil(FConstraints);
   FreeAndNil(FFont);
-  inherited Destroy;
+  inherited;
 end;
 
@@ -3604 +3601 @@
 procedure TDpiForm.CloseHandler(Sender: TObject; var CloseAction: TCloseAction);
 begin
-  DoClose(CloseAction);
+  Close;
 end;
 
@@ -3762 +3759 @@
 destructor TDpiForm.Destroy;
 begin
-  // Name
   // TODO: Can't destroy directly?
-  //FreeAndNil(NativeForm);
-
   TFormEx(NativeForm).OnMessage := nil;
+  FreeAndNil(NativeForm);
+
   DpiScreen.RemoveForm(Self);
+  inherited;
 end;