Some refinements to my experimental RPM builder script and spec

[wxWidgets.git] / wxPython / contrib / glcanvas / msw / myglcanvas.h

diff --git a/wxPython/contrib/glcanvas/msw/myglcanvas.h b/wxPython/contrib/glcanvas/msw/myglcanvas.h
index 2ec721c66b6c05bc4d8be22009bb238ee11ca9ad..5dd269da72e2a32bb062c80b0ea93dafd4cce59c 100644 (file)
--- a/wxPython/contrib/glcanvas/msw/myglcanvas.h
+++ b/wxPython/contrib/glcanvas/msw/myglcanvas.h
@@ -17,17 +17,15 @@
 #define _WX_GLCANVAS_H_
 
 #include <wx/setup.h>
-
-
+#undef wxUSE_GLCANVAS
 #define wxUSE_GLCANVAS 1
-#if wxUSE_GLCANVAS
 
 #include <wx/palette.h>
 #include <wx/scrolwin.h>
 
 #include <windows.h>
 
-#include "gl/gl.h"
+#include <GL/gl.h>
 
 //---------------------------------------------------------------------------
 // Constants for attriblist
@@ -85,7 +83,7 @@ public:
    wxWindow*        m_window;
 };
 
-class wxGLCanvas: public wxScrolledWindow
+class wxGLCanvas: public wxWindow
 {
    DECLARE_CLASS(wxGLCanvas)
  public:
@@ -130,11 +128,29 @@ protected:
     wxPalette      m_palette;
     WXHDC          m_hDC;
 
-DECLARE_EVENT_TABLE()
+    DECLARE_EVENT_TABLE()
 };
 
-#endif
-    // wxUSE_GLCANVAS
+
+
+class wxGLApp : public wxApp
+{
+public:
+    wxGLApp() : wxApp() { }
+    virtual ~wxGLApp();
+
+    // use this in the constructor of the user-derived wxGLApp class to
+    // determine if an OpenGL rendering context with these attributes
+    // is available - returns TRUE if so, FALSE if not.
+    bool InitGLVisual(int *attribList);
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxGLApp)
+};
+
+
+
+
 #endif
     // _WX_GLCANVAS_H_