Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-06-06 00:22:42 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Mac OS: simplified by removing Fl_X::contains_GL_subwindow() function.

Browse Source 
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
This commit is contained in:
Manolo Gouy
2011-05-12 11:50:43 +00:00
parent 622b357f24
commit bcdf4a4be1
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
FL/mac.H
-1
View File
@@ -140,7 +140,6 @@ public:
int unlink(Fl_X* start = NULL); int unlink(Fl_X* start = NULL);
void collapse(void); void collapse(void);
WindowRef window_ref(void); WindowRef window_ref(void);
void contains_GL_subwindow(void);
void set_key_window(void); void set_key_window(void);
void set_cursor(Fl_Cursor); void set_cursor(Fl_Cursor);
static CGImageRef CGImage_from_window_rect(Fl_Window *win, int x, int y, int w, int h); static CGImageRef CGImage_from_window_rect(Fl_Window *win, int x, int y, int w, int h);
src/Fl_Gl_Window.cxx
-1
View File
@@ -95,7 +95,6 @@ void Fl_Gl_Window::show() {
if (overlay && overlay != this) ((Fl_Gl_Window*)overlay)->show(); if (overlay && overlay != this) ((Fl_Gl_Window*)overlay)->show();
#elif defined(__APPLE__) #elif defined(__APPLE__)
if( ! parent() ) need_redraw=1; if( ! parent() ) need_redraw=1;
else Fl_X::i(window())->contains_GL_subwindow();
#endif #endif
} }
Fl_Window::show(); Fl_Window::show();
src/Fl_cocoa.mm
+4 -5
View File
@@ -2006,6 +2006,10 @@ void Fl_X::make(Fl_Window* w)
Fl::e_number = old_event; Fl::e_number = old_event;
w->redraw(); // force draw to happen 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; fl_show_iconic = 0;
} }
else { // create a desktop window 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; return img;
} }
void Fl_X::contains_GL_subwindow()
{
[(FLWindow*)xid setContainsGLsubwindow:YES];
}
WindowRef Fl_X::window_ref() WindowRef Fl_X::window_ref()
{ {
return (WindowRef)[(FLWindow*)xid windowRef]; return (WindowRef)[(FLWindow*)xid windowRef];