compilation fix for 2.8 compat disabled

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

diff --git a/samples/opengl/cube/cube.h b/samples/opengl/cube/cube.h
index f7d4de6fbdc8349114a3015dc15c19b04c407a1c..af9e59d61f95daa7b8d242f945e1ecc5be1a61ac 100644 (file)
--- a/samples/opengl/cube/cube.h
+++ b/samples/opengl/cube/cube.h
@@ -14,84 +14,69 @@
 
 #include "wx/glcanvas.h"
 
 
 #include "wx/glcanvas.h"
 

+// the rendering context used by all GL canvases
+class TestGLContext : public wxGLContext
+{
+public:
+    TestGLContext(wxGLCanvas *canvas);
+
+    // render the cube showing it at given angles
+    void DrawRotatedCube(float xangle, float yangle);
+
+private:
+    // textures for the cube faces
+    GLuint m_textures[6];
+};
+

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

-    bool OnInit(void);
+    MyApp() { m_glContext = NULL; }
+
+    // get the context we use creating it on demand (and set it as current)
+    TestGLContext& GetContext(wxGLCanvas *canvas);
+
+    // virtual wxApp methods
+    virtual bool OnInit();
+    virtual int OnExit();
+
+private:
+    // the GL context we use for all our windows
+    TestGLContext *m_glContext;

 };
 
 // Define a new frame type
 };
 
 // Define a new frame type

-class TestGLCanvas;

 class MyFrame: public wxFrame
 {
 public:
 class MyFrame: public wxFrame
 {
 public:

-    MyFrame(wxFrame *frame, const wxString& title, const wxPoint& pos,
-            const wxSize& size, long style = wxDEFAULT_FRAME_STYLE);
+    MyFrame();

 
 

-    void OnExit(wxCommandEvent& event);
+private:
+    void OnClose(wxCommandEvent& event);

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

-    
-public:
-    TestGLCanvas*    m_canvas;

 
 

-DECLARE_EVENT_TABLE()
+    DECLARE_EVENT_TABLE()

 };
 
 };
 

-#if wxUSE_GLCANVAS
-
-class TestGLCanvas: public wxGLCanvas
+class TestGLCanvas : public wxGLCanvas

 {
 {

-  friend class MyFrame;

 public:
 public:

- TestGLCanvas(wxWindow *parent, const wxWindowID id = -1, 
-    const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-    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,
-          const wxString& name = _T("TestGLCanvas") );
-   
- ~TestGLCanvas(void);
-
- void OnPaint(wxPaintEvent& event);
- void OnSize(wxSizeEvent& event);
- void OnEraseBackground(wxEraseEvent& event);
- void OnKeyDown(wxKeyEvent& event);
- void OnKeyUp(wxKeyEvent& event);
- void OnEnterWindow( wxMouseEvent& event );
- 
- void Render( void );
- void InitGL(void);
- void Rotate( GLfloat deg );
- static GLfloat CalcRotateSpeed( unsigned long acceltime );
- static GLfloat CalcRotateAngle( unsigned long lasttime,
-                                 unsigned long acceltime );
- void Action( long code, unsigned long lasttime,
-              unsigned long acceltime );
-   
+    TestGLCanvas(wxWindow *parent);
+

 private:
 private:

-  bool   m_init;
-  GLuint m_gllist;
-  long   m_rleft;
-  long   m_rright;
-
-  static unsigned long  m_secbase;
-  static int            m_TimeInitialized;
-  static unsigned long  m_xsynct;
-  static unsigned long  m_gsynct;
- 
-  long           m_Key;
-  unsigned long  m_StartTime;
-  unsigned long  m_LastTime;
-  unsigned long  m_LastRedraw;
-
-DECLARE_EVENT_TABLE()
-};
+    void OnPaint(wxPaintEvent& event);
+    void OnSize(wxSizeEvent& event);
+    void OnKeyDown(wxKeyEvent& event);

 
 

-#endif
+    // angles of rotation around x- and y- axis
+    float m_xangle,
+          m_yangle;
+
+    DECLARE_EVENT_TABLE()
+};

 
 

-#endif
+#endif // _WX_CUBE_H_