From 54e9cc917103096edb9a52aa97a6916ca58f10af Mon Sep 17 00:00:00 2001
From: Bart <9132501-flyingsheep@users.noreply.gitlab.com>
Date: Mon, 6 Nov 2023 13:22:24 +0100
Subject: [PATCH] TCustomAbstractGroupedEdit: assign PopupMenu also to FBuddy
 (if this does not have a separate PopupMenu by itself). Resolves part of
 #38098.

---
 lcl/groupededit.pp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lcl/groupededit.pp b/lcl/groupededit.pp
index b72b33e208..9eef1dcbdc 100644
--- a/lcl/groupededit.pp
+++ b/lcl/groupededit.pp
@@ -905,8 +905,14 @@ begin
 end;
 
 procedure TCustomAbstractGroupedEdit.SetPopupMenu(AValue: TPopupMenu);
+var
+  OldPopupMenu: TPopupMenu;
 begin
+  OldPopupMenu := FEdit.PopupMenu;
   FEdit.PopupMenu := AValue;
+  //users can assign a different popupmenu to the buddy if so desired, if that is the case, don't touch it
+  if (FBuddy.PopupMenu = OldPopupMenu) then
+    FBuddy.PopupMenu := AValue;
 end;
 
 procedure TCustomAbstractGroupedEdit.RealSetText(const AValue: TCaption);