diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2021-02-18 12:34:30 +0100 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2021-02-18 12:34:30 +0100 |
| commit | 6236d4d466d160702409357b0e94056153e54a89 (patch) | |
| tree | 9df8f330d7ea39d24ec9642d6eaf78cfb0bb99d9 /src | |
| parent | f333191312a85329cfe8ac8180ada4b1fe9f422e (diff) | |
Remove redundant definition of FL_CFG_GFX_OPENGL
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl_Gl_Window.cxx | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/Fl_Gl_Window.cxx b/src/Fl_Gl_Window.cxx index 0cd1e4e00..06253bfd4 100644 --- a/src/Fl_Gl_Window.cxx +++ b/src/Fl_Gl_Window.cxx @@ -1,7 +1,7 @@ // // OpenGL window code for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2018 by Bill Spitzak and others. +// Copyright 1998-2021 by Bill Spitzak and others. // // This library is free software. Distribution and use rights are outlined in // the file "COPYING" which should have been included with this file. If this @@ -16,7 +16,6 @@ #include <config.h> #if HAVE_GL -#define FL_CFG_GFX_OPENGL 1 extern int fl_gl_load_plugin; @@ -25,8 +24,10 @@ extern int fl_gl_load_plugin; #include "Fl_Gl_Window_Driver.H" #include "Fl_Window_Driver.H" #include <FL/Fl_Graphics_Driver.H> -#include <stdlib.h> #include <FL/fl_utf8.h> +#include "drivers/OpenGL/Fl_OpenGL_Display_Device.H" + +#include <stdlib.h> # if (HAVE_DLSYM && HAVE_DLFCN_H) # include <dlfcn.h> # endif // (HAVE_DLSYM && HAVE_DLFCN_H) @@ -36,10 +37,6 @@ extern int fl_gl_load_plugin; # endif // HAVE_GLXGETPROCADDRESSARB -#ifdef FL_CFG_GFX_OPENGL -#include "drivers/OpenGL/Fl_OpenGL_Display_Device.H" -#endif - //////////////////////////////////////////////////////////////// // The symbol SWAP_TYPE defines what is in the back buffer after doing @@ -394,7 +391,6 @@ void Fl_Gl_Window::draw_overlay() {} */ void Fl_Gl_Window::draw() { -#ifdef FL_CFG_GFX_OPENGL Fl_Surface_Device::push_current( Fl_OpenGL_Display_Device::display_device() ); glPushAttrib(GL_ENABLE_BIT); glDisable(GL_DEPTH_TEST); @@ -416,9 +412,6 @@ void Fl_Gl_Window::draw() { glPopMatrix(); glPopAttrib(); Fl_Surface_Device::pop_current(); -#else - Fl::fatal("Fl_Gl_Window::draw() *must* be overriden. Please refer to the documentation."); -#endif } |