Some minor cleanups for release

Kitware · Aug 4, 2015 · 724a7a7 · 724a7a7
1 parent 4eac6a2
commit 724a7a7
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 35 deletions.
diff --git a/CMake/vtkBackends.cmake b/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

diff --git a/Rendering/Core/vtkRenderWindow.h b/Rendering/Core/vtkRenderWindow.h
@@ -539,7 +539,7 @@ class VTKRENDERINGCORE_EXPORT vtkRenderWindow : public vtkWindow
   // Description:
   // Get the vtkPainterDeviceAdapter which can be used to paint on
   // this render window.
-  vtkGetObjectMacro(PainterDeviceAdapter, vtkPainterDeviceAdapter);
+  VTK_LEGACY(vtkGetObjectMacro(PainterDeviceAdapter, vtkPainterDeviceAdapter));
 
   // Description:
   // Set / Get the number of multisamples to use for hardware antialiasing.

diff --git a/Rendering/Core/vtkRenderer.h b/Rendering/Core/vtkRenderer.h
@@ -44,7 +44,6 @@ class vtkCamera;
 class vtkLightCollection;
 class vtkCullerCollection;
 class vtkLight;
-class vtkPainter;
 class vtkHardwareSelector;
 class vtkRendererDelegate;
 class vtkTexture;

diff --git a/Rendering/OpenGL2/vtkOpenGLRenderWindow.cxx b/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();

diff --git a/Rendering/OpenGL2/vtkOpenGLRenderWindow.h b/Rendering/OpenGL2/vtkOpenGLRenderWindow.h
@@ -182,13 +182,6 @@ class VTKRENDERINGOPENGL2_EXPORT vtkOpenGLRenderWindow : public vtkRenderWindow
   // 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();