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

LCL: Undo r55912 and r55894 #14e5f42ff3 (crashing DBCombobox if focused and mousewheel is rotated, see comment at issue #32463)

Browse Source 
git-svn-id: trunk@56883 -
This commit is contained in:
wp 2017-12-30 20:54:51 +00:00
parent dc9ee2274f
commit 3750bde9cd
3 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lcl/dbctrls.pp
View File

@ -735,7 +735,6 @@ Type
TDBComboBox = class(TCustomDBComboBox) TDBComboBox = class(TCustomDBComboBox)
protected protected
procedure Change; override;
procedure DataChange(Sender: TObject); override; procedure DataChange(Sender: TObject); override;
procedure KeyDown(var Key: Word; Shift: TShiftState); override; procedure KeyDown(var Key: Word; Shift: TShiftState); override;
procedure KeyPress(var Key: char); override; procedure KeyPress(var Key: char); override;

10
lcl/include/customdbcombobox.inc
View File

@ -34,15 +34,7 @@ end;
procedure TCustomDBComboBox.Change; procedure TCustomDBComboBox.Change;
begin begin
FDataLink.OnDataChange := nil; FDataLink.Modified;
try
if FDataLink.CanModify then begin
FDataLink.Edit;
FDataLink.Modified;
end;
finally
FDataLink.OnDataChange := @DataChange;
end;
inherited Change; inherited Change;
end; end;

12
lcl/include/dbcombobox.inc
View File

@ -17,18 +17,6 @@ begin
FDataLink.Field.Text := Text; FDataLink.Field.Text := Text;
end; end;
procedure TDBComboBox.Change;
begin
try
if FDataLink.CanModify then begin
FDataLink.Field.AsString := Text;
FDatalink.Modified;
end;
finally
inherited Change;
end;
end;
procedure TDBComboBox.DataChange(Sender: TObject); procedure TDBComboBox.DataChange(Sender: TObject);
var var
DataLinkField: TField; DataLinkField: TField;