Commit d7c4cedf authored by Will Schroeder's avatar Will Schroeder
Browse files

fixed some goobers in the display handling

parent e7c409f5
......@@ -83,7 +83,6 @@ void vtkXRenderWindowInteractor::Initialize(XtAppContext app)
// Begin processing keyboard strokes.
void vtkXRenderWindowInteractor::Initialize()
{
Display *display;
static int any_initialized = 0;
static XtAppContext app;
vtkXRenderWindow *ren;
......@@ -154,7 +153,7 @@ void vtkXRenderWindowInteractor::Initialize()
XtRealizeWidget(this->top);
/* add callback */
XSync(display,False);
XSync(this->DisplayId,False);
ren->SetWindowId(XtWindow(this->top));
this->WindowId = XtWindow(this->top);
ren->Render();
......@@ -495,7 +494,6 @@ void vtkXRenderWindowInteractorTimer(XtPointer client_data,XtIntervalId *id)
// Setup a new window before a WindowRemap
void vtkXRenderWindowInteractor::SetupNewWindow(int Stereo)
{
Display *display;
vtkXRenderWindow *ren;
int depth;
Colormap cmap;
......@@ -506,7 +504,7 @@ void vtkXRenderWindowInteractor::SetupNewWindow(int Stereo)
// get the info we need from the RenderingWindow
ren = (vtkXRenderWindow *)(this->RenderWindow);
display = ren->GetDisplayId();
this->DisplayId = ren->GetDisplayId();
depth = ren->GetDesiredDepth();
cmap = ren->GetDesiredColormap();
vis = ren->GetDesiredVisual();
......@@ -532,7 +530,7 @@ void vtkXRenderWindowInteractor::SetupNewWindow(int Stereo)
this->top = XtVaAppCreateShell(this->RenderWindow->GetName(),"vtk",
applicationShellWidgetClass,
display,
this->DisplayId,
XtNdepth, depth,
XtNcolormap, cmap,
XtNvisual, vis,
......@@ -546,7 +544,7 @@ void vtkXRenderWindowInteractor::SetupNewWindow(int Stereo)
XtRealizeWidget(this->top);
/* add callback */
XSync(display,False);
XSync(this->DisplayId,False);
ren->SetNextWindowId(XtWindow(this->top));
this->WindowId = XtWindow(this->top);
}
......
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