X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8b089c5e8c8a2140258d150ca1ce42afd3b79e1b..6d9b6716925a786d2455033ccb8775569001b631:/samples/opengl/isosurf/isosurf.h

diff --git a/samples/opengl/isosurf/isosurf.h b/samples/opengl/isosurf/isosurf.h
index e84098c56b..15f6dc2164 100644
--- a/samples/opengl/isosurf/isosurf.h
+++ b/samples/opengl/isosurf/isosurf.h
@@ -6,47 +6,65 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_ISOSURF_H_
 #define _WX_ISOSURF_H_
 
 // Define a new application type
-class MyApp: public wxApp
-{ public:
-    bool OnInit(void);
+class MyApp : public wxApp
+{
+public:
+    virtual bool OnInit();
 };
 
-class TestGLCanvas: public wxGLCanvas
+
+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",
-      int* gl_attrib = NULL);
-   ~TestGLCanvas(void);
-
-   void OnPaint(wxPaintEvent& event);
-   void OnSize(wxSizeEvent& event);
-   void OnEraseBackground(wxEraseEvent& event);
-   void OnChar(wxKeyEvent& event);
-   void OnMouseEvent(wxMouseEvent& event);
-
-DECLARE_EVENT_TABLE()
+public:
+    TestGLCanvas(wxWindow *parent,
+                 wxWindowID id = wxID_ANY,
+                 const wxPoint& pos = wxDefaultPosition,
+                 const wxSize& size = wxDefaultSize,
+                 long style = 0,
+                 const wxString& name = _T("TestGLCanvas"),
+                 int *gl_attrib = NULL);
+
+    virtual ~TestGLCanvas();
+
+    void OnPaint(wxPaintEvent& event);
+    void OnSize(wxSizeEvent& event);
+    void OnChar(wxKeyEvent& event);
+    void OnMouseEvent(wxMouseEvent& event);
+
+
+private:
+    wxGLContext* m_glRC;
+
+    DECLARE_NO_COPY_CLASS(TestGLCanvas)
+    DECLARE_EVENT_TABLE()
 };
 
-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);
+    MyFrame(wxFrame *frame,
+            const wxString& title,
+            const wxPoint& pos,
+            const wxSize& size,
+            long style = wxDEFAULT_FRAME_STYLE);
 
+    virtual ~MyFrame();
+
+    TestGLCanvas *m_canvas;
+
+private :
     void OnExit(wxCommandEvent& event);
-public:
-    TestGLCanvas*    m_canvas;
 
-DECLARE_EVENT_TABLE()
+    DECLARE_EVENT_TABLE()
 };
 
-#endif
+#endif // _WX_ISOSURF_H_