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 266 by tony, Wed Dec 26 18:34:32 2018 UTC vs.
Revision 278 by tony, Mon Feb 4 13:47:40 2019 UTC

#	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
#	Line 117 | Line 119 | type
119		procedure CheckAndInsert;
120		procedure DoEnter; override;
121		procedure DoExit; override;
122	<	{$if lcl_fullversion >= 2000000}
122	>	{$if lcl_fullversion >= 2000002}
123		{Deferred update changes in Lazarus 2.0 stop the combo box working when
124		the datasource is nil. We thus have to reverse out the changes :(}
125		function DoEdit: boolean; override;
#	Line 125 | Line 127 | type
127		procedure CloseUp; override;
128		procedure Select; override;
129		{$ifend}
130	+	{$if lcl_fullversion = 2000002}
131	+	procedure UTF8KeyPress(var UTF8Key: TUTF8Char); override;
132	+	{$ifend}
133		procedure KeyUp(var Key: Word; Shift: TShiftState); override;
134		procedure Loaded; override;
135		procedure Notification(AComponent: TComponent; Operation: TOperation); override;
136		procedure SetItemIndex(const Val: integer); override;
132	–	function SQLSafe(aText: string): string;
137		procedure UpdateShowing; override;
138		procedure UpdateData(Sender: TObject); override;
139		public
#	Line 155 | Line 159 | type
159
160		implementation
161
162	<	uses Variants, LCLProc, LazUTF8;
162	>	uses Variants, LCLProc, LazUTF8, IBUtils;
163
164		{ TIBLookupControlLink }
165
#	Line 177 | Line 181 | begin
181		FOwner.ActiveChanged(self)
182		end;
183
184	+	{$if lcl_fullversion < 2000000}
185		procedure TIBLookupComboDataLink.DataEvent(Event: TDataEvent; Info: Ptrint);
186		begin
187		inherited DataEvent(Event, Info);
188		if Event = deLayoutChange then
189		FOwner.LookupCache := FOwner.LookupCache; {sneaky way of calling UpdateLookup}
190		end;
191	+	{$endif}
192
193		procedure TIBLookupComboDataLink.RecordChanged(Field: TField);
194		begin
#	Line 392 | Line 398 | begin
398		FilterText := Text;
399		if cbactSearchCaseSensitive in AutoCompleteText then
400		Parser.Add2WhereClause(GetRelationNameQualifier + '"' + ListField + '" Like ''' +
401	<	SQLSafe(FilterText) + '%''')
401	>	SQLSafeString(FilterText) + '%''')
402		else
403		Parser.Add2WhereClause('Upper(' + GetRelationNameQualifier + '"' +  ListField + '") Like Upper(''' +
404	<	SQLSafe(FilterText) + '%'')');
404	>	SQLSafeString(FilterText) + '%'')');
405
406		if cbactSearchAscending in AutoCompleteText then
407		begin
#	Line 560 | Line 566 | begin
566		FLastKeyValue := KeyValue;
567		end;
568
563	–	function TIBLookupComboEditBox.SQLSafe(aText: string): string;
564	–	var I: integer;
565	–	begin
566	–	Result := '';
567	–	for I := 1 to length(aText) do
568	–	if aText[I] = '''' then
569	–	Result := Result + ''''''
570	–	else
571	–	Result := Result + aText[I];
572	–	end;
573	–
569		procedure TIBLookupComboEditBox.UpdateShowing;
570		begin
571		inherited UpdateShowing;
#	Line 586 | Line 581 | begin
581		FModified := false;
582		end;
583
584	<	{$if lcl_fullversion >= 2000000}
584	>
585	>	{Workarounds due to bugs in various Lazarus 2.0 release candidates}
586	>	{$if lcl_fullversion >= 2000002}
587		type
588
589		{ THackedCustomComboBox }
#	Line 594 | Line 591 | type
591		THackedCustomComboBox = class(TCustomComboBox)
592		private
593		procedure CallChange;
594	+	procedure CallUTF8KeyPress(var UTF8Key: TUTF8Char);
595		end;
596
597		{ THackedCustomComboBox }
#	Line 603 | Line 601 | begin
601		inherited Change;
602		end;
603
604	+	procedure THackedCustomComboBox.CallUTF8KeyPress(var UTF8Key: TUTF8Char);
605	+	begin
606	+	inherited UTF8KeyPress(UTF8Key);
607	+	end;
608	+
609		procedure TIBLookupComboEditBox.Change;
610		begin
611	<	THackedCustomComboBox(self).CallChange;
611	>	if DataSource = nil then
612	>	THackedCustomComboBox(self).CallChange
613	>	else
614	>	inherited Change;
615		end;
616
617		procedure TIBLookupComboEditBox.CloseUp;
618		begin
613	–	inherited CloseUp;
619		inherited DoEdit;
620	+	inherited CloseUp;
621	+	EditingDone;
622		end;
623
624		procedure TIBLookupComboEditBox.Select;
625		begin
626		inherited Select;
627	<	inherited DoEdit;
627	>	if DataSource = nil then
628	>	inherited DoEdit;
629		end;
630
631		function TIBLookupComboEditBox.DoEdit: boolean;
632		begin
633		{DoEdit will swallow characters if no editable Field. Hence, to enabled
634		writing we must avoid calling the inherited method.}
635	<	if IsUnbound then
635	>	if DataSource = nil then
636		Result := true
637		else
638		Result := inherited DoEdit;
639		end;
640		{$ifend}
641
642	+	{$if lcl_fullversion = 2000002}
643	+	procedure TIBLookupComboEditBox.UTF8KeyPress(var UTF8Key: TUTF8Char);
644	+	begin
645	+	if DataSource = nil then
646	+	THackedCustomComboBox(self).CallUTF8KeyPress(UTF8Key)
647	+	else
648	+	inherited;
649	+	end;
650	+	{$ifend}
651	+
652	+
653		constructor TIBLookupComboEditBox.Create(TheComponent: TComponent);
654		begin
655		inherited Create(TheComponent);

Diff Legend

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