From f1a7c8604ed6fdae5e02453a6e03a07902e29bb0 Mon Sep 17 00:00:00 2001
From: jesus <jesus@lazarus-ide.org>
Date: Sat, 9 Oct 2010 18:32:47 +0000
Subject: [PATCH] LCL, fix picklist editor not saving data into dbgrid,
 regression introduced in r27317 #90bf8f4f5e, issue #17586

git-svn-id: trunk@27636 -
---
 lcl/dbgrids.pas | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lcl/dbgrids.pas b/lcl/dbgrids.pas
index 615c6e4a75..d535bfe3e3 100644
--- a/lcl/dbgrids.pas
+++ b/lcl/dbgrids.pas
@@ -2294,7 +2294,8 @@ end;
 
 procedure TCustomDBGrid.SetEditText(ACol, ARow: Longint; const Value: string);
 begin
-  FTempText := Value;
+  if not EditorIsReadOnly then
+    FTempText := Value;
 end;
 
 procedure TCustomDBGrid.SetFixedCols(const AValue: Integer);
@@ -2789,7 +2790,7 @@ begin
     AField := GetFieldFromGridColumn(Col);
     if assigned(AField) then
       Result := not AField.CanModify;
-    if not result then begin
+    if not result and not FDatalink.Editing then begin
       Include(FGridStatus, gsStartEditing);
       Result := not FDataLink.Edit;
       Exclude(FGridStatus, gsStartEditing);