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 275 by tony, Mon Feb 4 13:41:10 2019 UTC vs.
Revision 311 by tony, Mon Aug 24 09:32:58 2020 UTC

#	Line 54 | Line 54 | type
54		FOwner: TIBLookupComboEditBox;
55		protected
56		procedure ActiveChanged; override;
57	<	{$if lcl_fullversion < 2000003}
57	>	{$if lcl_fullversion < 2000000}
58		procedure DataEvent(Event: TDataEvent; Info: Ptrint); override;
59		{$endif}
60		procedure RecordChanged(Field: TField); override;
#	Line 113 | 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);
#	Line 127 | Line 128 | type
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;
#	Line 156 | Line 160 | type
160
161		implementation
162
163	<	uses Variants, LCLProc, LazUTF8, IBUtils;
163	>	uses Variants, LCLProc, LazUTF8, IBUtils, IBMessages;
164
165		{ TIBLookupControlLink }
166
#	Line 178 | Line 182 | begin
182		FOwner.ActiveChanged(self)
183		end;
184
185	<	{$if lcl_fullversion < 2000003}
185	>	{$if lcl_fullversion < 2000000}
186		procedure TIBLookupComboDataLink.DataEvent(Event: TDataEvent; Info: Ptrint);
187		begin
188		inherited DataEvent(Event, Info);
#	Line 248 | 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 365 | Line 370 | begin
370		UTF8Insert(sPrefixText, sResultText, 1);
371		end;
372		Text := sResultText;
368	–	SelStart := iSelStart;
369	–	SelLength := UTF8Length(Text) - iSelStart;
373		end;
374	+	SelStart := iSelStart;
375	+	SelLength := UTF8Length(Text) - iSelStart;
376		end
377		else
378		begin
#	Line 386 | Line 391 | procedure TIBLookupComboEditBox.UpdateSQ
391		Parser: TSelectSQLParser);
392		var FieldPosition: integer;
393		FilterText: string;
394	+	SQLDialect: integer;
395		begin
396		if FFiltered then
397		begin
#	Line 393 | Line 399 | begin
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 ''' +
409	>	Parser.Add2WhereClause(GetRelationNameQualifier + QuoteIdentifierIfNeeded(SQLDialect,ListField) + ' Like ''' +
410		SQLSafeString(FilterText) + '%''')
411		else
412	<	Parser.Add2WhereClause('Upper(' + GetRelationNameQualifier + '"' +  ListField + '") Like Upper(''' +
412	>	Parser.Add2WhereClause('Upper(' + GetRelationNameQualifier + QuoteIdentifierIfNeeded(SQLDialect,ListField) + ') Like Upper(''' +
413		SQLSafeString(FilterText) + '%'')');
414
415		if cbactSearchAscending in AutoCompleteText then
#	Line 422 | 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) or
444	+	not (ListSource.DataSet is TIBCustomDataSet) or
445	+	((ListSource.DataSet as TIBCustomDataSet).Database = nil) then Exit;
446	+	SQLDialect := (ListSource.DataSet as TIBCustomDataSet).Database.SQLDialect;
447	+	FieldNames := TStringList.Create;
448	+	try
449	+	FieldNames.CaseSensitive := true;
450	+	FieldNames.Sorted := true;
451	+	FieldNames.Duplicates := dupError;
452	+	ListSource.DataSet.GetFieldNames(FieldNames);
453	+	if FieldNames.IndexOf(ListField) = -1 then {not found}
454	+	begin
455	+	if (SQLDialect = 3) and (FieldNames.IndexOf(AnsiUpperCase(ListField)) <> - 1) then {normalise to upper case}
456	+	ListField := AnsiUpperCase(ListField)
457	+	else
458	+	IBError(ibxeListFieldNotFound,[ListField])
459	+	end;
460	+	finally
461	+	FieldNames.Free;
462	+	end;
463	+	end;
464	+
465		procedure TIBLookupComboEditBox.CheckAndInsert;
466		var Accept: boolean;
467		NewKeyValue: variant;
#	Line 578 | Line 618 | begin
618		FModified := false;
619		end;
620
621	+
622	+	{Workarounds due to bugs in various Lazarus 2.0 release candidates}
623		{$if lcl_fullversion >= 2000002}
624		type
625
#	Line 586 | Line 628 | type
628		THackedCustomComboBox = class(TCustomComboBox)
629		private
630		procedure CallChange;
631	+	procedure CallUTF8KeyPress(var UTF8Key: TUTF8Char);
632		end;
633
634		{ THackedCustomComboBox }
#	Line 595 | Line 638 | begin
638		inherited Change;
639		end;
640
641	+	procedure THackedCustomComboBox.CallUTF8KeyPress(var UTF8Key: TUTF8Char);
642	+	begin
643	+	inherited UTF8KeyPress(UTF8Key);
644	+	end;
645	+
646		procedure TIBLookupComboEditBox.Change;
647		begin
648		if DataSource = nil then
#	Line 628 | Line 676 | begin
676		end;
677		{$ifend}
678
679	+	{$if lcl_fullversion = 2000002}
680	+	procedure TIBLookupComboEditBox.UTF8KeyPress(var UTF8Key: TUTF8Char);
681	+	begin
682	+	if DataSource = nil then
683	+	THackedCustomComboBox(self).CallUTF8KeyPress(UTF8Key)
684	+	else
685	+	inherited;
686	+	end;
687	+	{$ifend}
688	+
689	+
690		constructor TIBLookupComboEditBox.Create(TheComponent: TComponent);
691		begin
692		inherited Create(TheComponent);

Diff Legend

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