reset deferred position/size if the window was moved immediately (#10073)

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

diff --git a/samples/opengl/isosurf/isosurf.h b/samples/opengl/isosurf/isosurf.h
index 66c81485f09c0dec22b5f23f0be28bd5d8d884a3..15f6dc2164677b1c012e58965ab28a556be4f682 100644 (file)
--- a/samples/opengl/isosurf/isosurf.h
+++ b/samples/opengl/isosurf/isosurf.h
@@ -13,54 +13,58 @@
 #define _WX_ISOSURF_H_
 
 // Define a new application type
-class MyApp: public wxApp
+class MyApp : public wxApp
 {
 public:
-    bool OnInit();
+    virtual bool OnInit();
 };
 
-#if wxUSE_GLCANVAS
 
-class TestGLCanvas: public wxGLCanvas
+class TestGLCanvas : public wxGLCanvas
 {
 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);
+    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);
 
-   ~TestGLCanvas();
+    virtual ~TestGLCanvas();
 
     void OnPaint(wxPaintEvent& event);
     void OnSize(wxSizeEvent& event);
-    void OnEraseBackground(wxEraseEvent& event);
     void OnChar(wxKeyEvent& event);
     void OnMouseEvent(wxMouseEvent& event);
 
+
+private:
+    wxGLContext* m_glRC;
+
+    DECLARE_NO_COPY_CLASS(TestGLCanvas)
     DECLARE_EVENT_TABLE()
 };
 
-#endif // #if wxUSE_GLCANVAS
-
 
-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();
 
-#if wxUSE_GLCANVAS
     TestGLCanvas *m_canvas;
-#endif
 
 private :
-
     void OnExit(wxCommandEvent& event);
 
-DECLARE_EVENT_TABLE()
+    DECLARE_EVENT_TABLE()
 };
 
-#endif // #ifndef _WX_ISOSURF_H_
+#endif // _WX_ISOSURF_H_