mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moved a few Mac-specific lines from Fl_Gl_Window::show() to Fl_Gl_Window::mode()

Browse Source 
where it is more easily understood.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10858 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Manolo Gouy 2015-09-07 15:52:41 +00:00
parent d7094249f0
commit a650237edf
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/Fl_Gl_Window.cxx
View File

@ -69,16 +69,6 @@ void Fl_Gl_Window::show() {
if (!shown()) {
if (!g) {
g = Fl_Gl_Choice::find(mode_,alist);
#if defined(__APPLE__)
if (g && alist) {
// when the mode is set using the system-dependent alist, and if asking for double buffer,
// the FL_DOUBLE flag must be set in the mode_ member variable
const int *a = alist;
while (*a) {
if (*(a++) == kCGLPFADoubleBuffer) mode_ |= FL_DOUBLE;
}
}
#endif
if (!g && (mode_ & FL_DOUBLE) == FL_SINGLE) {
g = Fl_Gl_Choice::find(mode_ | FL_DOUBLE,alist);
if (g) mode_ |= FL_FAKE_SINGLE;
@ -133,13 +123,18 @@ void Fl_Gl_Window::invalidate() {
#endif
}
/**
See const int Fl_Gl_Window::mode() const
*/
int Fl_Gl_Window::mode(int m, const int *a) {
if (m == mode_ && a == alist) return 0;
#ifndef __APPLE__
int oldmode = mode_;
#else
if (a) { // when the mode is set using the a array of system-dependent values, and if asking for double buffer,
// the FL_DOUBLE flag must be set in the mode_ member variable
const int *aa = a;
while (*aa) {
if (*(aa++) == kCGLPFADoubleBuffer) m |= FL_DOUBLE;
}
}
#endif // !__APPLE__
#if !defined(WIN32) && !defined(__APPLE__)
Fl_Gl_Choice* oldg = g;