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 262 by tony, Tue Apr 3 09:09:05 2018 UTC vs.
Revision 263 by tony, Thu Dec 6 15:55:01 2018 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 117 | Line 117 | type
117      procedure CheckAndInsert;
118      procedure DoEnter; override;
119      procedure DoExit; override;
120 +    {$if lcl_fullversion >= 2000000}
121 +    {Deferred update changes in Lazarus 2.0 stop the combo box working when
122 +     the datasource is nil. We thus have to reverse out the changes :(}
123 +    function DoEdit: boolean; override;
124 +    procedure Change; override;
125 +    procedure CloseUp; override;
126 +    procedure Select; override;
127 +    procedure UTF8KeyPress(var UTF8Key: TUTF8Char); override;
128 +    {$ifend}
129      procedure KeyUp(var Key: Word; Shift: TShiftState); override;
130      procedure Loaded; override;
131      procedure Notification(AComponent: TComponent; Operation: TOperation); override;
# Line 147 | Line 156 | type
156  
157   implementation
158  
159 < uses LCLType, Variants, LCLProc, LazUTF8;
159 > uses Variants, LCLProc, LazUTF8;
160  
161   { TIBLookupControlLink }
162  
# Line 501 | Line 510 | end;
510   procedure TIBLookupComboEditBox.KeyUp(var Key: Word; Shift: TShiftState);
511   begin
512    inherited KeyUp(Key, Shift);
504  if Key = VK_RETURN then
505     EditingDone
506  else
513    if Key = VK_ESCAPE then
514    begin
515      SelStart := UTF8Length(Text);      {Ensure end of line selection}
# Line 581 | Line 587 | begin
587    FModified := false;
588   end;
589  
590 + {$if lcl_fullversion >= 2000000}
591 + type
592 +
593 +  { THackedCustomComboBox }
594 +
595 +  THackedCustomComboBox = class(TCustomComboBox)
596 +  private
597 +    procedure CallUTF8KeyPress(var UTF8Key: TUTF8Char);
598 +    procedure CallChange;
599 +  end;
600 +
601 + { THackedCustomComboBox }
602 +
603 + procedure THackedCustomComboBox.CallUTF8KeyPress(var UTF8Key: TUTF8Char);
604 + begin
605 +  inherited UTF8KeyPress(UTF8Key);
606 + end;
607 +
608 + procedure THackedCustomComboBox.CallChange;
609 + begin
610 +  inherited Change;
611 + end;
612 +
613 + procedure TIBLookupComboEditBox.UTF8KeyPress(var UTF8Key: TUTF8Char);
614 + begin
615 +  {TDBLookupComboBox.UTF8KeyPress will swallow the character if
616 +  the datalink is not editable. hence to enable writing we must override it}
617 +  if ((DataSource = nil) or (Field = nil)) and not ReadOnly then
618 +    THackedCustomComboBox(self).CallUTF8KeyPress(UTF8Key)
619 +  else
620 +    inherited;
621 + end;
622 +
623 + procedure TIBLookupComboEditBox.Change;
624 + begin
625 +  THackedCustomComboBox(self).CallChange;
626 + end;
627 +
628 + procedure TIBLookupComboEditBox.CloseUp;
629 + begin
630 +  inherited CloseUp;
631 +  inherited DoEdit;
632 + end;
633 +
634 + procedure TIBLookupComboEditBox.Select;
635 + begin
636 +  inherited Select;
637 +  inherited DoEdit;
638 + end;
639 +
640 + function TIBLookupComboEditBox.DoEdit: boolean;
641 + begin
642 +  {DoEdit will swallow characters if no editable Field. Hence, to enabled
643 +   writing we must avoid calling the inherited method.}
644 +  if ((DataSource = nil) or (Field = nil)) and not ReadOnly then
645 +    Result := true
646 +  else
647 +    Result := inherited DoEdit;
648 + end;
649 + {$ifend}
650 +
651   constructor TIBLookupComboEditBox.Create(TheComponent: TComponent);
652   begin
653    inherited Create(TheComponent);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines