X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4b764db3795a5f202f379ee3b0314b2de91c15fa..8a31648287be0ef976f133de2786b137f1e98340:/samples/opengl/penguin/penguin.h?ds=inline

diff --git a/samples/opengl/penguin/penguin.h b/samples/opengl/penguin/penguin.h
index 63efc497f4..3f25590907 100644
--- a/samples/opengl/penguin/penguin.h
+++ b/samples/opengl/penguin/penguin.h
@@ -31,6 +31,7 @@ extern "C"
 
 #include "dxfrenderer.h"
 
+
 // OpenGL view data
 struct GLData
 {
@@ -40,40 +41,40 @@ struct GLData
     float zoom;                 // field of view in degrees
 };
 
+
 // Define a new application type
-class MyApp: public wxApp
+class MyApp : public wxApp
 {
 public:
-    bool OnInit();
+    virtual bool OnInit();
 };
 
+
 // Define a new frame type
 class TestGLCanvas;
 
-class MyFrame: public wxFrame
+
+class MyFrame : public wxFrame
 {
 public:
     MyFrame(wxFrame *frame, const wxString& title, const wxPoint& pos,
-        const wxSize& size, long style = wxDEFAULT_FRAME_STYLE);
+            const wxSize& size, long style = wxDEFAULT_FRAME_STYLE);
 
     void OnMenuFileOpen(wxCommandEvent& event);
     void OnMenuFileExit(wxCommandEvent& event);
     void OnMenuHelpAbout(wxCommandEvent& event);
 
-#if wxUSE_GLCANVAS
-    void SetCanvas( TestGLCanvas *canvas ) { m_canvas = canvas; }
+    void SetCanvas(TestGLCanvas *canvas) { m_canvas = canvas; }
     TestGLCanvas *GetCanvas() { return m_canvas; }
 
 private:
     TestGLCanvas *m_canvas;
-#endif
 
     DECLARE_EVENT_TABLE()
 };
 
-#if wxUSE_GLCANVAS
 
-class TestGLCanvas: public wxGLCanvas
+class TestGLCanvas : public wxGLCanvas
 {
 public:
     TestGLCanvas(wxWindow *parent, wxWindowID id = wxID_ANY,
@@ -81,7 +82,7 @@ public:
         const wxSize& size = wxDefaultSize, long style = 0,
         const wxString& name = wxT("TestGLCanvas"));
 
-    ~TestGLCanvas();
+    virtual ~TestGLCanvas();
 
     void LoadDXF(const wxString& filename);
 
@@ -95,13 +96,12 @@ private:
     void InitGL();
     void ResetProjectionMode();
 
-    GLData m_gldata;
-    DXFRenderer m_renderer;
+    wxGLContext* m_glRC;
+    GLData       m_gldata;
+    DXFRenderer  m_renderer;
 
+    wxDECLARE_NO_COPY_CLASS(TestGLCanvas);
     DECLARE_EVENT_TABLE()
 };
 
-#endif // #if wxUSE_GLCANVAS
-
 #endif // #ifndef _WX_PENGUIN_H_
-