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

Manually merged revision(s) 56884 #7e59f25f89, 56948 #6e9a07b58b from trunk: LCL: Alternative fix of Issue #32383 avoiding crash of DBCombobox and regression (Issue #32463) in DBCombobox and DBLookupCombobox

Browse Source 
git-svn-id: branches/fixes_1_8@56990 -
This commit is contained in:
wp 2018-01-06 16:31:16 +00:00
parent 0802baa1d3
commit 747ea8c57b
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lcl/include/dbcombobox.inc
View File

@ -64,6 +64,7 @@ begin
try
if FDataLink.Edit then
begin
FDataLink.Modified;
FDataLink.UpdateData;
inherited Select;
end

19
lcl/include/dblookupcombobox.inc
View File

@ -66,8 +66,23 @@ end;
procedure TDBLookupComboBox.Select;
begin
FDataLink.Modified;
inherited Select;
FDataLink.OnDataChange := nil;
try
if FDataLink.Edit then
begin
FDataLink.Modified;
FDataLink.UpdateData;
inherited Select;
end
else
begin
// if cannot modify, let it reset
FDatalink.Reset;
DataChange(Self);
end;
finally
FDataLink.OnDataChange := @DataChange;
end;
end;
procedure TDBLookupComboBox.KeyDown(var Key: Word; Shift: TShiftState);