Commit 5b1679b6 authored by Sebastien Barre's avatar Sebastien Barre
Browse files

BUG: the subclasses have to call the superclass Render() instead of calling...

BUG: the subclasses have to call the superclass Render() instead of calling the renderwindow method directly, so that the super can make sure all conditions are met to render, *and* events are called properly
parent 65dc1dfd
......@@ -58,7 +58,7 @@ VTK_RENDERING_EXPORT LRESULT CALLBACK vtkHandleMessage2(HWND,UINT,WPARAM,LPARAM,
#ifndef VTK_IMPLEMENT_MESA_CXX
vtkCxxRevisionMacro(vtkWin32RenderWindowInteractor, "1.93");
vtkCxxRevisionMacro(vtkWin32RenderWindowInteractor, "1.94");
vtkStandardNewMacro(vtkWin32RenderWindowInteractor);
#endif
......@@ -627,7 +627,7 @@ LRESULT CALLBACK vtkHandleMessage2(HWND hWnd,UINT uMsg, WPARAM wParam,
switch (uMsg)
{
case WM_PAINT:
me->GetRenderWindow()->Render();
me->Render();
return CallWindowProc(me->OldProc,hWnd,uMsg,wParam,lParam);
break;
......
......@@ -27,7 +27,7 @@
#include "vtkObjectFactory.h"
#include "vtkCommand.h"
vtkCxxRevisionMacro(vtkXRenderWindowInteractor, "1.121");
vtkCxxRevisionMacro(vtkXRenderWindowInteractor, "1.122");
vtkStandardNewMacro(vtkXRenderWindowInteractor);
// Initialize static members:
......@@ -468,7 +468,7 @@ void vtkXRenderWindowInteractorCallback(Widget vtkNotUsed(w),
if (me->Enabled)
{
me->InvokeEvent(vtkCommand::ExposeEvent,NULL);
me->GetRenderWindow()->Render();
me->Render();
}
}
break;
......@@ -478,7 +478,7 @@ void vtkXRenderWindowInteractorCallback(Widget vtkNotUsed(w),
// only render if we are currently accepting events
if (me->Enabled && me->GetRenderWindow()->GetNeverRendered())
{
me->GetRenderWindow()->Render();
me->Render();
}
}
break;
......@@ -504,7 +504,7 @@ void vtkXRenderWindowInteractorCallback(Widget vtkNotUsed(w),
if (me->Enabled)
{
me->InvokeEvent(vtkCommand::ConfigureEvent,NULL);
me->GetRenderWindow()->Render();
me->Render();
}
}
}
......
......@@ -28,7 +28,7 @@
#include <string.h>
#include <vtkTk.h>
vtkCxxRevisionMacro(vtkXRenderWindowTclInteractor, "1.49");
vtkCxxRevisionMacro(vtkXRenderWindowTclInteractor, "1.50");
vtkStandardNewMacro(vtkXRenderWindowTclInteractor);
// steal the first three elements of the TkMainInfo stuct
......@@ -327,7 +327,7 @@ void vtkXRenderWindowTclInteractorCallback(Widget vtkNotUsed(w),
if (me->Enabled)
{
me->InvokeEvent(vtkCommand::ExposeEvent,NULL);
me->GetRenderWindow()->Render();
me->Render();
}
}
break;
......@@ -337,7 +337,7 @@ void vtkXRenderWindowTclInteractorCallback(Widget vtkNotUsed(w),
// only render if we are currently accepting events
if (me->Enabled && me->GetRenderWindow()->GetNeverRendered())
{
me->GetRenderWindow()->Render();
me->Render();
}
}
break;
......@@ -365,7 +365,7 @@ void vtkXRenderWindowTclInteractorCallback(Widget vtkNotUsed(w),
if (me->Enabled)
{
me->InvokeEvent(vtkCommand::ConfigureEvent,NULL);
me->GetRenderWindow()->Render();
me->Render();
}
}
}
......
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