From e4dc3ff90f7b9739ba568641b39b301e91f3bf8d Mon Sep 17 00:00:00 2001
From: Juha <juha@lazarus-ide.org>
Date: Tue, 8 Jul 2025 20:45:05 +0300
Subject: [PATCH] LCL: Set icons for tabs in TTabControl from the Images
 property. Issue #23068.

---
 lcl/comctrls.pp            | 4 ++--
 lcl/include/tabcontrol.inc | 6 +-----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/lcl/comctrls.pp b/lcl/comctrls.pp
index 54dc1e5b1e..b1385c9b74 100644
--- a/lcl/comctrls.pp
+++ b/lcl/comctrls.pp
@@ -412,7 +412,7 @@ type
     procedure PageRemoved(Index: Integer);
     procedure SetActivePage(const Value: String);
     procedure SetActivePageComponent(const AValue: TCustomPage);
-    procedure SetImages(const AValue: TCustomImageList);
+    procedure SetImages(const AValue: TCustomImageList); virtual;
     procedure SetImagesWidth(const aImagesWidth: Integer);
     procedure SetPageIndex(AValue: Integer);
     procedure SetPages(AValue: TStrings);
@@ -814,7 +814,7 @@ type
     function GetTabRectWithBorder: TRect;
     function GetTabStop: Boolean;
     procedure SetHotTrack(const AValue: Boolean);
-    procedure SetImages(const AValue: TCustomImageList);
+    procedure SetImages(const AValue: TCustomImageList); override;
     procedure SetMultiLine(const AValue: Boolean);
     procedure SetMultiSelect(const AValue: Boolean);
     procedure SetOwnerDraw(const AValue: Boolean);
diff --git a/lcl/include/tabcontrol.inc b/lcl/include/tabcontrol.inc
index a0e524177a..5768d41eba 100644
--- a/lcl/include/tabcontrol.inc
+++ b/lcl/include/tabcontrol.inc
@@ -498,11 +498,7 @@ end;
 procedure TTabControl.SetImages(const AValue: TCustomImageList);
 begin
   if FImages = AValue then Exit;
-  if FImages <> nil then
-    FImages.RemoveFreeNotification(Self);
-  FImages := TImageList(AValue);
-  if FImages <> nil then
-    FImages.FreeNotification(Self);
+  inherited SetImages(AValue);
   TTabControlStrings(FTabs).Images := FImages;
 end;