From c0628ff3b4793ffe38f5652137b69e8a240a68ba Mon Sep 17 00:00:00 2001
From: wp_xxyyzz <wp_xxyyzz@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Fri, 6 Dec 2019 20:54:08 +0000
Subject: [PATCH] jvcllaz: Follow-up to r7204 (Patch by Michal Gawrycki, issue
 #36403)

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@7205 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 components/jvcllaz/run/JvDB/jvdblookup.pas | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/components/jvcllaz/run/JvDB/jvdblookup.pas b/components/jvcllaz/run/JvDB/jvdblookup.pas
index 3e2adc931..c6a3ea4a8 100644
--- a/components/jvcllaz/run/JvDB/jvdblookup.pas
+++ b/components/jvcllaz/run/JvDB/jvdblookup.pas
@@ -446,8 +446,6 @@ type
   protected
     procedure CreateWnd; override;
     procedure SetReadOnly(AValue: Boolean); override;
-    procedure GetPreferredSize(var PreferredWidth, PreferredHeight: integer;
-      Raw: boolean = false; WithThemeSpace: boolean = true); override;
     function GetDropDownButtonRect: TRect;
     procedure InvalidateFrame;
     procedure InvalidateDropDownButton;
@@ -483,6 +481,8 @@ type
   public
     constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
+    procedure GetPreferredSize(var PreferredWidth, PreferredHeight: integer;
+      Raw: boolean = false; WithThemeSpace: boolean = true); override;
     procedure CloseUp(Accept: Boolean); dynamic;
     procedure DropDown; virtual;
     procedure ResetField; override;
@@ -2753,6 +2753,10 @@ begin
       FOnDropDown(Self);
     SelValue := Value; // backup before anything invokes a OnDataChange event
 
+    {$IFDEF WINDOWS}
+    FDataListForm.PopupParent := GetParentForm(Self);
+    {$ENDIF}
+
     FDataListForm.FList.Color := Color;
     FDataListForm.FList.Font := Font;
     FDataListForm.FList.EmptyItemColor := EmptyItemColor;