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 79b56d35284e6a61f47be5ed6f1bfd0a9dd25d52..5dd269da72e2a32bb062c80b0ea93dafd4cce59c 100644 (file)
--- a/wxPython/contrib/glcanvas/msw/myglcanvas.h
+++ b/wxPython/contrib/glcanvas/msw/myglcanvas.h
@@ -19,14 +19,13 @@
 #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
@@ -84,7 +83,7 @@ public:
    wxWindow*        m_window;
 };
 
-class wxGLCanvas: public wxScrolledWindow
+class wxGLCanvas: public wxWindow
 {
    DECLARE_CLASS(wxGLCanvas)
  public:
@@ -152,8 +151,6 @@ private:
 
 
 
-#endif
-    // wxUSE_GLCANVAS
 #endif
     // _WX_GLCANVAS_H_