ViewVC Help

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

root/public/ibx/branches/journaling/ibcontrols/IBLookupComboEditBox.pas

Comparing ibx/trunk/ibcontrols/IBLookupComboEditBox.pas (file contents):
Revision 21 by tony, Thu Feb 26 10:33:34 2015 UTC vs.
Revision 291 by tony, Fri Apr 17 10:26:08 2020 UTC

#	Line 15 | Line 15
15		*
16		*  The Initial Developer of the Original Code is Tony Whyman.
17		*
18	<	*  The Original Code is (C) 2011 Tony Whyman, MWA Software
18	>	*  The Original Code is (C) 2015 Tony Whyman, MWA Software
19		*  (http://www.mwasoftware.co.uk).
20		*
21		*  All Rights Reserved.
#	Line 30 | Line 30 | unit IBLookupComboEditBox;
30		interface
31
32		uses
33	<	Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, DbCtrls,
34	<	ExtCtrls, IBSQLParser, DB, StdCtrls;
33	>	Classes, SysUtils, LCLType, LResources, Forms, Controls, Graphics, Dialogs, DbCtrls,
34	>	ExtCtrls, IBSQLParser, DB, StdCtrls, IBCustomDataSet, LCLVersion;
35
36		type
37
#	Line 54 | Line 54 | type
54		FOwner: TIBLookupComboEditBox;
55		protected
56		procedure ActiveChanged; override;
57	+	{$if lcl_fullversion < 2000000}
58		procedure DataEvent(Event: TDataEvent; Info: Ptrint); override;
59	+	{$endif}
60		procedure RecordChanged(Field: TField); override;
61		procedure UpdateData; override;
62		public
63		constructor Create(AOwner: TIBLookupComboEditBox);
64		end;
65
66	+	{ TIBLookupControlLink }
67	+
68	+	TIBLookupControlLink = class(TIBControlLink)
69	+	private
70	+	FOwner: TIBLookupComboEditBox;
71	+	protected
72	+	procedure UpdateSQL(Sender: TObject); override;
73	+	public
74	+	constructor Create(AOwner: TIBLookupComboEditBox);
75	+	end;
76	+
77
78		{ TIBLookupComboEditBox }
79
80		TIBLookupComboEditBox = class(TDBLookupComboBox)
81		private
69	–	FCanAutoInsert: TCanAutoInsert;
82		{ Private declarations }
83		FDataLink: TIBLookupComboDataLink;
84	+	FIBLookupControlLink: TIBLookupControlLink;
85		FAutoComplete: boolean;
86		FAutoInsert: boolean;
87		FKeyPressInterval: integer;
#	Line 81 | Line 94 | type
94		FUpdating: boolean;
95		FInserting: boolean;
96		FExiting: boolean;
97	+	FForceAutoComplete: boolean;
98	+	FInCheckAndInsert: boolean;
99		FLastKeyValue: variant;
100	+	FCurText: string;
101	+	FModified: boolean;
102		procedure DoActiveChanged(Data: PtrInt);
103		function GetAutoCompleteText: TComboBoxAutoCompleteText;
104		function GetListSource: TDataSource;
105		function GetRelationNameQualifier: string;
106		procedure HandleTimer(Sender: TObject);
107	+	procedure IBControlLinkChanged;
108		procedure ResetParser;
109		procedure RecordChanged(Sender: TObject; aField: TField);
110		procedure SetAutoCompleteText(AValue: TComboBoxAutoCompleteText);
#	Line 95 | Line 113 | type
113		procedure UpdateSQL(Sender: TObject; Parser: TSelectSQLParser);
114		procedure HandleEnter(Data: PtrInt);
115		procedure UpdateLinkData(Sender: TObject);
116	+	procedure ValidateListField;
117		protected
118		{ Protected declarations }
119		procedure ActiveChanged(Sender: TObject);
120		procedure CheckAndInsert;
121		procedure DoEnter; override;
122		procedure DoExit; override;
123	+	{$if lcl_fullversion >= 2000002}
124	+	{Deferred update changes in Lazarus 2.0 stop the combo box working when
125	+	the datasource is nil. We thus have to reverse out the changes :(}
126	+	function DoEdit: boolean; override;
127	+	procedure Change; override;
128	+	procedure CloseUp; override;
129	+	procedure Select; override;
130	+	{$ifend}
131	+	{$if lcl_fullversion = 2000002}
132	+	procedure UTF8KeyPress(var UTF8Key: TUTF8Char); override;
133	+	{$ifend}
134		procedure KeyUp(var Key: Word; Shift: TShiftState); override;
135	+	procedure Loaded; override;
136	+	procedure Notification(AComponent: TComponent; Operation: TOperation); override;
137		procedure SetItemIndex(const Val: integer); override;
138		procedure UpdateShowing; override;
139	+	procedure UpdateData(Sender: TObject); override;
140		public
141		{ Public declarations }
142		constructor Create(TheComponent: TComponent); override;
#	Line 118 | Line 151 | type
151		property ItemHeight;
152		property ItemWidth;
153		property ListSource: TDataSource read GetListSource write SetListSource;
154	<	property KeyPressInterval: integer read FKeyPressInterval write FKeyPressInterval default 500;
154	>	property KeyPressInterval: integer read FKeyPressInterval write FKeyPressInterval default 200;
155		property RelationName: string read FRelationName write FRelationName;
156		property OnAutoInsert: TAutoInsert read FOnAutoInsert write FOnAutoInsert;
157		property OnCanAutoInsert: TCanAutoInsert read FOnCanAutoInsert write FOnCanAutoInsert;
#	Line 127 | Line 160 | type
160
161		implementation
162
163	<	uses IBQuery, IBCustomDataSet, LCLType, Variants, LCLProc;
163	>	uses Variants, LCLProc, LazUTF8, IBUtils, IBMessages;
164	>
165	>	{ TIBLookupControlLink }
166	>
167	>	constructor TIBLookupControlLink.Create(AOwner: TIBLookupComboEditBox);
168	>	begin
169	>	inherited Create;
170	>	FOwner := AOwner;
171	>	end;
172	>
173	>	procedure TIBLookupControlLink.UpdateSQL(Sender: TObject);
174	>	begin
175	>	FOwner.UpdateSQL(self,TIBParserDataSet(Sender).Parser)
176	>	end;
177
178		{ TIBLookupComboDataLink }
179
#	Line 136 | Line 182 | begin
182		FOwner.ActiveChanged(self)
183		end;
184
185	+	{$if lcl_fullversion < 2000000}
186		procedure TIBLookupComboDataLink.DataEvent(Event: TDataEvent; Info: Ptrint);
187		begin
188	<	{If we are not visible then avoid unnecessary work}
189	<	if not FOwner.Showing then Exit;
190	<
144	<	if (Event = deCheckBrowseMode) and (Info = 1) and not DataSet.Active then
145	<	begin
146	<	if (DataSet is TIBDataSet) then
147	<	FOwner.UpdateSQL(self,TIBDataSet(DataSet).Parser)
148	<	else
149	<	if (DataSet is TIBQuery) then
150	<	FOwner.UpdateSQL(self,TIBQuery(DataSet).Parser)
151	<	end
152	<	else
153	<	inherited DataEvent(Event, Info);
188	>	inherited DataEvent(Event, Info);
189	>	if Event = deLayoutChange then
190	>	FOwner.LookupCache := FOwner.LookupCache; {sneaky way of calling UpdateLookup}
191		end;
192	+	{$endif}
193
194		procedure TIBLookupComboDataLink.RecordChanged(Field: TField);
195		begin
#	Line 172 | Line 210 | end;
210		{ TIBLookupComboEditBox }
211
212		procedure TIBLookupComboEditBox.HandleTimer(Sender: TObject);
175	–	var ActiveState: boolean;
213		begin
214		FTimer.Interval := 0;
215		FFiltered := Text <> '';
216		UpdateList
217		end;
218
219	+	procedure TIBLookupComboEditBox.IBControlLinkChanged;
220	+	begin
221	+	if (ListSource <> nil) and (ListSource.DataSet <> nil) and (ListSource.DataSet is TIBParserDataSet) then
222	+	FIBLookupControlLink.IBDataSet := TIBCustomDataSet(ListSource.DataSet)
223	+	else
224	+	FIBLookupControlLink.IBDataSet := nil;
225	+	end;
226	+
227		function TIBLookupComboEditBox.GetListSource: TDataSource;
228		begin
229		Result := inherited ListSource;
#	Line 196 | Line 241 | procedure TIBLookupComboEditBox.ActiveCh
241		begin
242		if not FInserting and not FUpdating then
243		Application.QueueAsyncCall(@DoActiveChanged,0);
244	+	IBControlLinkChanged;
245		end;
246
247		procedure TIBLookupComboEditBox.DoActiveChanged(Data: PtrInt);
#	Line 206 | Line 252 | begin
252		and ListSource.DataSet.Active   then
253		begin
254		begin
255	+	ValidateListField;
256		if varIsNull(FLastKeyValue) and (ItemIndex = -1) then
257		KeyValue := ListSource.DataSet.FieldByName(KeyField).AsVariant
258		else
#	Line 237 | Line 284 | begin
284		end;
285
286		procedure TIBLookupComboEditBox.ResetParser;
287	+	var curKeyValue: variant;
288		begin
289		if FFiltered then
290		begin
291		FFiltered := false;
292	+	curKeyValue := KeyValue;
293	+	Text := ''; {Ensure full list}
294		UpdateList;
295	+	KeyValue := curKeyValue;
296		UpdateData(self); {Force Scroll}
297		end;
298		end;
#	Line 276 | Line 327 | begin
327		begin
328		FDataLink.DataSource := AValue;
329		inherited ListSource := AValue;
330	+	IBControlLinkChanged;
331		end;
332		end;
333
#	Line 287 | Line 339 | procedure TIBLookupComboEditBox.UpdateLi
339		var
340		iSelStart: Integer; // char position
341		sCompleteText, sPrefixText, sResultText: string;
290	–	curText: string;
342		begin
343		if assigned(ListSource) and assigned(ListSource.DataSet) and (ListSource.DataSet is TIBCustomDataSet)
344		and ListSource.DataSet.Active then
345		begin
346	+	FCurText := Text;
347		FUpdating := true;
348		try
349		iSelStart := SelStart;//Capture original cursor position
350		if ((iSelStart < UTF8Length(Text)) and
351		(cbactEndOfLineComplete in AutoCompleteText)) then
352		Exit;
301	–	curText := Text;
353		sPrefixText := UTF8Copy(Text, 1, iSelStart);
354		ListSource.DataSet.Active := false;
355		ListSource.DataSet.Active :=  true;
356	<	Text := curText;
357	<	if not FExiting and Focused and (Text <> '')then
356	>	Text := FCurText;
357	>	if not FExiting and (FForceAutoComplete or Focused) and (FCurText <> '')then
358		begin
359		if ListSource.DataSet.Active and (ListSource.DataSet.RecordCount > 0) then
360		begin
361		sCompleteText := ListSource.DataSet.FieldByName(ListField).AsString;
362	<	if (sCompleteText <> Text) then
362	>	if (sCompleteText <> FCurText) then
363		begin
364	+	KeyValue := ListSource.DataSet.FieldByName(KeyField).AsVariant;
365		sResultText := sCompleteText;
366		if ((cbactEndOfLineComplete in AutoCompleteText) and
367		(cbactRetainPrefixCase in AutoCompleteText)) then
#	Line 319 | Line 371 | begin
371		end;
372		Text := sResultText;
373		SelStart := iSelStart;
374	<	SelLength := UTF8Length(Text);
374	>	SelLength := UTF8Length(Text) - iSelStart;
375		end;
376	+	end
377	+	else
378	+	begin
379	+	SelStart := iSelStart;
380	+	SelLength := 0;
381		end;
382		end;
383		finally
384		FUpdating := false
385		end;
386	+	FModified := true;
387		end;
388		end;
389
390		procedure TIBLookupComboEditBox.UpdateSQL(Sender: TObject;
391		Parser: TSelectSQLParser);
392		var FieldPosition: integer;
393	+	FilterText: string;
394	+	SQLDialect: integer;
395		begin
396		if FFiltered then
397		begin
398	+	if FUpdating then
399	+	FilterText := FCurText
400	+	else
401	+	FilterText := Text;
402	+
403	+	if Parser.DataSet <> nil then
404	+	SQLDialect := (Parser.DataSet as TIBCustomDataSet).Database.SQLDialect
405	+	else
406	+	SQLDialect := 1;
407	+
408		if cbactSearchCaseSensitive in AutoCompleteText then
409	<	Parser.Add2WhereClause(GetRelationNameQualifier + '"' + ListField + '" Like ''' + Text + '%''')
409	>	Parser.Add2WhereClause(GetRelationNameQualifier + QuoteIdentifierIfNeeded(SQLDialect,ListField) + ' Like ''' +
410	>	SQLSafeString(FilterText) + '%''')
411		else
412	<	Parser.Add2WhereClause(GetRelationNameQualifier + 'Upper("' + ListField + '") Like Upper(''' + Text + '%'')');
412	>	Parser.Add2WhereClause('Upper(' + GetRelationNameQualifier + QuoteIdentifierIfNeeded(SQLDialect,ListField) + ') Like Upper(''' +
413	>	SQLSafeString(FilterText) + '%'')');
414
415	<	end;
416	<	if cbactSearchAscending in AutoCompleteText then
417	<	begin
418	<	FieldPosition := Parser.GetFieldPosition(ListField);
347	<	if FieldPosition = 0 then Exit;
415	>	if cbactSearchAscending in AutoCompleteText then
416	>	begin
417	>	FieldPosition := Parser.GetFieldPosition(ListField);
418	>	if FieldPosition = 0 then Exit;
419
420	<	Parser.OrderByClause := IntToStr(FieldPosition) + ' ascending';
420	>	Parser.OrderByClause := IntToStr(FieldPosition) + ' ascending';
421	>	end;
422		end;
423		end;
424
425		procedure TIBLookupComboEditBox.HandleEnter(Data: PtrInt);
426		begin
427	<	SelectAll
427	>	if AppDestroying in Application.Flags then Exit;
428	>	SelectAll
429		end;
430
431		procedure TIBLookupComboEditBox.UpdateLinkData(Sender: TObject);
#	Line 361 | Line 434 | begin
434		ListSource.DataSet.FieldByName(ListField).AsString := Text
435		end;
436
437	+	{Check to ensure that ListField exists and convert to upper case if necessary}
438	+
439	+	procedure TIBLookupComboEditBox.ValidateListField;
440	+	var SQLDialect: integer;
441	+	FieldNames: TStringList;
442	+	begin
443	+	if (ListSource = nil) or (ListSource.DataSet = nil) then Exit;
444	+	SQLDialect := (ListSource.DataSet as TIBCustomDataSet).Database.SQLDialect;
445	+	FieldNames := TStringList.Create;
446	+	try
447	+	FieldNames.CaseSensitive := true;
448	+	FieldNames.Sorted := true;
449	+	FieldNames.Duplicates := dupError;
450	+	ListSource.DataSet.GetFieldNames(FieldNames);
451	+	if FieldNames.IndexOf(ListField) = -1 then {not found}
452	+	begin
453	+	if (SQLDialect = 3) and (FieldNames.IndexOf(AnsiUpperCase(ListField)) <> - 1) then {normalise to upper case}
454	+	ListField := AnsiUpperCase(ListField)
455	+	else
456	+	IBError(ibxeListFieldNotFound,[ListField])
457	+	end;
458	+	finally
459	+	FieldNames.Free;
460	+	end;
461	+	end;
462	+
463		procedure TIBLookupComboEditBox.CheckAndInsert;
464		var Accept: boolean;
465		NewKeyValue: variant;
466		begin
467	<	if AutoInsert and (Text <> '') and assigned(ListSource) and assigned(ListSource.DataSet)
468	<	and ListSource.DataSet.Active and (ListSource.DataSet.RecordCount = 0) then
467	>	if FInCheckAndInsert then Exit;
468	>	FInCheckAndInsert := true;
469		try
470	<	{Is it OK to insert a new list member?}
471	<	Accept := true;
472	<	if assigned(FOnCanAutoInsert) then
473	<	OnCanAutoInsert(self,Text,Accept);
474	<	if not Accept then
475	<	begin
476	<	ResetParser;
477	<	Text := FOriginalTextValue;
478	<	SelectAll;
479	<	Exit;
480	<	end;
470	>	if AutoInsert and (Text <> '') and assigned(ListSource) and assigned(ListSource.DataSet)
471	>	and ListSource.DataSet.Active and (ListSource.DataSet.RecordCount = 0) then
472	>	try
473	>	{Is it OK to insert a new list member?}
474	>	Accept := true;
475	>	if assigned(FOnCanAutoInsert) then
476	>	OnCanAutoInsert(self,Text,Accept);
477	>	if not Accept then
478	>	begin
479	>	ResetParser;
480	>	Text := FOriginalTextValue;
481	>	SelectAll;
482	>	Exit;
483	>	end;
484
485	<	FInserting := true;
486	<	try
487	<	{New Value}
488	<	FFiltered := false;
489	<	if assigned(FOnAutoInsert) then
490	<	begin
491	<	{In an OnAutoInsert handler, the client is expected to insert the new
492	<	row into the List DataSet and to set the KeyValue property to the
493	<	value of the primary key of the new row.}
494	<	OnAutoInsert(self,Text,NewKeyValue);
495	<	end
496	<	else
497	<	begin
498	<	ListSource.DataSet.Append;
499	<	{The new KeyValue should be determined by an external generator or
500	<	in the "OnInsert" handler. If it is the same as the ListField, then
501	<	it will be set from the UpdateLinkData method}
502	<	try
503	<	ListSource.DataSet.Post;
504	<	except
505	<	ListSource.DataSet.Cancel;
506	<	raise;
507	<	end;
508	<	NewKeyValue := ListSource.DataSet.FieldByName(KeyField).AsVariant;
509	<	end;
510	<	UpdateList;
511	<	KeyValue := NewKeyValue;
512	<	UpdateData(nil); {Force sync with DataField}
513	<	finally
514	<	FInserting := false
515	<	end;
516	<	except
517	<	Text := FOriginalTextValue;
518	<	ResetParser;
519	<	raise;
485	>	FInserting := true;
486	>	try
487	>	{New Value}
488	>	FFiltered := false;
489	>	if assigned(FOnAutoInsert) then
490	>	begin
491	>	{In an OnAutoInsert handler, the client is expected to insert the new
492	>	row into the List DataSet and to set the KeyValue property to the
493	>	value of the primary key of the new row.}
494	>	OnAutoInsert(self,Text,NewKeyValue);
495	>	end
496	>	else
497	>	begin
498	>	ListSource.DataSet.Append;
499	>	{The new KeyValue should be determined by an external generator or
500	>	in the "OnInsert" handler. If it is the same as the ListField, then
501	>	it will be set from the UpdateLinkData method}
502	>	try
503	>	ListSource.DataSet.Post;
504	>	except
505	>	ListSource.DataSet.Cancel;
506	>	raise;
507	>	end;
508	>	NewKeyValue := ListSource.DataSet.FieldByName(KeyField).AsVariant;
509	>	end;
510	>	Text := ''; {Ensure full list}
511	>	UpdateList;
512	>	KeyValue := NewKeyValue;
513	>	UpdateData(nil); {Force sync with DataField}
514	>	finally
515	>	FInserting := false
516	>	end;
517	>	except
518	>	Text := FOriginalTextValue;
519	>	ResetParser;
520	>	raise;
521	>	end;
522	>	finally
523	>	FInCheckAndInsert := false
524		end;
525		end;
526
#	Line 428 | Line 534 | end;
534
535		procedure TIBLookupComboEditBox.DoExit;
536		begin
537	+	if FTimer.Interval <> 0 then
538	+	HandleTimer(nil);
539		FExiting := true;
540		try
541		CheckAndInsert;
#	Line 442 | Line 550 | end;
550		procedure TIBLookupComboEditBox.KeyUp(var Key: Word; Shift: TShiftState);
551		begin
552		inherited KeyUp(Key, Shift);
445	–	if Key = VK_RETURN then
446	–	EditingDone
447	–	else
553		if Key = VK_ESCAPE then
554		begin
555		SelStart := UTF8Length(Text);      {Ensure end of line selection}
#	Line 453 | Line 558 | begin
558		SelectAll;
559		end
560		else
561	<	if (IsEditableTextKey(Key) or (Key = VK_BACK))
562	<	and AutoComplete and (Style <> csDropDownList) and
563	<	(not (cbactEndOfLineComplete in AutoCompleteText) or (SelStart = UTF8Length(Text))) then
564	<	FTimer.Interval := FKeyPressInterval
565	<	else
566	<	FTimer.Interval := 0
561	>	if AutoComplete and (Style <> csDropDownList) then
562	>	begin
563	>	if (Key = VK_BACK) or (Key = VK_DELETE) then
564	>	begin
565	>	if SelStart = 0 then
566	>	begin
567	>	SelStart := UTF8Length(Text);
568	>	SelLength := 0;
569	>	end;
570	>	FTimer.Interval := 0;
571	>	end
572	>	else
573	>	if IsEditableTextKey(Key) and
574	>	(not(cbactEndOfLineComplete in AutoCompleteText) or (SelStart = UTF8Length(Text))) then
575	>	begin
576	>	FTimer.Interval := 0;
577	>	FTimer.Interval := FKeyPressInterval;
578	>	end;
579	>	end;
580	>	end;
581	>
582	>	procedure TIBLookupComboEditBox.Loaded;
583	>	begin
584	>	inherited Loaded;
585	>	IBControlLinkChanged;
586	>	end;
587	>
588	>	procedure TIBLookupComboEditBox.Notification(AComponent: TComponent;
589	>	Operation: TOperation);
590	>	begin
591	>	inherited Notification(AComponent, Operation);
592	>	if (Operation = opRemove) and (AComponent = DataSource) then
593	>	ListSource := nil;
594		end;
595
596		procedure TIBLookupComboEditBox.SetItemIndex(const Val: integer);
597		begin
598	+	if Val > 0 then
599	+	FCurText := '';
600		inherited SetItemIndex(Val);
601		FLastKeyValue := KeyValue;
602		end;
#	Line 474 | Line 608 | begin
608		ActiveChanged(nil);
609		end;
610
611	+	procedure TIBLookupComboEditBox.UpdateData(Sender: TObject);
612	+	begin
613	+	inherited UpdateData(Sender);
614	+	if FCurText <> '' then
615	+	Text := FCurText + Text;
616	+	FModified := false;
617	+	end;
618	+
619	+
620	+	{Workarounds due to bugs in various Lazarus 2.0 release candidates}
621	+	{$if lcl_fullversion >= 2000002}
622	+	type
623	+
624	+	{ THackedCustomComboBox }
625	+
626	+	THackedCustomComboBox = class(TCustomComboBox)
627	+	private
628	+	procedure CallChange;
629	+	procedure CallUTF8KeyPress(var UTF8Key: TUTF8Char);
630	+	end;
631	+
632	+	{ THackedCustomComboBox }
633	+
634	+	procedure THackedCustomComboBox.CallChange;
635	+	begin
636	+	inherited Change;
637	+	end;
638	+
639	+	procedure THackedCustomComboBox.CallUTF8KeyPress(var UTF8Key: TUTF8Char);
640	+	begin
641	+	inherited UTF8KeyPress(UTF8Key);
642	+	end;
643	+
644	+	procedure TIBLookupComboEditBox.Change;
645	+	begin
646	+	if DataSource = nil then
647	+	THackedCustomComboBox(self).CallChange
648	+	else
649	+	inherited Change;
650	+	end;
651	+
652	+	procedure TIBLookupComboEditBox.CloseUp;
653	+	begin
654	+	inherited DoEdit;
655	+	inherited CloseUp;
656	+	EditingDone;
657	+	end;
658	+
659	+	procedure TIBLookupComboEditBox.Select;
660	+	begin
661	+	inherited Select;
662	+	if DataSource = nil then
663	+	inherited DoEdit;
664	+	end;
665	+
666	+	function TIBLookupComboEditBox.DoEdit: boolean;
667	+	begin
668	+	{DoEdit will swallow characters if no editable Field. Hence, to enabled
669	+	writing we must avoid calling the inherited method.}
670	+	if DataSource = nil then
671	+	Result := true
672	+	else
673	+	Result := inherited DoEdit;
674	+	end;
675	+	{$ifend}
676	+
677	+	{$if lcl_fullversion = 2000002}
678	+	procedure TIBLookupComboEditBox.UTF8KeyPress(var UTF8Key: TUTF8Char);
679	+	begin
680	+	if DataSource = nil then
681	+	THackedCustomComboBox(self).CallUTF8KeyPress(UTF8Key)
682	+	else
683	+	inherited;
684	+	end;
685	+	{$ifend}
686	+
687	+
688		constructor TIBLookupComboEditBox.Create(TheComponent: TComponent);
689		begin
690		inherited Create(TheComponent);
691		FDataLink := TIBLookupComboDataLink.Create(self);
692	<	FKeyPressInterval := 500;
692	>	FIBLookupControlLink := TIBLookupControlLink.Create(self);
693	>	FKeyPressInterval := 200;
694		FAutoComplete := true;
695		FTimer := TTimer.Create(nil);
696		FTimer.Interval := 0;
#	Line 489 | Line 701 | end;
701		destructor TIBLookupComboEditBox.Destroy;
702		begin
703		if assigned(FDataLink) then FDataLink.Free;
704	+	if assigned(FIBLookupControlLink) then FIBLookupControlLink.Free;
705		if assigned(FTimer) then FTimer.Free;
706	+	Application.RemoveAsyncCalls(self);
707		inherited Destroy;
708		end;
709
710		procedure TIBLookupComboEditBox.EditingDone;
711		begin
712	+	FForceAutoComplete := true;
713	+	try
714	+	if FTimer.Interval <> 0 then
715	+	HandleTimer(nil);
716	+	finally
717	+	FForceAutoComplete := false;
718	+	end;
719		CheckAndInsert;
720	+	FCurText := '';
721	+	if FModified then
722	+	Change; {ensure Update}
723		inherited EditingDone;
724		end;
725

Diff Legend

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