gre-ilya/fltk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

A public header file must not use a preprocessor variable such as MAC_OS_X_VERSION_10_7

Browse Source 
because it is only defined internally to FLTK.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10516 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Manolo Gouy 2015-01-14 10:23:24 +00:00
parent 56fd2fc9f9
commit d7e4831dbe
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
FL/Fl_Gl_Window.H
View File

@ -202,7 +202,7 @@ public:
// Note: Doxygen docs in Fl_Widget.H to avoid redundancy.
virtual Fl_Gl_Window* as_gl_window() {return this;}
#if defined(__APPLE__) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7
#if defined(__APPLE__)
int pixel_w();
int pixel_h();
#else

12
src/Fl_Gl_Window.cxx
View File

@ -99,19 +99,27 @@ void Fl_Gl_Window::show() {
#endif /* __APPLE__ */
}
#if defined(__APPLE__) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7
#if defined(__APPLE__)
int Fl_Gl_Window::pixel_w()
{
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7
return Fl_X::resolution_scaling_factor(this) * w();
#else
return w();
#endif
}
int Fl_Gl_Window::pixel_h()
{
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7
return Fl_X::resolution_scaling_factor(this) * h();
#else
return h();
#endif
}
#endif
#endif // __APPLE__
/**
The invalidate() method turns off valid() and is