ViewVC Help
View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing
root/public/ibx/trunk/ibcontrols/IBLookupComboEditBox.pas
(Generate patch)

Comparing ibx/trunk/ibcontrols/IBLookupComboEditBox.pas (file contents):
Revision 225 by tony, Tue Apr 3 09:09:05 2018 UTC vs.
Revision 272 by tony, Mon Feb 4 13:34:37 2019 UTC

# 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, IBCustomDataSet;
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 < 2000003}
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 >= 2000003}
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;
126 +    procedure Change; override;
127 +    procedure CloseUp; override;
128 +    procedure Select; override;
129 +    {$ifend}
130      procedure KeyUp(var Key: Word; Shift: TShiftState); override;
131      procedure Loaded; override;
132      procedure Notification(AComponent: TComponent; Operation: TOperation); override;
133      procedure SetItemIndex(const Val: integer); override;
124 –    function SQLSafe(aText: string): string;
134      procedure UpdateShowing; override;
135      procedure UpdateData(Sender: TObject); override;
136    public
# Line 147 | Line 156 | type
156  
157   implementation
158  
159 < uses LCLType, Variants, LCLProc, LazUTF8;
159 > uses Variants, LCLProc, LazUTF8, IBUtils;
160  
161   { TIBLookupControlLink }
162  
# Line 169 | Line 178 | begin
178    FOwner.ActiveChanged(self)
179   end;
180  
181 + {$if lcl_fullversion < 2000003}
182   procedure TIBLookupComboDataLink.DataEvent(Event: TDataEvent; Info: Ptrint);
183   begin
184    inherited DataEvent(Event, Info);
185    if Event = deLayoutChange then
186     FOwner.LookupCache := FOwner.LookupCache; {sneaky way of calling UpdateLookup}
187   end;
188 + {$endif}
189  
190   procedure TIBLookupComboDataLink.RecordChanged(Field: TField);
191   begin
# Line 384 | Line 395 | begin
395        FilterText := Text;
396      if cbactSearchCaseSensitive in AutoCompleteText then
397        Parser.Add2WhereClause(GetRelationNameQualifier + '"' + ListField + '" Like ''' +
398 <                                  SQLSafe(FilterText) + '%''')
398 >                                  SQLSafeString(FilterText) + '%''')
399      else
400        Parser.Add2WhereClause('Upper(' + GetRelationNameQualifier + '"' +  ListField + '") Like Upper(''' +
401 <                                  SQLSafe(FilterText) + '%'')');
401 >                                  SQLSafeString(FilterText) + '%'')');
402  
403      if cbactSearchAscending in AutoCompleteText then
404      begin
# Line 501 | Line 512 | end;
512   procedure TIBLookupComboEditBox.KeyUp(var Key: Word; Shift: TShiftState);
513   begin
514    inherited KeyUp(Key, Shift);
504 –  if Key = VK_RETURN then
505 –     EditingDone
506 –  else
515    if Key = VK_ESCAPE then
516    begin
517      SelStart := UTF8Length(Text);      {Ensure end of line selection}
# Line 555 | Line 563 | begin
563    FLastKeyValue := KeyValue;
564   end;
565  
558 – function TIBLookupComboEditBox.SQLSafe(aText: string): string;
559 – var I: integer;
560 – begin
561 –  Result := '';
562 –  for I := 1 to length(aText) do
563 –    if aText[I] = '''' then
564 –      Result := Result + ''''''
565 –    else
566 –      Result := Result + aText[I];
567 – end;
568 –
566   procedure TIBLookupComboEditBox.UpdateShowing;
567   begin
568    inherited UpdateShowing;
# Line 581 | Line 578 | begin
578    FModified := false;
579   end;
580  
581 + {$if lcl_fullversion >= 2000003}
582 + type
583 +
584 +  { THackedCustomComboBox }
585 +
586 +  THackedCustomComboBox = class(TCustomComboBox)
587 +  private
588 +    procedure CallChange;
589 +  end;
590 +
591 + { THackedCustomComboBox }
592 +
593 + procedure THackedCustomComboBox.CallChange;
594 + begin
595 +  inherited Change;
596 + end;
597 +
598 + procedure TIBLookupComboEditBox.Change;
599 + begin
600 +  if IsUnbound then
601 +    THackedCustomComboBox(self).CallChange
602 +  else
603 +    inherited Change;
604 + end;
605 +
606 + procedure TIBLookupComboEditBox.CloseUp;
607 + begin
608 +  inherited DoEdit;
609 +  inherited CloseUp;
610 +  EditingDone;
611 + end;
612 +
613 + procedure TIBLookupComboEditBox.Select;
614 + begin
615 +  inherited Select;
616 +  if IsUnbound then
617 +    inherited DoEdit;
618 + end;
619 +
620 + function TIBLookupComboEditBox.DoEdit: boolean;
621 + begin
622 +  {DoEdit will swallow characters if no editable Field. Hence, to enabled
623 +   writing we must avoid calling the inherited method.}
624 +  if IsUnbound then
625 +    Result := true
626 +  else
627 +    Result := inherited DoEdit;
628 + end;
629 + {$ifend}
630 +
631   constructor TIBLookupComboEditBox.Create(TheComponent: TComponent);
632   begin
633    inherited Create(TheComponent);

Diff Legend

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