X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e4545e0183a7c117d9c745a165d1f57293d873e9..632b58cdce7a1b62f7aa1a26acc61e5ced04494b:/samples/opengl/cube/cube.cpp diff --git a/samples/opengl/cube/cube.cpp b/samples/opengl/cube/cube.cpp index c4a60b515a..f65ca2accb 100644 --- a/samples/opengl/cube/cube.cpp +++ b/samples/opengl/cube/cube.cpp @@ -4,7 +4,6 @@ // Author: Julian Smart // Modified by: Vadim Zeitlin to use new wxGLCanvas API (2007-04-09) // Created: 04/01/98 -// RCS-ID: $Id$ // Copyright: (c) Julian Smart // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -34,7 +33,7 @@ #include "cube.h" -#if !defined(__WXMSW__) && !defined(__WXPM__) +#ifndef wxHAS_IMAGES_IN_RESOURCES #include "../../sample.xpm" #endif @@ -138,6 +137,7 @@ TestGLContext::TestGLContext(wxGLCanvas *canvas) SetCurrent(*canvas); // set up the parameters we want to use + glEnable(GL_CULL_FACE); glEnable(GL_DEPTH_TEST); glEnable(GL_LIGHTING); glEnable(GL_LIGHT0); @@ -323,10 +323,11 @@ void TestGLCanvas::OnPaint(wxPaintEvent& WXUNUSED(event)) // is wrong when next another canvas is repainted. const wxSize ClientSize = GetClientSize(); + TestGLContext& canvas = wxGetApp().GetContext(this); glViewport(0, 0, ClientSize.x, ClientSize.y); // Render the graphics and swap the buffers. - wxGetApp().GetContext(this).DrawRotatedCube(m_xangle, m_yangle); + canvas.DrawRotatedCube(m_xangle, m_yangle); SwapBuffers(); }