From 795051522976b8ad5669ab2457fcb55ffff9ad8e Mon Sep 17 00:00:00 2001
From: wp_xyz <wp_xxyyzzz@gmx.net>
Date: Wed, 17 Aug 2022 22:59:27 +0200
Subject: [PATCH] LCL: Revert 0c285d6eb9d53c45f263e56255bb48537fc396f9 (fixes
 issue #39861).

---
 lcl/buttonpanel.pas    |  7 -------
 lcl/include/bitbtn.inc | 12 +-----------
 2 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/lcl/buttonpanel.pas b/lcl/buttonpanel.pas
index 66d50eea6a..e219cc67a3 100644
--- a/lcl/buttonpanel.pas
+++ b/lcl/buttonpanel.pas
@@ -92,7 +92,6 @@ type
       AlignInfo: TAlignInfo); override;
     procedure CalculatePreferredSize(var PreferredWidth,
       PreferredHeight: integer; WithThemeSpace: Boolean); override;
-    procedure Loaded; override;
     procedure Notification(AComponent: TComponent; Operation: TOperation); override;
     procedure SetAlign(Value: TAlign); override;
     procedure CMAppShowBtnGlyphChanged(var Message: TLMessage); message CM_APPSHOWBTNGLYPHCHANGED;
@@ -486,12 +485,6 @@ begin
   end;
 end;
 
-procedure TCustomButtonPanel.Loaded;
-begin
-  inherited;
-  DoShowGlyphs;
-end;
-
 procedure TCustomButtonPanel.Notification(AComponent: TComponent;
   Operation: TOperation);
 var
diff --git a/lcl/include/bitbtn.inc b/lcl/include/bitbtn.inc
index a60d43d541..a8c3aac53f 100644
--- a/lcl/include/bitbtn.inc
+++ b/lcl/include/bitbtn.inc
@@ -315,17 +315,7 @@ begin
         idButton := BitBtnImages[Kind];
         if (idButton >= Low(BitBtnResNames)) and (idButton <= High(BitBtnResNames))
         and (BitBtnResNames[idButton] <> '') then
-        begin
-          FButtonGlyph.LCLGlyphName := BitBtnResNames[idButton];
-          CustomGlyph := GetLCLDefaultBtnGlyph(Kind);
-          try
-            if not Assigned(Glyph) then
-              Glyph := TBitmap.Create;
-            Glyph.Assign(CustomGlyph);
-          finally
-            CustomGlyph.Free;
-          end;
-        end
+          FButtonGlyph.LCLGlyphName := BitBtnResNames[idButton]
         else
           ImageIndex := -1;
         GlyphValid := True;