From a57f7ae8cd0fa5cccdd43832b2fbc687f41e541f Mon Sep 17 00:00:00 2001 From: Maciej Suminski <maciej.suminski@cern.ch> Date: Sun, 20 Jul 2014 21:14:42 +0200 Subject: [PATCH] Fix OpenGL canvas freeze under Windows. --- common/gal/opengl/opengl_gal.cpp | 2 +- include/gal/opengl/opengl_gal.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/gal/opengl/opengl_gal.cpp b/common/gal/opengl/opengl_gal.cpp index f7b7842a04..a5f7265a2f 100644 --- a/common/gal/opengl/opengl_gal.cpp +++ b/common/gal/opengl/opengl_gal.cpp @@ -124,7 +124,7 @@ void OPENGL_GAL::BeginDrawing() { SetCurrent( *glContext ); - clientDC = new wxPaintDC( this ); + clientDC = new wxClientDC( this ); // Initialize GLEW, FBOs & VBOs if( !isGlewInitialized ) diff --git a/include/gal/opengl/opengl_gal.h b/include/gal/opengl/opengl_gal.h index 417cdd389e..779a119ac7 100644 --- a/include/gal/opengl/opengl_gal.h +++ b/include/gal/opengl/opengl_gal.h @@ -252,7 +252,7 @@ private: static const int CIRCLE_POINTS = 64; ///< The number of points for circle approximation static const int CURVE_POINTS = 32; ///< The number of points for curve approximation - wxPaintDC* clientDC; ///< Drawing context + wxClientDC* clientDC; ///< Drawing context static wxGLContext* glContext; ///< OpenGL context of wxWidgets wxWindow* parentWindow; ///< Parent window wxEvtHandler* mouseListener;