merge r51088 #c93f1b0a8b: lcl: grids: don't apply editor value if ESC is pressed.

git-svn-id: branches/fixes_1_6@51091 -
This commit is contained in:
ondrej 2015-12-31 09:34:50 +00:00
parent 387f3f55df
commit 27cafa3cab

View File

@ -9613,7 +9613,10 @@ begin
VK_END, VK_HOME: VK_END, VK_HOME:
; ;
VK_ESCAPE: VK_ESCAPE:
FGrid.EditorHide; begin
doGridKeyDown;
FGrid.EditorHide;
end;
else else
doEditorKeyDown; doEditorKeyDown;
end; end;
@ -12233,7 +12236,10 @@ begin
VK_END, VK_HOME: VK_END, VK_HOME:
; ;
VK_ESCAPE: VK_ESCAPE:
FGrid.EditorHide; begin
doGridKeyDown;
FGrid.EditorHide;
end;
else else
doEditorKeyDown; doEditorKeyDown;
end; end;