From 1bb786fda71f6b8a75b4b766ed694e2c5dcb68cb Mon Sep 17 00:00:00 2001 From: martin Date: Tue, 25 Feb 2014 11:32:34 +0000 Subject: [PATCH] IDE: allow adding to inherited form and to child-controls on inherited forms (but not frames) git-svn-id: trunk@44234 - --- components/ideintf/propedits.pp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/components/ideintf/propedits.pp b/components/ideintf/propedits.pp index e3bee84bfb..db52daa29f 100644 --- a/components/ideintf/propedits.pp +++ b/components/ideintf/propedits.pp @@ -6277,7 +6277,10 @@ begin // Because of TWriter, you can not put a control onto an // csInline,csAncestor control (e.g. on a frame). if (aControl<>aLookupRoot) - and ([csInline,csAncestor]*aControl.ComponentState<>[]) then + and ((aControl.Owner<>aLookupRoot) + and ([csInline,csAncestor]*aControl.ComponentState<>[])) + or ([csInline]*aControl.ComponentState<>[]) + then begin {$IFDEF VerboseAddDesigner} debugln(['ControlAcceptsStreamableChildComponent aControl=',DbgSName(aControl),' csInline=',csInline in aControl.ComponentState,' csAncestor=',csAncestor in aControl.ComponentState]);