From 67817f696cf8ab47f6f4bee89313367cf0462cea Mon Sep 17 00:00:00 2001 From: ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> Date: Wed, 30 Nov 2022 17:51:35 +0100 Subject: Remove small files fl_XXX_gl_platform_init.cxx The single-function content of these files is moved to Fl_XXX_Gl_Window_Driver.cxx. --- src/drivers/X11/Fl_X11_Gl_Window_Driver.cxx | 7 +++++++ src/drivers/X11/fl_X11_gl_platform_init.cxx | 24 ------------------------ 2 files changed, 7 insertions(+), 24 deletions(-) delete mode 100644 src/drivers/X11/fl_X11_gl_platform_init.cxx (limited to 'src/drivers/X11') diff --git a/src/drivers/X11/Fl_X11_Gl_Window_Driver.cxx b/src/drivers/X11/Fl_X11_Gl_Window_Driver.cxx index d0b79a09a..bbcebbd84 100644 --- a/src/drivers/X11/Fl_X11_Gl_Window_Driver.cxx +++ b/src/drivers/X11/Fl_X11_Gl_Window_Driver.cxx @@ -44,6 +44,13 @@ public: } }; +#ifndef FLTK_USE_WAYLAND +Fl_Gl_Window_Driver *Fl_Gl_Window_Driver::newGlWindowDriver(Fl_Gl_Window *w) +{ + return new Fl_X11_Gl_Window_Driver(w); +} +#endif + void Fl_X11_Gl_Window_Driver::draw_string_legacy(const char* str, int n) { draw_string_legacy_get_list(str, n); } diff --git a/src/drivers/X11/fl_X11_gl_platform_init.cxx b/src/drivers/X11/fl_X11_gl_platform_init.cxx deleted file mode 100644 index 66cfb6989..000000000 --- a/src/drivers/X11/fl_X11_gl_platform_init.cxx +++ /dev/null @@ -1,24 +0,0 @@ -// -// X11-specific code to initialize wayland support. -// -// Copyright 2022 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 -// file is missing or damaged, see the license at: -// -// https://www.fltk.org/COPYING.php -// -// Please see the following page on how to report bugs and issues: -// -// https://www.fltk.org/bugs.php -// - - -#include "Fl_X11_Gl_Window_Driver.H" - - -Fl_Gl_Window_Driver *Fl_Gl_Window_Driver::newGlWindowDriver(Fl_Gl_Window *w) -{ - return new Fl_X11_Gl_Window_Driver(w); -} -- cgit v1.2.3