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

Comparing ibx/trunk/ibcontrols/IBDynamicGrid.pas (file contents):
Revision 41 by tony, Sat Jul 16 12:25:48 2016 UTC vs.
Revision 80 by tony, Mon Jan 1 11:31:07 2018 UTC

# Line 311 | Line 311 | end;
311  
312   implementation
313  
314 < uses Math, IBQuery, LCLType, Variants;
314 > uses LCLType, Variants, EditBtn;
315  
316   { TIBGridControlLink }
317  
# Line 568 | Line 568 | begin
568        Exit; {ignore these keys if we are in a  combobox}
569  
570      if (AControl <> nil) and (AControl is TCustomMemo)
571 <                         and (Key in [VK_RETURN,VK_UP,VK_DOWN]) then Exit; {Ignore Return in a CustomMemo}
571 >                         and (Key in [VK_RETURN,VK_UP,VK_DOWN]) then Exit; {Ignore keys in a CustomMemo}
572  
573      if (AControl <> nil) and (AControl is TCustomGrid)
574 <                         and (Key in [VK_RETURN,VK_UP,VK_DOWN,VK_TAB]) then Exit; {Ignore Return in a CustomMemo}
574 >                         and (Key in [VK_RETURN,VK_UP,VK_DOWN,VK_TAB]) then Exit; {Ignore keys in a Custom Grid}
575 >
576 >    if (AControl <> nil) and (AControl is TEBEdit) and (AControl.Owner is TDateEdit) then
577 >    begin
578 >      if (Key in [VK_LEFT,VK_RIGHT]) then Exit; {Ignore navigation keys}
579 >      if TDateEdit(AControl.Owner).DroppedDown and
580 >        (Key in [VK_RETURN,VK_UP,VK_DOWN,VK_ESCAPE]) then Exit; {Ignore TCalender navigation keys in a Data edit}
581 >    end;
582  
583      if assigned(FOnKeyDownHander) then
584        OnKeyDownHander(Sender,Key,Shift,Done);
# Line 993 | Line 1000 | end;
1000   destructor TIBDynamicGridColumn.Destroy;
1001   begin
1002    if assigned(FDBLookupProperties) then FDBLookupProperties.Free;
1003 +  Application.RemoveAsyncCalls(self);
1004    inherited Destroy;
1005   end;
1006  
# Line 1285 | Line 1293 | begin
1293    if assigned(FIBControlLink) then FIBControlLink.Free;
1294    if assigned(FIndexFieldsList) then FIndexFieldsList.Free;
1295    if assigned(FDBLookupCellEditor) then FDBLookupCellEditor.Free;
1296 +  Application.RemoveAsyncCalls(self);
1297    inherited Destroy;
1298   end;
1299  

Diff Legend

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