From def6be738e34d5ff5d4679a96d25c137aac31e31 Mon Sep 17 00:00:00 2001
From: Andrew Haines <andrewd207@aol.com>
Date: Sun, 1 Feb 2015 09:37:07 -0500
Subject: Changes to allow modal windows to have owners.

---
 src/corelib/fpg_widget.pas | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/corelib/fpg_widget.pas')

diff --git a/src/corelib/fpg_widget.pas b/src/corelib/fpg_widget.pas
index 8fb68a04..1f9bda21 100644
--- a/src/corelib/fpg_widget.pas
+++ b/src/corelib/fpg_widget.pas
@@ -503,7 +503,7 @@ begin
 
   inherited Create(AOwner);
 
-  if (AOwner <> nil) and (AOwner is TfpgWidget) then
+  if (AOwner <> nil) and (AOwner is TfpgWidget) and (not (WindowType in [wtModalForm, wtPopup])) {and not InheritsFrom(TfpgForm)} then
   begin
     Parent := TfpgWidget(AOwner);
     FTabOrder := AOwner.ComponentCount;
-- 
cgit v1.2.3-70-g09d2