paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-17 12:39:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merged revision(s) 44234 #1bb786fda7 from trunk:

Browse Source 
IDE: allow adding to inherited form and to child-controls on inherited forms (but not frames)
........

git-svn-id: branches/fixes_1_2@44259 -
This commit is contained in:
maxim 2014-02-26 20:00:28 +00:00
parent d7606f2b34
commit 7bcbac0761
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
components/ideintf/propedits.pp
View File

@ -6265,7 +6265,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]);