Commit 1348f769 authored by Clinton Stimpson's avatar Clinton Stimpson

Fix some header test and build error on some machines.

parent 3401d9c8
......@@ -23,7 +23,6 @@ vtkStandardNewMacro(vtkGenericOpenGLRenderWindow);
vtkGenericOpenGLRenderWindow::vtkGenericOpenGLRenderWindow()
{
this->WindowId = NULL;
}
vtkGenericOpenGLRenderWindow::~vtkGenericOpenGLRenderWindow()
......@@ -40,6 +39,11 @@ vtkGenericOpenGLRenderWindow::~vtkGenericOpenGLRenderWindow()
}
}
void vtkGenericOpenGLRenderWindow::PrintSelf(ostream& os, vtkIndent indent)
{
this->Superclass::PrintSelf(os, indent);
}
void vtkGenericOpenGLRenderWindow::SetFrontBuffer(unsigned int b)
{
this->FrontBuffer = b;
......@@ -135,15 +139,13 @@ bool vtkGenericOpenGLRenderWindow::IsCurrent()
}
void vtkGenericOpenGLRenderWindow::SetWindowId(void* w)
void vtkGenericOpenGLRenderWindow::SetWindowId(void*)
{
// user settable window id
this->WindowId = w;
}
void* vtkGenericOpenGLRenderWindow::GetGenericWindowId()
{
return this->WindowId;
return NULL;
}
......
......@@ -26,11 +26,12 @@
#include "vtkOpenGLRenderWindow.h"
class vtkGenericOpenGLRenderWindow : public vtkOpenGLRenderWindow
class VTK_RENDERING_EXPORT vtkGenericOpenGLRenderWindow : public vtkOpenGLRenderWindow
{
public:
static vtkGenericOpenGLRenderWindow* New();
vtkTypeMacro(vtkGenericOpenGLRenderWindow, vtkOpenGLRenderWindow);
void PrintSelf(ostream& os, vtkIndent indent);
protected:
vtkGenericOpenGLRenderWindow();
~vtkGenericOpenGLRenderWindow();
......@@ -56,12 +57,6 @@ public:
//! passed through the call data parameter.
bool IsCurrent();
//! Set the window id. This does nothing but store the value.
void SetWindowId(void*);
//! Get the window id
void* GetGenericWindowId();
// {@
//! set the drawing buffers to use
void SetFrontBuffer(unsigned int);
......@@ -74,6 +69,8 @@ public:
// {@
//! does nothing
void SetWindowId(void*);
void* GetGenericWindowId();
void SetDisplayId(void*);
void SetParentId(void*);
void* GetGenericDisplayId();
......@@ -95,10 +92,11 @@ public:
void DestroyWindow();
// }@
protected:
void* WindowId;
private:
vtkGenericOpenGLRenderWindow(const vtkGenericOpenGLRenderWindow&); // Not implemented.
void operator=(const vtkGenericOpenGLRenderWindow&); // Not implemented.
};
#endif
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