From 8474a52c326082fb21a8d130ec5b6298ea1d0970 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 27 Mar 2005 18:08:08 +0000 Subject: [PATCH] fix TestGLCanvas ctor (part of patch 1155132) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33105 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/opengl/cube/cube.cpp | 6 +++--- samples/opengl/cube/cube.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/samples/opengl/cube/cube.cpp b/samples/opengl/cube/cube.cpp index ea9a826542..66bac043e0 100644 --- 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; } -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 ) - : 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_gllist = other.m_gllist; // share display list + m_gllist = other->m_gllist; // share display list m_rleft = WXK_LEFT; m_rright = WXK_RIGHT; } diff --git a/samples/opengl/cube/cube.h b/samples/opengl/cube/cube.h index 077d4f16d9..f50ea2a049 100644 --- 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") ); - 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") ); -- 2.45.2