ViewVC Help

View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing

root/public/ibx/trunk/ibcontrols/IBLookupComboEditBox.pas

Comparing ibx/trunk/ibcontrols/IBLookupComboEditBox.pas (file contents):
Revision 64 by tony, Thu Jun 29 11:11:22 2017 UTC vs.
Revision 209 by tony, Wed Mar 14 12:48:51 2018 UTC

#	Line 54 | Line 54 | type
54		FOwner: TIBLookupComboEditBox;
55		protected
56		procedure ActiveChanged; override;
57	+	procedure DataEvent(Event: TDataEvent; Info: Ptrint); override;
58		procedure RecordChanged(Field: TField); override;
59		procedure UpdateData; override;
60		public
#	Line 96 | Line 97 | type
97		FInCheckAndInsert: boolean;
98		FLastKeyValue: variant;
99		FCurText: string;
100	+	FModified: boolean;
101		procedure DoActiveChanged(Data: PtrInt);
102		function GetAutoCompleteText: TComboBoxAutoCompleteText;
103		function GetListSource: TDataSource;
#	Line 122 | Line 124 | type
124		procedure SetItemIndex(const Val: integer); override;
125		function SQLSafe(aText: string): string;
126		procedure UpdateShowing; override;
127	<
127	>	procedure UpdateData(Sender: TObject); override;
128		public
129		{ Public declarations }
130		constructor Create(TheComponent: TComponent); override;
#	Line 168 | Line 170 | begin
170		FOwner.ActiveChanged(self)
171		end;
172
173	+	procedure TIBLookupComboDataLink.DataEvent(Event: TDataEvent; Info: Ptrint);
174	+	begin
175	+	inherited DataEvent(Event, Info);
176	+	if Event = deLayoutChange then
177	+	FOwner.LookupCache := FOwner.LookupCache; {sneaky way of calling UpdateLookup}
178	+	end;
179	+
180		procedure TIBLookupComboDataLink.RecordChanged(Field: TField);
181		begin
182		FOwner.RecordChanged(self,Field);
#	Line 350 | Line 359 | begin
359		SelLength := UTF8Length(Text);
360		end;
361		KeyValue := ListSource.DataSet.FieldByName(KeyField).AsVariant;
362	+	end
363	+	else
364	+	begin
365	+	SelStart := iSelStart;
366	+	SelLength := 0;
367		end;
368		end;
369		finally
370		FUpdating := false
371		end;
372	+	FModified := true;
373		end;
374		end;
375
#	Line 546 | Line 561 | begin
561		ActiveChanged(nil);
562		end;
563
564	+	procedure TIBLookupComboEditBox.UpdateData(Sender: TObject);
565	+	begin
566	+	inherited UpdateData(Sender);
567	+	FModified := false;
568	+	end;
569	+
570		constructor TIBLookupComboEditBox.Create(TheComponent: TComponent);
571		begin
572		inherited Create(TheComponent);
#	Line 564 | Line 585 | begin
585		if assigned(FDataLink) then FDataLink.Free;
586		if assigned(FIBLookupControlLink) then FIBLookupControlLink.Free;
587		if assigned(FTimer) then FTimer.Free;
588	+	Application.RemoveAsyncCalls(self);
589		inherited Destroy;
590		end;
591
#	Line 577 | Line 599 | begin
599		FForceAutoComplete := false;
600		end;
601		CheckAndInsert;
602	+	if FModified then
603	+	Change; {ensure Update}
604		inherited EditingDone;
605		end;
606

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines