From 43989ec606db056c82d113ad998ae285b5d4f8c4 Mon Sep 17 00:00:00 2001
From: Manolo Gouy <Manolo>
Date: Thu, 13 Nov 2014 15:33:33 +0000
Subject: =?UTF-8?q?Support=20for=20true=20subwindows=20under=20Mac=20OS=20?=
 =?UTF-8?q?X=20(cont=E2=80=99d).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10454 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 src/Fl_cocoa.mm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm
index 7a209985f..be236011e 100644
--- a/src/Fl_cocoa.mm
+++ b/src/Fl_cocoa.mm
@@ -2611,6 +2611,8 @@ static void set_subwindow_frame(Fl_Window *w) { // maps a subwindow at its corre
   rp.size = NSMakeSize(w->w(), w->h());
   if (!NSEqualRects(rp, [xid frame])) {
     [xid setFrame:rp display:YES];
+  }
+  if (![xid parentWindow]) {
     [pxid addChildWindow:xid ordered:NSWindowAbove]; // needs OS X 10.2
     [xid orderWindow:NSWindowAbove relativeTo:[pxid windowNumber]]; // necessary under 10.3
   }
@@ -2913,7 +2915,7 @@ void Fl_Window::resize(int X,int Y,int W,int H) {
         size_range(W, H, W, H);
       }
       Fl_Group::resize(X,Y,W,H);
-      if (parent()) set_subwindow_frame(this);
+      if ([i->xid parentWindow]) set_subwindow_frame(this);
       // make sure that subwindows of this window don't leak out of their parent window
       NSArray *children = [fl_xid(this) childWindows]; // 10.2
       NSEnumerator *enumerator = [children objectEnumerator];
-- 
cgit v1.2.3