Applied patch [ 802596 ] warning and error free Open GL samples

[wxWidgets.git] / samples / opengl / isosurf / isosurf.h

diff --git a/samples/opengl/isosurf/isosurf.h b/samples/opengl/isosurf/isosurf.h
index e404def144b2da70b33e6e8fc17c1f719efb1da8..a3dba1907a36a6a0faefd7dc0e9fcf57e59ab319 100644 (file)
--- a/samples/opengl/isosurf/isosurf.h
+++ b/samples/opengl/isosurf/isosurf.h
@@ -18,11 +18,12 @@ class MyApp: public wxApp
     bool OnInit(void);
 };
 
+#if wxUSE_GLCANVAS
 class TestGLCanvas: public wxGLCanvas
 {
  public:
    TestGLCanvas(wxWindow *parent, const wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition,
-      const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = "TestGLCanvas",
+      const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = _T("TestGLCanvas"),
       int* gl_attrib = NULL);
    ~TestGLCanvas(void);
 
@@ -34,6 +35,7 @@ class TestGLCanvas: public wxGLCanvas
 
 DECLARE_EVENT_TABLE()
 };
+#endif
 
 class MyFrame: public wxFrame
 {
@@ -43,7 +45,9 @@ public:
 
     void OnExit(wxCommandEvent& event);
 public:
+#if wxUSE_GLCANVAS
     TestGLCanvas*    m_canvas;
+#endif
 
 DECLARE_EVENT_TABLE()
 };