[Octaviz-cvsupdate] octaviz/Common OctavizCommon.h, 1.3, 1.4 octaviz.h, 1.4, 1.5 vtkInitializeInteractor.cc, 1.5, 1.6

[Jonathan S. <jjs...@us...>]

Update of /cvsroot/octaviz/octaviz/Common
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv22427/Common

Modified Files:
	OctavizCommon.h octaviz.h vtkInitializeInteractor.cc 
Log Message:
attempt to get octaviz working with vtk-5.2, courtesy of Andreas Potschka

Index: OctavizCommon.h
===================================================================
RCS file: /cvsroot/octaviz/octaviz/Common/OctavizCommon.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- OctavizCommon.h	1 Mar 2005 02:55:53 -0000	1.3
+++ OctavizCommon.h	3 Feb 2010 16:10:36 -0000	1.4
@@ -3,12 +3,19 @@
 #include <string>
 #include <map>
 #include "octaviz.h"
+#include "tcl.h"
 #ifdef None
 	#undef None
 #endif	
 #ifdef CurrentTime
 	#undef CurrentTime
 #endif	
+#ifdef CursorShape
+	#undef CursorShape
+#endif
+#ifdef AnyModifier
+	#undef AnyModifier
+#endif
 
-
+Tcl_Interp *interp = 0; // Where can I get a Tcl_Interp?
 

Index: vtkInitializeInteractor.cc
===================================================================
RCS file: /cvsroot/octaviz/octaviz/Common/vtkInitializeInteractor.cc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- vtkInitializeInteractor.cc	12 Jan 2007 08:12:41 -0000	1.5
+++ vtkInitializeInteractor.cc	3 Feb 2010 16:10:37 -0000	1.6
@@ -17,18 +17,18 @@
 ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 */
-#include <vtkXRenderWindowInteractor.h>
-#include <vtkXOpenGLRenderWindow.h>
-#include <vtkCommand.h>
-#include <vtkCallbackCommand.h>
+#include "vtkXRenderWindowInteractor.h"
+#include "vtkXOpenGLRenderWindow.h"
+#include "vtkCommand.h"
+#include "vtkCallbackCommand.h"
 #undef Complex
-#include <octave/oct.h>
+#include "octave/oct.h"
 
 vtkCallbackCommand* InteractorExitCallbackCommand = NULL;
 
 // The following must be defined for recent versions of Octave.
 #define TYPEID_HAS_CLASS
-#include <octave/oct.h>
+#include "octave/oct.h"
 #include "octaviz.h"
 
 

Index: octaviz.h
===================================================================
RCS file: /cvsroot/octaviz/octaviz/Common/octaviz.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- octaviz.h	11 Mar 2005 00:59:54 -0000	1.4
+++ octaviz.h	3 Feb 2010 16:10:37 -0000	1.5
@@ -49,6 +49,8 @@
 #include <X11/Xlib.h>
 #include <X11/Intrinsic.h>
 				
+#include "vtkCommand.h"
+
 extern XtAppContext vtk_app_context;
 extern std::map<Atom, unsigned int> vtk_delete_window_atoms;
 
@@ -116,8 +118,6 @@
   DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA
 };
 
-#include "vtkCommand.h"
-
 // Allow Octave to use the vtkCommand features
 
 class vtkOctaveCommand : public vtkCommand