Commit 78c8e893 authored by Andy Cedilnik's avatar Andy Cedilnik
Browse files

ERR: Improve support for cygwin X11 and replace new method with new macro

parent 131e85e7
......@@ -14,10 +14,10 @@ CONFIGURE_FILE(
)
SET( Xdmf_SRCS
vtkXdmfReader
vtkXdmfDataSetWriter
vtkXdmfDataArray
vtkXdmfRenderWindowInteractor
vtkXdmfReader.cxx
vtkXdmfDataSetWriter.cxx
vtkXdmfDataArray.cxx
${Xdmf_BINARY_DIR}/vtkXdmfRenderWindowInteractor.cxx
)
SET_SOURCE_FILES_PROPERTIES(
......
......@@ -29,22 +29,13 @@
#include <vtkCommand.h>
//----------------------------------------------------------------------------
vtkXdmfRenderWindowInteractor* vtkXdmfRenderWindowInteractor::New()
{
// First try to create the object from the vtkObjectFactory
vtkObject* ret = vtkObjectFactory::CreateInstance("vtkXdmfRenderWindowInteractor");
if(ret)
{
return (vtkXdmfRenderWindowInteractor*)ret;
}
// If the factory was unable to create the object, then create it here.
return new vtkXdmfRenderWindowInteractor;
}
vtkStandardNewMacro(vtkXdmfRenderWindowInteractor);
void vtkXdmfRenderWindowInteractor::Start( int Block ) {
if ( Block ) {
#if defined(CYGWIN) | defined(WIN32)
// Check for WIN32 but without Cygwin with X11
#if defined(_WIN32) && !defined(VTK_USE_OGLR)
vtkWin32RenderWindowInteractor::Start();
#else
vtkXRenderWindowInteractor::Start();
......@@ -57,7 +48,8 @@ if ( Block ) {
void vtkXdmfRenderWindowInteractor::LoopOnce( )
{
#if defined(CYGWIN) | defined(WIN32)
// Check for WIN32 but without Cygwin with X11
#if defined(_WIN32) && !defined(VTK_USE_OGLR)
// Nothing to do
#else
XEvent event;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment