From 138ad73ec6dfc42490e672f81ac697c5807f0652 Mon Sep 17 00:00:00 2001 From: mattias Date: Mon, 7 Jul 2008 22:21:48 +0000 Subject: [PATCH] IDE: fixed creating methods with the right LookupRoot owner for inline components git-svn-id: trunk@15700 - --- designer/jitforms.pp | 4 ++-- ide/main.pp | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/designer/jitforms.pp b/designer/jitforms.pp index eba6905036..70c5109fa9 100644 --- a/designer/jitforms.pp +++ b/designer/jitforms.pp @@ -1648,7 +1648,7 @@ begin Method.Data := FCurReadJITComponent; end else begin // create a fake TJITMethod - JITMethod:=JITMethods.Add(FCurReadJITComponent.ClassType,TheMethodName); + JITMethod:=JITMethods.Add(Reader.LookupRoot.ClassType,TheMethodName); Method:=JITMethod.Method; end; SetMethodProp(Instance, PropInfo, Method); @@ -1842,7 +1842,7 @@ function TJITMethods.Add(aClass: TClass; begin Result:=Find(aClass,aMethodName); if Result=nil then begin - //DebugLn(['TJITMethods.Add Create Class=',dbgsname(aClass),' aMethodName=',aMethodName]); + DebugLn(['TJITMethods.Add Create Class=',dbgsname(aClass),' aMethodName=',aMethodName]); Result:=TJITMethod.Create(Self,aClass,aMethodName); end; end; diff --git a/ide/main.pp b/ide/main.pp index 62fc26fd35..8d0bd0445e 100644 --- a/ide/main.pp +++ b/ide/main.pp @@ -1413,6 +1413,8 @@ end; function TMainIDE.OnPropHookGetMethodName(const Method: TMethod; CheckOwner: TObject): ShortString; +var + JITMethod: TJITMethod; begin if Method.Code<>nil then begin if Method.Data<>nil then begin @@ -1426,7 +1428,11 @@ begin end else Result:=''; end else if IsJITMethod(Method) then begin - Result:=TJITMethod(Method.Data).TheMethodName; + JITMethod:=TJITMethod(Method.Data); + Result:=JITMethod.TheMethodName; + if GlobalDesignHook.LookupRoot.ClassType<>JITMethod.TheClass then begin + Result:=JITMethod.TheClass.ClassName+'.'+Result; + end; end else Result:=''; end;