From 190136efbb59d3a39f1875278addda5fc76a0e0c Mon Sep 17 00:00:00 2001
From: blikblum <blikblum@lazarus-ide.org>
Date: Fri, 11 Nov 2011 01:02:40 +0000
Subject: [PATCH] lcl: override Select in TCustomDBComboBox instead of
 TDBComboBox to affect also TDBLookupComboBox (avoid crash when ListDataset
 enters in Edit state inside TDBLookup.UpdateData)

git-svn-id: trunk@33467 -
---
 lcl/dbctrls.pp                   |  2 +-
 lcl/include/customdbcombobox.inc | 10 ++++++++++
 lcl/include/dbcombobox.inc       | 10 ----------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/lcl/dbctrls.pp b/lcl/dbctrls.pp
index 70e74f1905..c6e3bebfe3 100644
--- a/lcl/dbctrls.pp
+++ b/lcl/dbctrls.pp
@@ -654,6 +654,7 @@ Type
     procedure Notification(AComponent: TComponent;
                            Operation: TOperation); override;
     procedure Change; override;
+    procedure Select; override;
     procedure UpdateData(Sender: TObject); virtual; abstract;
     procedure WndProc(var Message: TLMessage); override;
   public
@@ -676,7 +677,6 @@ Type
     procedure DataChange(Sender: TObject); override;
     procedure KeyDown(var Key: Word; Shift: TShiftState); override;
     procedure KeyPress(var Key: char); override;
-    procedure Select; override;
     procedure UpdateData(Sender: TObject); override;
   published
     property Anchors;
diff --git a/lcl/include/customdbcombobox.inc b/lcl/include/customdbcombobox.inc
index a5ed699f9a..d728b385e3 100644
--- a/lcl/include/customdbcombobox.inc
+++ b/lcl/include/customdbcombobox.inc
@@ -44,6 +44,16 @@ begin
   inherited Change;
 end;
 
+procedure TCustomDBComboBox.Select;
+begin
+  //avoid reseting text when calling select
+  FDataLink.OnDataChange := nil;
+  FDataLink.Edit;
+  FDataLink.Modified;
+  FDataLink.OnDataChange := @DataChange;
+  inherited Select;
+end;
+
 
 function TCustomDBComboBox.GetReadOnly: Boolean;
 begin
diff --git a/lcl/include/dbcombobox.inc b/lcl/include/dbcombobox.inc
index 018e6b6b87..83d775277b 100644
--- a/lcl/include/dbcombobox.inc
+++ b/lcl/include/dbcombobox.inc
@@ -18,16 +18,6 @@
 
 { 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;