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

Comparing ibx/trunk/ibcontrols/IBLookupComboEditBox.pas (file contents):
Revision 272 by tony, Mon Feb 4 13:34:37 2019 UTC vs.
Revision 275 by tony, Mon Feb 4 13:41:10 2019 UTC

# Line 119 | Line 119 | type
119      procedure CheckAndInsert;
120      procedure DoEnter; override;
121      procedure DoExit; override;
122 <    {$if lcl_fullversion >= 2000003}
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 578 | Line 578 | begin
578    FModified := false;
579   end;
580  
581 < {$if lcl_fullversion >= 2000003}
581 > {$if lcl_fullversion >= 2000002}
582   type
583  
584    { THackedCustomComboBox }
# Line 597 | Line 597 | end;
597  
598   procedure TIBLookupComboEditBox.Change;
599   begin
600 <  if IsUnbound then
600 >  if DataSource = nil then
601      THackedCustomComboBox(self).CallChange
602    else
603      inherited Change;
# Line 613 | Line 613 | end;
613   procedure TIBLookupComboEditBox.Select;
614   begin
615    inherited Select;
616 <  if IsUnbound then
616 >  if DataSource = nil then
617      inherited DoEdit;
618   end;
619  
# Line 621 | Line 621 | function TIBLookupComboEditBox.DoEdit: b
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
624 >  if DataSource = nil then
625      Result := true
626    else
627      Result := inherited DoEdit;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines