Mercurial > octave-nkf

comparison libgui/graphics/GLCanvas.cc @ 19659:2f4406e9dad6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Periodic merge of gui-release to default.
author John W. Eaton <jwe@octave.org>
date Fri, 23 Jan 2015 16:40:25 -0500
parents dbb207d10d7c 6b2d7a5dc62a
children 5d0663bff506
comparison
equal deleted inserted replaced
19647:e8e3a89fa370 19659:2f4406e9dad6
35 #include "gl-select.h" 35 #include "gl-select.h"
36 36
37 namespace QtHandles 37 namespace QtHandles
38 { 38 {
39 39
40 GLCanvas::GLCanvas (QWidget* xparent, const graphics_handle& xhandle) 40 GLCanvas::GLCanvas (QWidget* xparent, const graphics_handle& gh)
41 : QGLWidget (xparent), Canvas (xhandle) 41 : QGLWidget (xparent), Canvas (gh)
42 { 42 {
43 setFocusPolicy (Qt::ClickFocus); 43 setFocusPolicy (Qt::ClickFocus);
44 } 44 }
45 45
46 GLCanvas::~GLCanvas (void) 46 GLCanvas::~GLCanvas (void)
47 { 47 {
48 } 48 }
49 49
50 void GLCanvas::draw (const graphics_handle& xhandle) 50 void GLCanvas::draw (const graphics_handle& gh)
51 { 51 {
52 graphics_object go = gh_manager::get_object (xhandle); 52 graphics_object go = gh_manager::get_object (gh);
53 53
54 if (go) 54 if (go)
55 { 55 {
56 opengl_renderer r; 56 opengl_renderer r;
57 57