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

fixed TDBComboBox update (bug #873) from Joost van der Sluis

Browse Source 
git-svn-id: trunk@7160 -
This commit is contained in:
mattias 2005-05-07 13:00:18 +00:00
parent 9b5fa5c965
commit e56a156d04
2 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lcl/dbctrls.pp
View File

@ -455,12 +455,12 @@ Type
procedure SetDataSource(const AValue: TDataSource);
procedure SetReadOnly(const AValue: Boolean);
protected
function GetComboText: string; virtual;
procedure SetComboText(const NewText: string); virtual;
procedure DataChange(Sender: TObject); virtual;
procedure ActiveChange(Sender: TObject); //virtual;
procedure EditingChange(Sender: TObject); virtual;
procedure Notification(AComponent: TComponent;
Operation: TOperation); override;
procedure Change; override;
procedure UpdateData(Sender: TObject); virtual;
procedure FocusRequest(Sender: TObject); virtual;
procedure Loaded; override;
@ -1172,10 +1172,10 @@ begin
if not IsModified then
exit;
IsModified := False;
if Assigned(FOnUpdateData) then
FOnUpdateData(Self);
IsModified := False;
end;
{ Delphi Help ->
@ -1302,6 +1302,9 @@ end.
{ =============================================================================
$Log$
Revision 1.29 2005/05/07 13:00:18 mattias
fixed TDBComboBox update (bug 873) from Joost van der Sluis
Revision 1.28 2005/05/03 16:43:43 mattias
added key handling for TDBMemo from Jesus

63
lcl/include/dbcombobox.inc
View File

@ -31,6 +31,18 @@ begin
Result:=FDataLink.Field;
end;
procedure TDBComboBox.Change;
begin
//need to override this to make sure the datalink gets notified
//its been modified, then when post etc, it will call
//updatedata to update the field data with current value
FDatalink.edit;
FDataLink.Modified;
inherited Change;
end;
function TDBComboBox.GetReadOnly: Boolean;
begin
Result:=FDataLink.ReadOnly;
@ -54,46 +66,18 @@ begin
FDataLink.ReadOnly:=AValue;
end;
function TDBComboBox.GetComboText: string;
var
i: Integer;
begin
if Style in [csDropDown,csSimple] then
Result:=Text
else begin
i:=ItemIndex;
if i<0 then
Result:=''
else
Result:=Items[i];
end;
end;
procedure TDBComboBox.SetComboText(const NewText: string);
var
i: Integer;
begin
if NewText=GetComboText then exit;
if NewText='' then
i:=-1
else
i:=Items.IndexOf(NewText);
ItemIndex:=i;
if ItemIndex>=0 then Exit;
if Style in [csDropDown,csSimple] then Text:=NewText;
end;
procedure TDBComboBox.DataChange(Sender: TObject);
begin
if not (Style=csSimple) and DroppedDown then Exit;
if FDataLink.Field <> nil then
// ToDo: use Field.Text
SetComboText(FDataLink.Field.DisplayText)
Text := FDataLink.Field.DisplayText
else
if csDesigning in ComponentState then
SetComboText(Name)
Text := Name
else
SetComboText('');
Text := '';
end;
procedure TDBComboBox.EditingChange(Sender: TObject);
@ -112,9 +96,10 @@ begin
end;
procedure TDBComboBox.UpdateData(Sender: TObject);
begin
// ToDo: use Field.Text
FDataLink.Field.AsString:=GetComboText;
FDataLink.Field.Text := text;
FDataLink.Field.AsString := text;
end;
procedure TDBComboBox.FocusRequest(Sender: TObject);
@ -138,6 +123,17 @@ begin
inherited EditingDone;
end;
procedure TDBComboBox.ActiveChange(Sender: TObject);
begin
if FDatalink.Active then datachange(sender)
else
begin
text := '';
FDataLink.reset;
end;
end;
constructor TDBComboBox.Create(TheOwner: TComponent);
begin
inherited Create(TheOwner);
@ -146,6 +142,7 @@ begin
FDataLink.Control:=Self;
FDataLink.OnDataChange:=@DataChange;
FDataLink.OnUpdateData:=@UpdateData;
FDataLInk.OnActiveChange := @ActiveChange;
FDataLink.OnEditingChange:=@EditingChange;
end;