added operator-(const wxChar *, const wxCStrData&) to allow compilation of the code...

[wxWidgets.git] / include / wx / x11 / glcanvas.h

diff --git a/include/wx/x11/glcanvas.h b/include/wx/x11/glcanvas.h
index 266be112a3e6ad4600a9cacf3eac1adadd51f862..2ee71b678dfcca3d149e00e724239a7a92218e51 100644 (file)
--- a/include/wx/x11/glcanvas.h
+++ b/include/wx/x11/glcanvas.h
@@ -23,26 +23,6 @@
 
 #include <GL/glx.h>
 
-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
 //---------------------------------------------------------------------------
@@ -57,7 +37,7 @@ public:
         const wxPalette& WXUNUSED(palette),
         const wxGLContext *other  /* for sharing display lists */
         );
-    ~wxGLContext();
+    virtual ~wxGLContext();
 
     void SetCurrent();
     void SetColour(const wxChar *colour);
@@ -124,7 +104,7 @@ public:
         int *attribList = (int*) NULL,
         const wxPalette& palette = wxNullPalette );
 
-    ~wxGLCanvas();
+    virtual ~wxGLCanvas();
 
     void SetCurrent();
     void SetColour(const wxChar *colour);