summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorManolo Gouy <Manolo>2014-12-11 20:34:47 +0000
committerManolo Gouy <Manolo>2014-12-11 20:34:47 +0000
commitbf07d892a36926b4f41998fba179fa8d3b87174c (patch)
tree6409cb1a4f6f1256832547efdd15b7b868e5ebcc /src
parent879a8fbabf17e95f6235dd21441dff2c168872cf (diff)
Fix case when show() of a subwindow whose parent is not shown yet.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10483 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
-rw-r--r--src/Fl_cocoa.mm4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm
index 23b630c35..dcbee5d27 100644
--- a/src/Fl_cocoa.mm
+++ b/src/Fl_cocoa.mm
@@ -2882,7 +2882,9 @@ void Fl_Window::show() {
labeltype(FL_NO_LABEL);
}
Fl_Tooltip::exit(this);
- if (!shown() && (!parent() || ![fl_xid(top_window()) isMiniaturized])) {
+ Fl_X *top = NULL;
+ if (parent()) top = top_window()->i;
+ if (!shown() && (!parent() || (top && ![top->xid isMiniaturized]))) {
Fl_X::make(this);
} else {
if ( !parent() ) {