[wxVTK] wxVTKRenderWindowInteractor.cxx, 1.47, 1.48
Brought to you by:
malat
|
From: Pierre F. <pie...@gm...> - 2009-03-05 14:59:03
|
Message: "Added a wxGLCanvas attribute list to the
wxVTKRenderWindowInteractor constructor to force OpenGL double buffering to
be ON by default.
This trick solves some flickering issues on some graphic hardwares, the
other will (or should) behave normally."
Checking in src/wxVTKRenderWindowInteractor.cxx;
/cvsroot/wxvtk/wxVTK/src/wxVTKRenderWindowInteractor.cxx,v <--
wxVTKRenderWindowInteractor.cxx
new revision: 1.48; previous revision: 1.47
done
Index: src/wxVTKRenderWindowInteractor.cxx
===================================================================
RCS file: /cvsroot/wxvtk/wxVTK/src/wxVTKRenderWindowInteractor.cxx,v
retrieving revision 1.47
diff -u -r1.47 wxVTKRenderWindowInteractor.cxx
--- src/wxVTKRenderWindowInteractor.cxx 3 Mar 2009 16:20:42 -0000 1.47
+++ src/wxVTKRenderWindowInteractor.cxx 5 Mar 2009 14:51:34 -0000
@@ -137,13 +137,19 @@
vtkCxxRevisionMacro(wxVTKRenderWindowInteractor, "$Revision: 1.47 $")
vtkInstantiatorNewMacro(wxVTKRenderWindowInteractor)
-//---------------------------------------------------------------------------
#if defined(__WXGTK__) && defined(USE_WXGLCANVAS)
-#if (wxCHECK_VERSION(2, 8, 0))
-wxVTKRenderWindowInteractor::wxVTKRenderWindowInteractor() : wxGLCanvas(0,
-1, wxDefaultPosition), vtkRenderWindowInteractor()
-#else
-wxVTKRenderWindowInteractor::wxVTKRenderWindowInteractor() : wxGLCanvas(),
vtkRenderWindowInteractor()
+int wxvtk_attributes[]={
+ WX_GL_DOUBLEBUFFER,
+ WX_GL_RGBA,
+ WX_GL_DEPTH_SIZE,
+ 16,
+ 0
+};
#endif
+
+//---------------------------------------------------------------------------
+#if defined(__WXGTK__) && defined(USE_WXGLCANVAS)
+wxVTKRenderWindowInteractor::wxVTKRenderWindowInteractor() : wxGLCanvas(0,
-1, wxDefaultPosition, wxDefaultSize, 0, wxT("wxVTKRenderWindowInteractor"),
wxvtk_attributes), vtkRenderWindowInteractor()
#else
wxVTKRenderWindowInteractor::wxVTKRenderWindowInteractor() : wxWindow(),
vtkRenderWindowInteractor()
#endif //__WXGTK__
@@ -170,7 +176,7 @@
long style,
const wxString
&name)
#if defined(__WXGTK__) && defined(USE_WXGLCANVAS)
- : wxGLCanvas(parent, id, pos, size, style, name),
vtkRenderWindowInteractor()
+ : wxGLCanvas(parent, id, pos, size, style, name, wxvtk_attributes),
vtkRenderWindowInteractor()
#else
: wxWindow(parent, id, pos, size, style, name),
vtkRenderWindowInteractor()
#endif //__WXGTK__
|