ViewVC Help

View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing

root/public/ibx/branches/journaling/ibcontrols/IBDynamicGrid.pas

Comparing ibx/trunk/ibcontrols/IBDynamicGrid.pas (file contents):
Revision 41 by tony, Sat Jul 16 12:25:48 2016 UTC vs.
Revision 217 by tony, Fri Mar 16 10:27:26 2018 UTC

#	Line 182 | Line 182 | end;
182		FOnSelectPanelEditor: TOnSelectPanelEditor;
183		FResizing: boolean;
184		FWeHaveFocus: boolean;
185	–	FHidingEditorPanel: boolean;
186	–	FAllowHide: boolean;
185		FMouseDown: boolean;
186		function ActiveControl: TControl;
187		procedure DoShowEditorPanel(Data: PtrInt);
#	Line 311 | Line 309 | end;
309
310		implementation
311
312	<	uses Math, IBQuery, LCLType, Variants;
312	>	uses LCLType, Variants, EditBtn;
313
314		{ TIBGridControlLink }
315
#	Line 568 | Line 566 | begin
566		Exit; {ignore these keys if we are in a  combobox}
567
568		if (AControl <> nil) and (AControl is TCustomMemo)
569	<	and (Key in [VK_RETURN,VK_UP,VK_DOWN]) then Exit; {Ignore Return in a CustomMemo}
569	>	and (Key in [VK_RETURN,VK_UP,VK_DOWN]) then Exit; {Ignore keys in a CustomMemo}
570
571		if (AControl <> nil) and (AControl is TCustomGrid)
572	<	and (Key in [VK_RETURN,VK_UP,VK_DOWN,VK_TAB]) then Exit; {Ignore Return in a CustomMemo}
572	>	and (Key in [VK_RETURN,VK_UP,VK_DOWN,VK_TAB]) then Exit; {Ignore keys in a Custom Grid}
573	>
574	>	if (AControl <> nil) and (AControl is TEBEdit) and (AControl.Owner is TDateEdit) then
575	>	begin
576	>	if (Key in [VK_LEFT,VK_RIGHT]) then Exit; {Ignore navigation keys}
577	>	if TDateEdit(AControl.Owner).DroppedDown and
578	>	(Key in [VK_RETURN,VK_UP,VK_DOWN,VK_ESCAPE]) then Exit; {Ignore TCalender navigation keys in a Data edit}
579	>	end;
580
581		if assigned(FOnKeyDownHander) then
582		OnKeyDownHander(Sender,Key,Shift,Done);
#	Line 993 | Line 998 | end;
998		destructor TIBDynamicGridColumn.Destroy;
999		begin
1000		if assigned(FDBLookupProperties) then FDBLookupProperties.Free;
1001	+	Application.RemoveAsyncCalls(self);
1002		inherited Destroy;
1003		end;
1004
#	Line 1285 | Line 1291 | begin
1291		if assigned(FIBControlLink) then FIBControlLink.Free;
1292		if assigned(FIndexFieldsList) then FIndexFieldsList.Free;
1293		if assigned(FDBLookupCellEditor) then FDBLookupCellEditor.Free;
1294	+	Application.RemoveAsyncCalls(self);
1295		inherited Destroy;
1296		end;
1297

Diff Legend

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