From aae8d060c4e8cc4e9a88511f8c7ccb603b9654cb Mon Sep 17 00:00:00 2001
From: alexs75 <alexs75@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Tue, 15 Apr 2008 20:49:20 +0000
Subject: [PATCH] In property  TRxDBLookupCombo.PopUpFormOptions add field 
 AutoFillColumns. Used in dropdown list.

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@424 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 components/rx/curredit.pas          | 2 +-
 components/rx/docs/WhatsNew.eng.txt | 1 +
 components/rx/docs/WhatsNew.rus.txt | 2 ++
 components/rx/rxlookup.pas          | 2 +-
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/components/rx/curredit.pas b/components/rx/curredit.pas
index daf861b2d..482d34c18 100644
--- a/components/rx/curredit.pas
+++ b/components/rx/curredit.pas
@@ -480,7 +480,7 @@ var
 begin
   S := GetDisplayText;
   if not PaintComboEdit(Self, S, FAlignment, FFocused {and not PopupVisible}, FCanvas, Message) then
-      inherited;
+      inherited WMPaint(Message);
 end;
 
 procedure TCustomNumEdit.WMPaste(var Message: TLMessage);
diff --git a/components/rx/docs/WhatsNew.eng.txt b/components/rx/docs/WhatsNew.eng.txt
index 0c54c4715..69931c14c 100644
--- a/components/rx/docs/WhatsNew.eng.txt
+++ b/components/rx/docs/WhatsNew.eng.txt
@@ -34,6 +34,7 @@
     (see rx.inc). 
   + In RxDBGrid property FixedHotColor now published
   - fix error with empty sring in TRxDateEdit.
+  + In property  TRxDBLookupCombo.PopUpFormOptions add field  AutoFillColumns. Used in dropdown list.
 29.08.2007 - ўҐабЁп 1.1.5.98 (svn revision 39)
   + In RxDBgrid - after close dataset  list of SelectedRows is cleared
   + fix resaizing find form for RxDbGrd    
diff --git a/components/rx/docs/WhatsNew.rus.txt b/components/rx/docs/WhatsNew.rus.txt
index 7f35513d0..a86baceaf 100644
--- a/components/rx/docs/WhatsNew.rus.txt
+++ b/components/rx/docs/WhatsNew.rus.txt
@@ -40,6 +40,8 @@
     в дизайнере.
   + В RxDBGrid опубликованы недостающие поля
   - Исправлена ошибка в обработке пустой даты в редакторе дат.
+  + В свойстве PopUpFormOptions компоненты TRxDBLookupCombo добавлено поле AutoFillColumns - аналог одноимённого поля
+    из TDBGrid - используется в выпадающем списке
 29.08.2007 - версия 1.1.5.98 (svn revision 39)
   + В RxDBGrid После закрытия набора данных список помеченных строк (SelectedRows) 
     очищается
diff --git a/components/rx/rxlookup.pas b/components/rx/rxlookup.pas
index e8b6ad157..8a96cea1b 100644
--- a/components/rx/rxlookup.pas
+++ b/components/rx/rxlookup.pas
@@ -795,7 +795,7 @@ var
   S: string;
   F:TField;
 begin
-  if FValuesList.Count=0 then exit;
+  if (FValuesList.Count=0) or (not LookupSource.DataSet.Active) then exit;
   if ColorToRGB(Self.Color) <> ColorToRGB(clBtnFace) then
     ACanvas.Pen.Color := clBtnFace
   else