Merge topic 'rel_cleanup'

b28d7045 Keep old method as the old backend requires it
724a7a71 Some minor cleanups for release
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Reviewed-by: David E DeMarle <dave.demarle@kitware.com>
Merge-request: !480

CMake/vtkBackends.cmake

@@ -18,7 +18,7 @@ if (${_index} EQUAL -1)
   # has the application defined a desired default for the backend?
   # if not, use VTKs default of OpenGL
   if(NOT DEFINED VTK_RENDERING_BACKEND_DEFAULT)
-    set(VTK_RENDERING_BACKEND_DEFAULT "OpenGL")
+    set(VTK_RENDERING_BACKEND_DEFAULT "OpenGL2")
   endif()
 
   # if it is in the cache as a bad value we need to reset it

Rendering/Core/vtkRenderWindow.h

@@ -538,7 +538,8 @@ public:
 
   // Description:
   // Get the vtkPainterDeviceAdapter which can be used to paint on
-  // this render window.
+  // this render window.  Note the old OpenGL backend requires this
+  // method.
   vtkGetObjectMacro(PainterDeviceAdapter, vtkPainterDeviceAdapter);
 
   // Description:

Rendering/Core/vtkRenderer.h

@@ -44,7 +44,6 @@ class vtkCamera;
 class vtkLightCollection;
 class vtkCullerCollection;
 class vtkLight;
-class vtkPainter;
 class vtkHardwareSelector;
 class vtkRendererDelegate;
 class vtkTexture;

Rendering/OpenGL2/vtkOpenGLRenderWindow.cxx

@@ -313,31 +313,6 @@ void vtkOpenGLRenderWindow::StereoUpdate(void)
     }
 }
 
-#ifndef VTK_LEGACY_REMOVE
-//----------------------------------------------------------------------------
-void vtkOpenGLRenderWindow::CheckGraphicError()
-{
-  VTK_LEGACY_BODY(vtkRenderWindow::CheckGraphicError, "VTK 6.1");
-  this->LastGraphicError=static_cast<unsigned int>(glGetError());
-}
-
-//----------------------------------------------------------------------------
-int vtkOpenGLRenderWindow::HasGraphicError()
-{
-  VTK_LEGACY_BODY(vtkRenderWindow::HasGraphics, "VTK 6.1");
-  return static_cast<GLenum>(this->LastGraphicError)!=GL_NO_ERROR;
-}
-
-//----------------------------------------------------------------------------
-const char *vtkOpenGLRenderWindow::GetLastGraphicErrorString()
-{
-  VTK_LEGACY_BODY(vtkRenderWindow::GetLastGraphicErrorString, "VTK 6.1");
-  const char *result="Unknown error";
-  return result;
-}
-#endif
-
-
 void vtkOpenGLRenderWindow::OpenGLInit()
 {
   OpenGLInitContext();

Rendering/OpenGL2/vtkOpenGLRenderWindow.h

@@ -182,13 +182,6 @@ public:
   // It is used by vtkOpenGLCamera.
   unsigned int GetFrontBuffer();
 
-  // Description:
-  // @deprecated Replaced by
-  // vtkOpenGLCheckErrorMacro
-  VTK_LEGACY(virtual void CheckGraphicError());
-  VTK_LEGACY(virtual int HasGraphicError());
-  VTK_LEGACY(virtual const char *GetLastGraphicErrorString());
-
   // Description:
   // Get the time when the OpenGL context was created.
   virtual unsigned long GetContextCreationTime();