* Applied Jean-Marc's TextColor and BackgroundColor patch.

* Made many more modifications based on Jean-Marc's patch and fixed a few things missed.

1 files changed, 1 insertions, 23 deletions

diff --git a/src/gui/gui_editcombo.pas b/src/gui/gui_editcombo.pas
index 1d08fe6b..7e8ffc85 100644
--- a/src/gui/gui_editcombo.pas
+++ b/src/gui/gui_editcombo.pas
@@ -69,8 +69,6 @@ type
     FAutoDropDown: Boolean;
     FAllowNew: TAllowNew;
     FDropDownCount: integer;
-    FBackgroundColor: TfpgColor;
-    FTextColor: TfpgColor;
     FText: string;
     FSelectedItem: integer;
     FMaxLength: integer;
@@ -82,8 +80,6 @@ type
     FNewItem: boolean;
     function    GetFontDesc: string;
     procedure   SetAllowNew(const AValue: TAllowNew);
-    procedure   SetBackgroundColor(const AValue: TfpgColor);
-    procedure   SetTextColor(const AValue: TfpgColor);
     procedure   SetDropDownCount(const AValue: integer);
     procedure   InternalBtnClick(Sender: TObject);
     procedure   InternalListBoxSelect(Sender: TObject);
@@ -275,24 +271,6 @@ begin
     FAllowNew:= AValue;
 end;
 
-procedure TfpgAbstractEditCombo.SetBackgroundColor(const AValue: TfpgColor);
-begin
-  if FBackgroundColor <> AValue then
-  begin
-    FBackgroundColor := AValue;
-    Repaint;
-  end;
-end;
-
-procedure TfpgAbstractEditCombo.SetTextColor(const AValue: TfpgColor);
-begin
-  if FTextColor <> AValue then
-  begin
-    FTextColor := AValue;
-    Repaint;
-  end;
-end;
-
 function TfpgAbstractEditCombo.GetFontDesc: string;
 begin
   Result := FFont.FontDesc;
@@ -791,7 +769,7 @@ begin
   inherited Create(AOwner);
   FFont             := fpgGetFont('#List');
   FBackgroundColor  := clBoxColor;
-  FTextColor        := clText1;
+  FTextColor        := Parent.TextColor;
   FDropDownCount    := 8;
   FWidth            := 120;
   FHeight           := FFont.Height + 6;