Added (and documented) GetTraceMasks so userspace can probe the currently

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

diff --git a/include/wx/msw/glcanvas.h b/include/wx/msw/glcanvas.h
index 534528d5593ee66b69b6c46ca9256339d653c1a9..31301489e0a0816892c3f1dbc9bcb504bc7aac92 100644 (file)
--- a/include/wx/msw/glcanvas.h
+++ b/include/wx/msw/glcanvas.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        glcanvas.h
+// Name:        wx/msw/glcanvas.h
 // Purpose:     wxGLCanvas, for using OpenGL with wxWindows under Windows
 // Author:      Julian Smart
 // Modified by:
@@ -16,16 +16,12 @@
 #ifndef _WX_GLCANVAS_H_
 #define _WX_GLCANVAS_H_
 
-#include <wx/setup.h>
-
-#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
@@ -83,7 +79,7 @@ public:
    wxWindow*        m_window;
 };
 
-class WXDLLEXPORT wxGLCanvas: public wxScrolledWindow
+class WXDLLEXPORT wxGLCanvas: public wxWindow
 {
    DECLARE_CLASS(wxGLCanvas)
  public:
@@ -128,11 +124,9 @@ protected:
     wxPalette      m_palette;
     WXHDC          m_hDC;
 
-DECLARE_EVENT_TABLE()
+    DECLARE_EVENT_TABLE()
 };
 
-#endif
-    // wxUSE_GLCANVAS
 #endif
     // _WX_GLCANVAS_H_