set eol-style

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

diff --git a/include/wx/glcanvas.h b/include/wx/glcanvas.h
index adbbb033a1341891ddbd8105b8461e0d79eb2b95..bb4ffa498a3a102f68b864c957cb5f8a127a6955 100644 (file)
--- a/include/wx/glcanvas.h
+++ b/include/wx/glcanvas.h
@@ -20,8 +20,8 @@
 #include "wx/palette.h"
 #include "wx/window.h"
 
 #include "wx/palette.h"
 #include "wx/window.h"
 

-class WXDLLIMPEXP_GL wxGLCanvas;
-class WXDLLIMPEXP_GL wxGLContext;
+class WXDLLIMPEXP_FWD_GL wxGLCanvas;
+class WXDLLIMPEXP_FWD_GL wxGLContext;

 
 // ----------------------------------------------------------------------------
 // Constants for attributes list
 
 // ----------------------------------------------------------------------------
 // Constants for attributes list


@@ -77,12 +77,7 @@ class WXDLLIMPEXP_GL wxGLCanvasBase : public wxWindow
 {
 public:
     // default ctor doesn't initialize the window, use Create() later
 {
 public:
     // default ctor doesn't initialize the window, use Create() later

-    wxGLCanvasBase()
-    {
-#if WXWIN_COMPATIBILITY_2_8
-        m_glContext = NULL;
-#endif
-    }
+    wxGLCanvasBase();

 
     virtual ~wxGLCanvasBase();
 
 
     virtual ~wxGLCanvasBase();
 


@@ -120,7 +115,7 @@ public:
 
     // call glcolor() for the colour with the given name, return false if
     // colour not found
 
     // call glcolor() for the colour with the given name, return false if
     // colour not found

-    bool SetColour(const wxChar *colour);
+    bool SetColour(const wxString& colour);