summaryrefslogtreecommitdiff
path: root/src/Fl_cocoa.mm
diff options
context:
space:
mode:
authorManolo Gouy <Manolo>2011-05-12 11:50:43 +0000
committerManolo Gouy <Manolo>2011-05-12 11:50:43 +0000
commitbcdf4a4be16cd73a15643c67934d5a28f66a0a55 (patch)
tree08aee92b57ccb28fa426748fff53f75d76b535fd /src/Fl_cocoa.mm
parent622b357f24ed98769e7006225690bfdbb6648e83 (diff)
Mac OS: simplified by removing Fl_X::contains_GL_subwindow() function.
This operation is now performed within Fl_cocoa.mm git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8657 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl_cocoa.mm')
-rw-r--r--src/Fl_cocoa.mm9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm
index 2d1e45778..e1d556a1c 100644
--- a/src/Fl_cocoa.mm
+++ b/src/Fl_cocoa.mm
@@ -2006,6 +2006,10 @@ void Fl_X::make(Fl_Window* w)
Fl::e_number = old_event;
w->redraw(); // force draw to happen
}
+ if (w->as_gl_window()) { // if creating a sub-GL-window
+ while (win->window()) win = win->window();
+ [(FLWindow*)Fl_X::i(win)->xid setContainsGLsubwindow:YES];
+ }
fl_show_iconic = 0;
}
else { // create a desktop window
@@ -3362,11 +3366,6 @@ CGImageRef Fl_X::CGImage_from_window_rect(Fl_Window *win, int x, int y, int w, i
return img;
}
-void Fl_X::contains_GL_subwindow()
-{
- [(FLWindow*)xid setContainsGLsubwindow:YES];
-}
-
WindowRef Fl_X::window_ref()
{
return (WindowRef)[(FLWindow*)xid windowRef];