From fd731a65cd3fc6de9bdc44281b6e4565c10a7497 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Thu, 23 Feb 2017 18:57:26 +0000
Subject: [PATCH] fix for fltk 1.4
---
Fltk/FlGui.cpp | 2 ++
Fltk/openglWindow.cpp | 4 ++++
2 files changed, 6 insertions(+)
diff --git a/Fltk/FlGui.cpp b/Fltk/FlGui.cpp
index a0b5021ccb..c771c0c679 100644
--- a/Fltk/FlGui.cpp
+++ b/Fltk/FlGui.cpp
@@ -368,6 +368,8 @@ FlGui::FlGui(int argc, char **argv)
// use retina resolution if available
#if (FL_MAJOR_VERSION == 1) && (FL_MINOR_VERSION == 3) && (FL_PATCH_VERSION >= 4)
Fl::use_high_res_GL(CTX::instance()->highResolutionGraphics);
+#elif (FL_MAJOR_VERSION == 1) && (FL_MINOR_VERSION >= 4)
+ Fl::use_high_res_GL(CTX::instance()->highResolutionGraphics);
#endif
// register image formats not in core fltk library (jpeg/png)
diff --git a/Fltk/openglWindow.cpp b/Fltk/openglWindow.cpp
index 3bf0f75e60..8c5dd4f0f9 100644
--- a/Fltk/openglWindow.cpp
+++ b/Fltk/openglWindow.cpp
@@ -717,6 +717,8 @@ int openglWindow::pixel_w()
{
#if (FL_MAJOR_VERSION == 1) && (FL_MINOR_VERSION == 3) && (FL_PATCH_VERSION >= 4)
return Fl_Gl_Window::pixel_w();
+#elif (FL_MAJOR_VERSION == 1) && (FL_MINOR_VERSION >= 4)
+ return Fl_Gl_Window::pixel_w();
#else
return w();
#endif
@@ -726,6 +728,8 @@ int openglWindow::pixel_h()
{
#if (FL_MAJOR_VERSION == 1) && (FL_MINOR_VERSION == 3) && (FL_PATCH_VERSION >= 4)
return Fl_Gl_Window::pixel_h();
+#elif (FL_MAJOR_VERSION == 1) && (FL_MINOR_VERSION >= 4)
+ return Fl_Gl_Window::pixel_h();
#else
return h();
#endif
--
GitLab