From bcca492fd6117d548fc1645d5243cb2effd84370 Mon Sep 17 00:00:00 2001
From: ondrej <ondrej@lazarus-ide.org>
Date: Sun, 27 Dec 2015 13:23:11 +0000
Subject: [PATCH] designer: unify menu editor PopupParent/PopupMode code with
 r51051 #175c0031c0

git-svn-id: trunk@51052 -
---
 designer/menueditorform.lfm | 2 +-
 designer/menueditorform.pas | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/designer/menueditorform.lfm b/designer/menueditorform.lfm
index 5771f66026..b5ee415717 100644
--- a/designer/menueditorform.lfm
+++ b/designer/menueditorform.lfm
@@ -13,7 +13,7 @@ object MenuDesigner: TMenuDesigner
   OnDestroy = FormDestroy
   Position = poScreenCenter
   ShowHint = True
-  LCLVersion = '1.4.4.0'
+  LCLVersion = '1.7'
   object LeftPanel: TPanel
     Left = 0
     Height = 345
diff --git a/designer/menueditorform.pas b/designer/menueditorform.pas
index f579297430..c7cfb36f77 100644
--- a/designer/menueditorform.pas
+++ b/designer/menueditorform.pas
@@ -28,7 +28,7 @@ interface
 uses
   Buttons, Classes, ComponentEditors, Controls, ExtCtrls, Forms,
   Graphics, LazarusIDEStrConsts, LazIDEIntf, LCLintf, LCLProc, Menus,
-  MenuShadows, PropEdits, StdCtrls, SysUtils, FormEditingIntf;
+  MenuShadows, PropEdits, StdCtrls, SysUtils, FormEditingIntf, IDEWindowIntf;
 
 type
 
@@ -143,11 +143,7 @@ begin
   if (aMenu = nil) then
     RaiseGDBException(lisMenuEditorShowMenuEditorTMenuParameterIsNil);
   MenuDesigner.SetMenu(aMenu, nil);
-  MenuDesigner.PopupParent:=GetParentForm(FormEditingHook.GetCurrentObjectInspector, True);
-  if MenuDesigner.PopupParent<>nil then
-    MenuDesigner.PopupMode:=pmExplicit
-  else
-    MenuDesigner.PopupMode:=pmNone;
+  SetPopupModeParentForPropertyEditor(MenuDesigner);
   MenuDesigner.ShowOnTop;
 end;