added wxMGL_DOS platform

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

diff --git a/include/wx/gtk1/glcanvas.h b/include/wx/gtk1/glcanvas.h
index 3eec4ab6ada4fd4d674ac632d2b2ffcc60d0800a..f78a8d8f10787b45832858cf08ba2a9dfa6b55d7 100644 (file)
--- a/include/wx/gtk1/glcanvas.h
+++ b/include/wx/gtk1/glcanvas.h
@@ -16,10 +16,6 @@
 #ifndef _WX_GLCANVAS_H_
 #define _WX_GLCANVAS_H_
 
-#include "wx/defs.h"
-
-#if wxUSE_GLCANVAS
-
 #include "wx/scrolwin.h"
 #include "wx/app.h"
 
@@ -104,7 +100,7 @@ private:
 // wxGLCanvas
 //---------------------------------------------------------------------------
 
-class WXDLLEXPORT wxGLCanvas: public wxScrolledWindow
+class WXDLLEXPORT wxGLCanvas: public wxWindow
 {
 public:
    inline wxGLCanvas() {
@@ -178,30 +174,6 @@ private:
     DECLARE_CLASS(wxGLCanvas)
 };
 
-
-//---------------------------------------------------------------------------
-// wxGLApp
-//---------------------------------------------------------------------------
-
-class WXDLLEXPORT wxGLApp: public wxApp
-{
-public:
-    wxGLApp() : wxApp() { }
-    ~wxGLApp();
-    
-    // use this in the constructor of the user-derived wxGLApp class to select
-    // an appropriate X visual for GL. Returns TRUE if an appropriate visual
-    // is found - and sets m_glVisualInfo; FALSE otherwise.
-    bool InitGLVisual(int *attribList);
-    
-private:
-    DECLARE_DYNAMIC_CLASS(wxGLApp)
-};
-
-
-#endif
-    // wxUSE_GLCANVAS
-
 #endif
     // _WX_GLCANVAS_H_