paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-18 15:19:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDEIntf: fixed TMethodPropertyEditor setting nil, bug #11666

Browse Source 
git-svn-id: trunk@15791 -
This commit is contained in:
mattias 2008-07-16 10:11:44 +00:00
parent 92b6e4d35d
commit 2bc8e3e329
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ideintf/propedits.pp
View File

@ -4016,18 +4016,24 @@ var
CurValue: string;
NewMethodExists, NewMethodIsCompatible, NewMethodIsPublished,
NewIdentIsMethod: boolean;
IsNil: Boolean;
NewMethod: TMethod;
begin
CurValue:=GetValue;
if CurValue=NewValue then exit;
//DebugLn('### TMethodPropertyEditor.SetValue A OldValue="',CurValue,'" NewValue=',NewValue);
if not IsValidIdent(NewValue) then begin
IsNil:=(NewValue='') or (NewValue=oisNone);
if (not IsNil) and (not IsValidIdent(NewValue))
then begin
MessageDlg(oisIncompatibleIdentifier,
'"'+NewValue+'" is not a valid method name.', mtError,
[mbCancel, mbIgnore], 0);
exit;
end;
NewMethodExists:=PropertyHook.MethodExists(NewValue,GetTypeData(GetPropType),
NewMethodExists:=(not IsNil)
and PropertyHook.MethodExists(NewValue,GetTypeData(GetPropType),
NewMethodIsCompatible,NewMethodIsPublished,NewIdentIsMethod);
//DebugLn('### TMethodPropertyEditor.SetValue B NewMethodExists=',NewMethodExists,' NewMethodIsCompatible=',NewMethodIsCompatible,' ',NewMethodIsPublished,' ',NewIdentIsMethod);
if NewMethodExists then begin
@ -4057,6 +4063,11 @@ begin
end;
end;
//DebugLn('### TMethodPropertyEditor.SetValue C');
if IsNil then begin
NewMethod.Data:=nil;
NewMethod.Code:=nil;
SetMethodValue(NewMethod);
end else
if IsValidIdent(CurValue)
and (not NewMethodExists)
and (not PropertyHook.MethodFromAncestor(GetMethodValue)) then begin