From 5197500844954cdc7be39c650fd2997b5d2a540e Mon Sep 17 00:00:00 2001
From: wp <wp.no-reply@lazarus-ide-org>
Date: Tue, 22 Dec 2020 14:56:45 +0000
Subject: [PATCH] LCL: Fix selected items of TComboBoxEx and TCheckComboBox not
 being painted with color clHighlightText.

git-svn-id: trunk@64267 -
---
 lcl/include/comboex.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lcl/include/comboex.inc b/lcl/include/comboex.inc
index ecb7113e2b..de8cd0aa9b 100644
--- a/lcl/include/comboex.inc
+++ b/lcl/include/comboex.inc
@@ -421,7 +421,7 @@ begin  { do not call inherited ! }
     end;
   anyRect.Top:=(ARect.Top+ARect.Bottom-FTextHeight) div 2;
   anyRect.Bottom:=anyRect.Top+FTextHeight;
-  ThemeServices.DrawText(Canvas, aDetail, ItemsEx[Index].Caption, anyRect, aFlags, 0);
+  DrawText(Canvas.Handle, PChar(ItemsEx[Index].Caption), Length(ItemsEx[Index].Caption), anyRect, aFlags);
 end;
 
 procedure TCustomComboBoxEx.FontChanged(Sender: TObject);
@@ -682,7 +682,7 @@ begin  { do not call inherited ! }
     end;
   anyRect.Top:=(ARect.Top+ARect.Bottom-FTextHeight) div 2;
   anyRect.Bottom:=anyRect.Top+FTextHeight;
-  ThemeServices.DrawText(Canvas, aDetail, Items[Index], anyRect, aFlags, 0);
+  DrawText(Canvas.Handle, PChar(Items[Index]), Length(Items[Index]), anyRect, aFlags);
 end;
 
 procedure TCustomCheckCombo.DropDown;