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

Merged revision(s) 62405 #4640c96ffc from trunk:

Browse Source 
IdeIntf: Add ForceUpdate parameter for selecting items in GridColumns editor. Prevents an AV when deleting a column. Issue #36260.
........

git-svn-id: branches/fixes_2_0@62615 -
This commit is contained in:
maxim 2020-02-07 22:05:28 +00:00
parent 702a8b2588
commit 1b233c929f
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
components/ideintf/dbgridcolumnspropeditform.pas
View File

@ -53,8 +53,8 @@ type
FPropertyName: String;
procedure FillCollectionListBox;
function GetDataSet: TDataSet;
procedure SelectInObjectInspector;
procedure UnSelectInObjectInspector;
procedure SelectInObjectInspector(ForceUpdate: Boolean);
procedure UnSelectInObjectInspector(ForceUpdate: Boolean);
procedure UpdDesignHook(aSelection: TPersistentSelectionList);
protected
procedure UpdateCaption;
@ -114,7 +114,7 @@ begin
// (OnClick does not)
UpdateButtons;
UpdateCaption;
SelectInObjectInspector;
SelectInObjectInspector(False);
end;
procedure TDBGridColumnsPropertyEditorForm.actAddExecute(Sender: TObject);
@ -125,7 +125,7 @@ begin
FillCollectionListBox;
if CollectionListBox.Items.Count > 0 then
CollectionListBox.ItemIndex := CollectionListBox.Items.Count - 1;
SelectInObjectInspector;
SelectInObjectInspector(True);
UpdateButtons;
UpdateCaption;
Modified;
@ -169,7 +169,7 @@ begin
if (MessageDlg(dceColumnEditor, dceOkToDelete, mtConfirmation,
[mbYes, mbNo], 0) = mrYes) then
try
UnSelectInObjectInspector;
UnSelectInObjectInspector(True);
FCollection.Clear;
finally
RefreshPropertyValues;
@ -193,7 +193,7 @@ begin
CollectionListBox.ItemIndex := -1;
// unselect all items in OI (collections can act strange on delete)
UnSelectInObjectInspector;
UnSelectInObjectInspector(True);
// now delete
FCollection.Items[I].Free;
// update listbox after whatever happened
@ -204,9 +204,8 @@ begin
if I >= 0 then
begin
CollectionListBox.ItemIndex := I;
SelectInObjectInspector;
SelectInObjectInspector(False);
end;
//debugln('TDBGridColumnsPropertyEditorForm.DeleteClick B');
Modified;
UpdateButtons;
UpdateCaption;
@ -247,7 +246,7 @@ begin
CollectionListBox.ItemIndex := I + 1;
FillCollectionListBox;
SelectInObjectInspector;
SelectInObjectInspector(True);
Modified;
end;
@ -264,7 +263,7 @@ begin
CollectionListBox.ItemIndex := I - 1;
FillCollectionListBox;
SelectInObjectInspector;
SelectInObjectInspector(True);
Modified;
end;
@ -365,7 +364,7 @@ begin
Result:=TCustomDBGrid(FOwnerPersistent).DataSource.DataSet;
end;
procedure TDBGridColumnsPropertyEditorForm.SelectInObjectInspector;
procedure TDBGridColumnsPropertyEditorForm.SelectInObjectInspector(ForceUpdate: Boolean);
var
I: Integer;
NewSelection: TPersistentSelectionList;
@ -373,6 +372,7 @@ begin
Assert(Assigned(FCollection), 'SelectInObjectInspector: FCollection=Nil.');
// select in OI
NewSelection := TPersistentSelectionList.Create;
NewSelection.ForceUpdate := ForceUpdate;
try
for I := 0 to CollectionListBox.Items.Count - 1 do
if CollectionListBox.Selected[I] then
@ -383,11 +383,12 @@ begin
end;
end;
procedure TDBGridColumnsPropertyEditorForm.UnSelectInObjectInspector;
procedure TDBGridColumnsPropertyEditorForm.UnSelectInObjectInspector(ForceUpdate: Boolean);
var
EmptySelection: TPersistentSelectionList;
begin
EmptySelection := TPersistentSelectionList.Create;
EmptySelection.ForceUpdate := ForceUpdate;
try
UpdDesignHook(EmptySelection);
finally