[wxVTK] wxVTK/src wxVTKRenderWindowInteractor.cxx, 1.45, 1.46 wxVTKRenderWindowInteractor.h, 1.22, 1.23

[Sander N. <svn...@us...>]

Update of /cvsroot/wxvtk/wxVTK/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv27143

Modified Files:
	wxVTKRenderWindowInteractor.cxx wxVTKRenderWindowInteractor.h 
Log Message:
COMP: Recent changes to timers worked for VTK 5.2 but broke compilation for VTK 5.0. This is now fixed.


Index: wxVTKRenderWindowInteractor.h
===================================================================
RCS file: /cvsroot/wxvtk/wxVTK/src/wxVTKRenderWindowInteractor.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** wxVTKRenderWindowInteractor.h	3 Dec 2008 10:31:46 -0000	1.22
--- wxVTKRenderWindowInteractor.h	8 Dec 2008 11:52:10 -0000	1.23
***************
*** 152,159 ****
      vtkBooleanMacro(UseCaptureMouse,int);
  
    protected:
      virtual int InternalCreateTimer(int timerId, int timerType, unsigned long duration);
      virtual int InternalDestroyTimer(int platformTimerId);
!     
    protected:
      wxTimer timer;
--- 152,161 ----
      vtkBooleanMacro(UseCaptureMouse,int);
  
+ #if VTK_MAJOR_VERSION > 5 || (VTK_MAJOR_VERSION == 5 && VTK_MINOR_VERSION >= 2)
    protected:
      virtual int InternalCreateTimer(int timerId, int timerType, unsigned long duration);
      virtual int InternalDestroyTimer(int platformTimerId);
! #endif
! 
    protected:
      wxTimer timer;

Index: wxVTKRenderWindowInteractor.cxx
===================================================================
RCS file: /cvsroot/wxvtk/wxVTK/src/wxVTKRenderWindowInteractor.cxx,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** wxVTKRenderWindowInteractor.cxx	3 Dec 2008 10:31:46 -0000	1.45
--- wxVTKRenderWindowInteractor.cxx	8 Dec 2008 11:52:10 -0000	1.46
***************
*** 291,294 ****
--- 291,295 ----
    
  }
+ #if VTK_MAJOR_VERSION > 5 || (VTK_MAJOR_VERSION == 5 && VTK_MINOR_VERSION >= 2)
  //------------------------------------------------------------------
  int wxVTKRenderWindowInteractor::InternalCreateTimer(int timerId, int timerType,
***************
*** 306,309 ****
--- 307,311 ----
    return 1;
  }
+ #endif
  //---------------------------------------------------------------------------
  int wxVTKRenderWindowInteractor::DestroyTimer()
***************
*** 320,326 ****
--- 322,333 ----
  #if VTK_MAJOR_VERSION > 4 || (VTK_MAJOR_VERSION == 4 && VTK_MINOR_VERSION > 0)
    // new style
+ #if VTK_MAJOR_VERSION > 5 || (VTK_MAJOR_VERSION == 5 && VTK_MINOR_VERSION >= 2)
+   // pass the right timer id
    int timerId = this->GetCurrentTimerId();
    this->InvokeEvent(vtkCommand::TimerEvent, &timerId);
  #else
+   this->InvokeEvent(vtkCommand::TimerEvent, NULL);
+ #endif
+ #else
    // old style
    InteractorStyle->OnTimer();