From 4f339b94c0f600f25c91c4eb702571f7f8a1d136 Mon Sep 17 00:00:00 2001
From: blikblum <blikblum@lazarus-ide.org>
Date: Thu, 13 Oct 2011 07:08:51 +0000
Subject: [PATCH] * Put in edit state when selecting text in DBComboBox. Fix
 #20477

git-svn-id: trunk@32867 -
---
 lcl/dbctrls.pp             |  3 ++-
 lcl/include/dbcombobox.inc | 10 ++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/lcl/dbctrls.pp b/lcl/dbctrls.pp
index d7d54a372c..0c750f818b 100644
--- a/lcl/dbctrls.pp
+++ b/lcl/dbctrls.pp
@@ -675,8 +675,9 @@ Type
 
   TDBComboBox = class(TCustomDBComboBox)
   protected
-    procedure UpdateData(Sender: TObject); override;
     procedure DataChange(Sender: TObject); override;
+    procedure Select; override;
+    procedure UpdateData(Sender: TObject); override;
   published
     property Anchors;
     property ArrowKeysTraverseList;
diff --git a/lcl/include/dbcombobox.inc b/lcl/include/dbcombobox.inc
index c6baf29e62..c337164798 100644
--- a/lcl/include/dbcombobox.inc
+++ b/lcl/include/dbcombobox.inc
@@ -18,6 +18,16 @@
 
 { TDBComboBox }
 
+procedure TDBComboBox.Select;
+begin
+  //avoid reseting text when calling select
+  FDataLink.OnDataChange := nil;
+  FDataLink.Edit;
+  FDataLink.Modified;
+  FDataLink.OnDataChange := @DataChange;
+  inherited Select;
+end;
+
 procedure TDBComboBox.UpdateData(Sender: TObject);
 begin
   FDataLink.Field.Text := Text;