paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-12-16 01:40:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

IDEIntf: added TInterfacePropertyEditor, issue #31324, from Michal Gawrycki

Browse Source 
git-svn-id: trunk@54067 -
This commit is contained in:
mattias 2017-02-02 11:13:45 +00:00
parent 55a6faef60
commit 99b5de9bd3
2 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/ideintf/objectinspector.pp
View File

@ -64,7 +64,7 @@ const
DefaultOITypeKinds = [
tkUnknown, tkInteger, tkChar, tkEnumeration, tkFloat, tkSet,{ tkMethod,}
tkSString, tkLString, tkAString, tkWString, tkVariant,
{tkArray, tkRecord, tkInterface,} tkClass, tkObject, tkWChar, tkBool,
{tkArray, tkRecord,} tkInterface, tkClass, tkObject, tkWChar, tkBool,
tkInt64, tkQWord, tkUString, tkUChar];
type
EObjectInspectorException = class(Exception);

33
components/ideintf/propedits.pp
View File

@ -740,6 +740,7 @@ type
function AllEqual: Boolean; override;
procedure GetValues(Proc: TGetStrProc); override;
procedure SetValue(const NewValue: string); override;
function GetValue: AnsiString; override;
end;
{ TNoteBookActiveControlPropertyEditor }
@ -2035,7 +2036,7 @@ const
TPropertyEditor, // tkVariant
nil, // tkArray
nil, // tkRecord
nil, // tkInterface
TInterfacePropertyEditor, // tkInterface
TClassPropertyEditor, // tkClass
nil, // tkObject
TPropertyEditor, // tkWChar
@ -4984,17 +4985,18 @@ end;
function TInterfacePropertyEditor.AllEqual: Boolean;
var
I: Integer;
Intf: IInterface;
Component: TComponent;
begin
Result := False;
Intf := GetIntfValue;
Component := GetComponentReference;
if PropCount > 1 then
for I := 1 to PropCount - 1 do
if GetIntfValueAt(I) <> Intf then
if GetComponent(GetIntfValueAt(I)) <> Component then
Exit;
if not Assigned(Intf) then
Exit;
Result := csDesigning in GetComponent(Intf).ComponentState;
if Assigned(Component) then
Result := csDesigning in Component.ComponentState
else
Result := True;
end;
function TInterfacePropertyEditor.GetComponent(const AInterface: IInterface): TComponent;
@ -5075,14 +5077,29 @@ begin
Component := PropertyHook.GetComponent(NewValue);
if not Assigned(Component) or not Supports(Component, GetTypeData(GetPropType)^.GUID) then
raise EPropertyError.Create(oisInvalidPropertyValue);
Intf := Component;
end
else
Intf := nil;
end;
// ToDo: Intf is either Nil or uninitialized. JuMa
SetIntfValue(Intf);
end;
function TInterfacePropertyEditor.GetValue: AnsiString;
var
Component: TComponent;
begin
Result := '';
Component := GetComponentReference;
if Assigned(Component) then begin
if Assigned(PropertyHook) then
Result := PropertyHook.GetComponentName(Component)
else
Result := Component.Name;
end else
Result := inherited GetValue;
end;
{ TComponentNamePropertyEditor }
function TComponentNamePropertyEditor.GetAttributes: TPropertyAttributes;