gtkgl module: drop

For some reason we have a gtkGL module from the beginning of the time,
but it's not doing anything, and it's not used anywhere. This removes it.

diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
index f9db624cad3193dc86e05bb69b449f6f528d4b29..05d4d9fc780f8386be498a5b5aa984adfee8680a 100644 (file)
--- a/include/CMakeLists.txt
+++ b/include/CMakeLists.txt
@@ -14,7 +14,6 @@ add_library(includes
         ifilter.h
         igl.h
         iglrender.h
-        igtkgl.h
         iimage.h
         imap.h
         imodel.h

diff --git a/include/igtkgl.h b/include/igtkgl.h
deleted file mode 100644 (file)
index b445456..0000000
--- a/include/igtkgl.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-   Copyright (C) 2001-2006, William Joseph.
-   All Rights Reserved.
-
-   This file is part of GtkRadiant.
-
-   GtkRadiant is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   GtkRadiant is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with GtkRadiant; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#if !defined( INCLUDED_IGTKGL_H )
-#define INCLUDED_IGTKGL_H
-
-#include <uilib/uilib.h>
-#include "generic/constant.h"
-
-template<class T>
-using func = T *;
-
-struct _QERGtkGLTable {
-    STRING_CONSTANT(Name, "gtkgl");
-    INTEGER_CONSTANT(Version, 1);
-
-    func<ui::GLArea(bool zbufffer)> glwidget_new;
-    func<void(ui::GLArea self)> glwidget_swap_buffers;
-    func<bool(ui::GLArea self)> glwidget_make_current;
-    func<void(ui::GLArea self)> glwidget_destroy_context;
-    func<void(ui::GLArea self)> glwidget_create_context;
-};
-
-#endif

diff --git a/libs/gtkutil/glwidget.cpp b/libs/gtkutil/glwidget.cpp
index f463b8b30268f2617a019c62287ba1a54bee8bee..c597c4a9640a65431a3e021372fdf66843e98536 100644 (file)
--- a/libs/gtkutil/glwidget.cpp
+++ b/libs/gtkutil/glwidget.cpp
@@ -92,7 +92,6 @@ bool glwidget_make_current(ui::GLArea self)
 //        glwidget_context_created(self);
 //    }
     gtk_gl_area_make_current(self);
-    auto valid = GlobalOpenGL().contextValid;
     return true;
 }
 

diff --git a/radiant/CMakeLists.txt b/radiant/CMakeLists.txt
index 3537a7ddc6ed326643ab2b3f5623c7a2d2380cc6..6c62139d66c6ea94bcab9e874facfec45733ac37 100644 (file)
--- a/radiant/CMakeLists.txt
+++ b/radiant/CMakeLists.txt
@@ -36,7 +36,6 @@ set(RADIANTLIST
     filetypes.cpp filetypes.h
     filters.cpp filters.h
     findtexturedialog.cpp findtexturedialog.h
-    glwidget.cpp glwidget.h
     grid.cpp grid.h
     groupdialog.cpp groupdialog.h
     gtkdlgs.cpp gtkdlgs.h

diff --git a/radiant/glwidget.cpp b/radiant/glwidget.cpp
deleted file mode 100644 (file)
index 0820d78..0000000
--- a/radiant/glwidget.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-   Copyright (C) 2001-2006, William Joseph.
-   All Rights Reserved.
-
-   This file is part of GtkRadiant.
-
-   GtkRadiant is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   GtkRadiant is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with GtkRadiant; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#include "glwidget.h"
-
-#include "igtkgl.h"
-#include "modulesystem.h"
-#include "gtkutil/glwidget.h"
-
-class GtkGLAPI
-{
-_QERGtkGLTable m_gtkgl;
-public:
-typedef _QERGtkGLTable Type;
-STRING_CONSTANT( Name, "*" );
-
-GtkGLAPI(){
-       m_gtkgl.glwidget_new = &glwidget_new;
-       m_gtkgl.glwidget_swap_buffers = &glwidget_swap_buffers;
-       m_gtkgl.glwidget_make_current = &glwidget_make_current;
-       m_gtkgl.glwidget_destroy_context = &glwidget_destroy_context;
-       m_gtkgl.glwidget_create_context = &glwidget_create_context;
-}
-_QERGtkGLTable* getTable(){
-       return &m_gtkgl;
-}
-};
-
-#include "modulesystem/singletonmodule.h"
-#include "modulesystem/moduleregistry.h"
-
-typedef SingletonModule<GtkGLAPI> GtkGLModule;
-typedef Static<GtkGLModule> StaticGtkGLModule;
-StaticRegisterModule staticRegisterGtkGL( StaticGtkGLModule::instance() );

diff --git a/radiant/glwidget.h b/radiant/glwidget.h
deleted file mode 100644 (file)
index 0adad26..0000000
--- a/radiant/glwidget.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
-   Copyright (C) 2001-2006, William Joseph.
-   All Rights Reserved.
-
-   This file is part of GtkRadiant.
-
-   GtkRadiant is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   GtkRadiant is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with GtkRadiant; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#if !defined( INCLUDED_GLWIDGET_H )
-#define INCLUDED_GLWIDGET_H
-
-#endif