fix TestGLCanvas ctor (part of patch 1155132)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33105 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/opengl/cube/cube.cpp b/samples/opengl/cube/cube.cpp
index ea9a8265420be97b0034355238306ee9c86c72d6..66bac043e0ea2b2e13dcd9b2f55af4e062ce70ad 100644 (file)
--- a/samples/opengl/cube/cube.cpp
+++ b/samples/opengl/cube/cube.cpp
@@ -191,13 +191,13 @@ TestGLCanvas::TestGLCanvas(wxWindow *parent, wxWindowID id,
     m_rright = WXK_RIGHT;
 }
 
     m_rright = WXK_RIGHT;
 }
 

-TestGLCanvas::TestGLCanvas(wxWindow *parent, const TestGLCanvas &other,
+TestGLCanvas::TestGLCanvas(wxWindow *parent, const TestGLCanvas *other,

     wxWindowID id, const wxPoint& pos, const wxSize& size, long style,
     const wxString& name )
     wxWindowID id, const wxPoint& pos, const wxSize& size, long style,
     const wxString& name )

-    : wxGLCanvas(parent, other.GetContext(), id, pos, size, style|wxFULL_REPAINT_ON_RESIZE , name)
+    : wxGLCanvas(parent, other->GetContext(), id, pos, size, style|wxFULL_REPAINT_ON_RESIZE , name)

 {
     m_init = false;
 {
     m_init = false;

-    m_gllist = other.m_gllist; // share display list
+    m_gllist = other->m_gllist; // share display list

     m_rleft = WXK_LEFT;
     m_rright = WXK_RIGHT;
 }
     m_rleft = WXK_LEFT;
     m_rright = WXK_RIGHT;
 }

diff --git a/samples/opengl/cube/cube.h b/samples/opengl/cube/cube.h
index 077d4f16d9f4c06dbfba4797db352374b739d58f..f50ea2a0493d9b9f8f31baedfd7f47448cb63d26 100644 (file)
--- a/samples/opengl/cube/cube.h
+++ b/samples/opengl/cube/cube.h
@@ -56,7 +56,7 @@ public:
         const wxSize& size = wxDefaultSize,
         long style = 0, const wxString& name = _T("TestGLCanvas") );
 
         const wxSize& size = wxDefaultSize,
         long style = 0, const wxString& name = _T("TestGLCanvas") );
 

-    TestGLCanvas( wxWindow *parent, const TestGLCanvas &other,
+    TestGLCanvas( wxWindow *parent, const TestGLCanvas *other,

         wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize, long style = 0,
         const wxString& name = _T("TestGLCanvas") );
         wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize, long style = 0,
         const wxString& name = _T("TestGLCanvas") );