From d7e4831dbe4a988541ce56159f76a0698d210572 Mon Sep 17 00:00:00 2001 From: Manolo Gouy Date: Wed, 14 Jan 2015 10:23:24 +0000 Subject: A public header file must not use a preprocessor variable such as MAC_OS_X_VERSION_10_7 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 --- src/Fl_Gl_Window.cxx | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/Fl_Gl_Window.cxx b/src/Fl_Gl_Window.cxx index d4fdfe5a1..2c6ffd916 100644 --- a/src/Fl_Gl_Window.cxx +++ b/src/Fl_Gl_Window.cxx @@ -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 -- cgit v1.2.3