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

LCL: fixed TCustomListViewEditor.Create override and TLazAccessibleObject.RemoveChildAccessibleObject if object is not in tree

Browse Source 
git-svn-id: trunk@35376 -
This commit is contained in:
mattias 2012-02-15 15:26:07 +00:00
parent bf68067f24
commit c6dfe9276c
3 changed files with 9 additions and 5 deletions

2
lcl/comctrls.pp
View File

@ -1249,7 +1249,7 @@ type
protected
procedure DoExit; override;
public
constructor Create(AOwner: TComponent);
constructor Create(AOwner: TComponent); override;
property Item: TListItem read FItem write FItem;
end;

3
lcl/include/control.inc
View File

@ -212,8 +212,9 @@ var
begin
if FChildrenSortedForDataObject = nil then Exit;
Node:=FChildrenSortedForDataObject.Find(AObject);
if Node=nil then exit;
FChildrenSortedForDataObject.Delete(Node);
if (Node<>nil) and AFreeObject then
if AFreeObject then
AObject.Free;
end;

9
lcl/include/treeview.inc
View File

@ -320,9 +320,12 @@ begin
if Assigned(Owner) and Assigned(Owner.Owner) then
begin
lOwnerAccessibleObject := Owner.Owner.GetAccessibleObject();
lAccessibleObject := lOwnerAccessibleObject.GetChildAccessibleObjectWithDataObject(Self);
if lAccessibleObject <> nil then
lOwnerAccessibleObject.RemoveChildAccessibleObject(lAccessibleObject);
if lOwnerAccessibleObject<>nil then
begin
lAccessibleObject := lOwnerAccessibleObject.GetChildAccessibleObjectWithDataObject(Self);
if lAccessibleObject <> nil then
lOwnerAccessibleObject.RemoveChildAccessibleObject(lAccessibleObject);
end;
end;
// delete children