X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/34a34b020f1c8defacb299a0fa5c480fa65b8597..f321ab7fb40525098cea6594ffbf2daf0186b1a3:/include/wx/gtk1/glcanvas.h?ds=inline

diff --git a/include/wx/gtk1/glcanvas.h b/include/wx/gtk1/glcanvas.h
index 596f76a7d9..0ba6b3ef66 100644
--- a/include/wx/gtk1/glcanvas.h
+++ b/include/wx/gtk1/glcanvas.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        glcanvas.h
+// Name:        wx/gtk1/glcanvas.h
 // Purpose:     wxGLCanvas, for using OpenGL/Mesa with wxWidgets and GTK
 // Author:      Robert Roebling
 // Modified by:
@@ -12,10 +12,6 @@
 #ifndef _WX_GLCANVAS_H_
 #define _WX_GLCANVAS_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "glcanvas.h"
-#endif
-
 #include "wx/scrolwin.h"
 #include "wx/app.h"
 
@@ -25,30 +21,6 @@ extern "C" {
 #include <GL/glu.h>
 }
 
-//---------------------------------------------------------------------------
-// Constants for attriblist
-//---------------------------------------------------------------------------
-
-enum
-{
-  WX_GL_RGBA=1,          /* use true color palette */
-  WX_GL_BUFFER_SIZE,     /* bits for buffer if not WX_GL_RGBA */
-  WX_GL_LEVEL,           /* 0 for main buffer, >0 for overlay, <0 for underlay */
-  WX_GL_DOUBLEBUFFER,    /* use doublebuffer */
-  WX_GL_STEREO,          /* use stereoscopic display */
-  WX_GL_AUX_BUFFERS,     /* number of auxiliary buffers */
-  WX_GL_MIN_RED,         /* use red buffer with most bits (> MIN_RED bits) */
-  WX_GL_MIN_GREEN,       /* use green buffer with most bits (> MIN_GREEN bits) */
-  WX_GL_MIN_BLUE,        /* use blue buffer with most bits (> MIN_BLUE bits) */
-  WX_GL_MIN_ALPHA,       /* use blue buffer with most bits (> MIN_ALPHA bits) */
-  WX_GL_DEPTH_SIZE,      /* bits for Z-buffer (0,16,32) */
-  WX_GL_STENCIL_SIZE,    /* bits for stencil buffer */
-  WX_GL_MIN_ACCUM_RED,   /* use red accum buffer with most bits (> MIN_ACCUM_RED bits) */
-  WX_GL_MIN_ACCUM_GREEN, /* use green buffer with most bits (> MIN_ACCUM_GREEN bits) */
-  WX_GL_MIN_ACCUM_BLUE,  /* use blue buffer with most bits (> MIN_ACCUM_BLUE bits) */
-  WX_GL_MIN_ACCUM_ALPHA  /* use blue buffer with most bits (> MIN_ACCUM_ALPHA bits) */
-};
-
 //---------------------------------------------------------------------------
 // classes
 //---------------------------------------------------------------------------
@@ -70,7 +42,7 @@ public:
                const wxPalette& WXUNUSED(palette),
                const wxGLContext *other        /* for sharing display lists */
     );
-    ~wxGLContext();
+    virtual ~wxGLContext();
 
     void SetCurrent();
     void SetColour(const wxChar *colour);
@@ -142,7 +114,7 @@ public:
                 int *attribList = (int*) NULL,
                 const wxPalette& palette = wxNullPalette );
 
-   ~wxGLCanvas();
+   virtual ~wxGLCanvas();
 
    void SetCurrent();
    void SetColour(const wxChar *colour);