Commit 94442bb4 authored by Robert Maynard's avatar Robert Maynard Committed by Kitware Robot
Browse files

Merge topic 'patch-2'

54e85fef Window from X.h is long and there should be no need for cast
f4526dcb

 fix: clang 3.5+ static cast to object from NULL is not allowed
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !1861
parents 4161b2ee 54e85fef
Pipeline #24243 canceled with stage
in 0 seconds
......@@ -398,7 +398,7 @@ XVisualInfo *vtkXOpenGLRenderWindow::GetDesiredVisualInfo()
vtkXOpenGLRenderWindow::vtkXOpenGLRenderWindow()
{
this->ParentId = static_cast<Window>(NULL);
this->ParentId = 0;
this->ScreenSize[0] = 0;
this->ScreenSize[1] = 0;
this->OwnDisplay = 0;
......@@ -406,8 +406,8 @@ vtkXOpenGLRenderWindow::vtkXOpenGLRenderWindow()
this->ForceMakeCurrent = 0;
this->UsingHardware = 0;
this->DisplayId = static_cast<Display *>(NULL);
this->WindowId = static_cast<Window>(NULL);
this->NextWindowId = static_cast<Window>(NULL);
this->WindowId = 0;
this->NextWindowId = 0;
this->ColorMap = static_cast<Colormap>(0);
this->OwnWindow = 0;
......@@ -788,7 +788,7 @@ void vtkXOpenGLRenderWindow::DestroyWindow()
if (this->OwnWindow && this->DisplayId && this->WindowId)
{
XDestroyWindow(this->DisplayId,this->WindowId);
this->WindowId = static_cast<Window>(NULL);
this->WindowId = 0;
}
// if we create the display, we'll delete it
......@@ -1178,7 +1178,7 @@ void vtkXOpenGLRenderWindow::WindowRemap()
// set the default windowid
this->WindowId = this->NextWindowId;
this->NextWindowId = static_cast<Window>(NULL);
this->NextWindowId = 0;
// set everything up again
this->Initialize();
......
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