Patch #808669 more warngins and unicode fixes

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

diff --git a/samples/opengl/cube/cube.h b/samples/opengl/cube/cube.h
index 66732f2453e5eb7339fe9156d35cc78a4cd78d86..f7d4de6fbdc8349114a3015dc15c19b04c407a1c 100644 (file)
--- a/samples/opengl/cube/cube.h
+++ b/samples/opengl/cube/cube.h
@@ -6,13 +6,13 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CUBE_H_
 #define _WX_CUBE_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CUBE_H_
 #define _WX_CUBE_H_
 

-#include <wx/glcanvas.h>
+#include "wx/glcanvas.h"

 
 // Define a new application type
 class MyApp: public wxApp
 
 // Define a new application type
 class MyApp: public wxApp


@@ -30,9 +30,9 @@ public:
             const wxSize& size, long style = wxDEFAULT_FRAME_STYLE);
 
     void OnExit(wxCommandEvent& event);
             const wxSize& size, long style = wxDEFAULT_FRAME_STYLE);
 
     void OnExit(wxCommandEvent& event);

-    void OnNewWindow();
-    void OnDefRotateLeftKey();
-    void OnDefRotateRightKey();
+    void OnNewWindow(wxCommandEvent& event);
+    void OnDefRotateLeftKey(wxCommandEvent& event);
+    void OnDefRotateRightKey(wxCommandEvent& event);

     
 public:
     TestGLCanvas*    m_canvas;
     
 public:
     TestGLCanvas*    m_canvas;


@@ -40,17 +40,19 @@ public:
 DECLARE_EVENT_TABLE()
 };
 
 DECLARE_EVENT_TABLE()
 };
 

+#if wxUSE_GLCANVAS
+

 class TestGLCanvas: public wxGLCanvas
 {
   friend class MyFrame;
 public:
  TestGLCanvas(wxWindow *parent, const wxWindowID id = -1, 
     const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
 class TestGLCanvas: public wxGLCanvas
 {
   friend class MyFrame;
 public:
  TestGLCanvas(wxWindow *parent, const wxWindowID id = -1, 
     const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,

-    long style = 0, const wxString& name = "TestGLCanvas");
+    long style = 0, const wxString& name = _T("TestGLCanvas"));

  TestGLCanvas(wxWindow *parent, const TestGLCanvas &other,
           const wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition,
           const wxSize& size = wxDefaultSize, long style = 0,
  TestGLCanvas(wxWindow *parent, const TestGLCanvas &other,
           const wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition,
           const wxSize& size = wxDefaultSize, long style = 0,

-          const wxString& name = "TestGLCanvas" );
+          const wxString& name = _T("TestGLCanvas") );

    
  ~TestGLCanvas(void);
 
    
  ~TestGLCanvas(void);
 


@@ -91,3 +93,5 @@ DECLARE_EVENT_TABLE()
 
 #endif
 
 
 #endif
 

+#endif
+