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

TAChart: Fix crash on deleting subcomponent with active property editor

Browse Source 
git-svn-id: trunk@38792 -
This commit is contained in:
ask 2012-09-21 17:30:22 +00:00
parent e4d555f7f9
commit 333ad8cbcd
2 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/tachart/editors/tasubcomponentseditor.lfm
View File

@ -10,7 +10,7 @@ object ComponentListEditorForm: TComponentListEditorForm
OnCreate = FormCreate
OnDestroy = FormDestroy
Position = poScreenCenter
LCLVersion = '0.9.29'
LCLVersion = '1.1'
object ChildrenListBox: TListBox
Left = 0
Height = 198

22
components/tachart/editors/tasubcomponentseditor.pas
View File

@ -328,10 +328,14 @@ end;
procedure TComponentListEditorForm.OnPersistentDeleting(
APersistent: TPersistent);
var
i: Integer;
i, wasSelected: Integer;
begin
if FindChild(APersistent, i) then
ChildrenListBox.Items.Delete(i);
if not FindChild(APersistent, i) then exit;
with ChildrenListBox do begin
wasSelected := ItemIndex;
Items.Delete(i);
ItemIndex := Min(wasSelected, Count - 1);
end;
end;
procedure TComponentListEditorForm.OnSetSelection(
@ -383,19 +387,9 @@ begin
end;
procedure TComponentListEditorForm.tbDeleteClick(Sender: TObject);
var
i: Integer;
s: TComponent;
begin
if ChildrenListBox.SelCount = 0 then exit;
for i := ChildrenListBox.Items.Count - 1 downto 0 do
if ChildrenListBox.Selected[i] then begin
s := TComponent(ChildrenListBox.Items.Objects[i]);
ChildrenListBox.Items.Delete(i);
FDesigner.PropertyEditorHook.PersistentDeleting(s);
s.Free;
end;
FDesigner.Modified;
FDesigner.DeleteSelection;
SelectionChanged;
end;