BUG: Percolate VTK_USE_DISPLAY through vtkToolkits.h and then use it to avoid...

BUG: Percolate VTK_USE_DISPLAY through vtkToolkits.h and then use it to avoid creating the vtkWin32OutputWindow when VTK_USE_DISPLAY is OFF.

Common/vtkOutputWindow.cxx

@@ -14,13 +14,13 @@
 =========================================================================*/
 #include "vtkOutputWindow.h"
 #include "vtkToolkits.h"
-#if defined( _WIN32 ) && !defined( VTK_USE_X )
+#if defined( _WIN32 ) && !defined( VTK_USE_X ) && defined( VTK_USE_DISPLAY )
 #include "vtkWin32OutputWindow.h"
 #endif
 #include "vtkObjectFactory.h"
 #include "vtkDebugLeaks.h"
 
-vtkCxxRevisionMacro(vtkOutputWindow, "1.37");
+vtkCxxRevisionMacro(vtkOutputWindow, "1.38");
 
 //----------------------------------------------------------------------------
 // Needed when we don't use the vtkStandardNewMacro.
@@ -150,7 +150,7 @@ vtkOutputWindow* vtkOutputWindow::GetInstance()
       // if the factory failed to create the object,
       // then destroy it now, as vtkDebugLeaks::ConstructClass was called
       // with "vtkOutputWindow", and not the real name of the class
-#if defined( _WIN32 ) && !defined( VTK_USE_X )
+#if defined( _WIN32 ) && !defined( VTK_USE_X ) && defined( VTK_USE_DISPLAY )
 #ifdef VTK_DEBUG_LEAKS
       vtkDebugLeaks::DestructClass("vtkOutputWindow");
 #endif

vtkToolkits.h.in

@@ -51,6 +51,9 @@
 /* Whether we are building MPI support.  */
 #cmakedefine VTK_USE_MPI
 
+/* Should VTK use the display?  */
+#cmakedefine VTK_USE_DISPLAY
+
 /* is VTK_DATA_ROOT defined? */
 #cmakedefine VTK_DATA_ROOT
 #ifdef VTK_DATA_ROOT