[Sumover-dev] [svn commit] r4015 - vic/branches/mpeg4/render

[sumover-dev at cs.ucl.ac.uk]

Author: piers
Date: Wed May  9 18:41:10 2007
New Revision: 4015

Modified:
   vic/branches/mpeg4/render/vw.cpp

Log:
Updated for compilation with TCLTK80

Modified: vic/branches/mpeg4/render/vw.cpp
==============================================================================
--- vic/branches/mpeg4/render/vw.cpp	(original)
+++ vic/branches/mpeg4/render/vw.cpp	Wed May  9 18:41:10 2007
@@ -38,6 +38,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+
 #ifdef MAC_OSX_TK
 /* stuff needed to include declaration of TkPutImage */
 #include <math.h>
@@ -98,7 +99,13 @@
 
 #include <windows.h>
 #include <ddraw.h>
+
+#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION == 0)
 #include <tkWin.h>
+#else
+#include <tkPlatDecls.h>
+#endif
+
 #include <dvp.h>
 
 char *ddrawErrorString(HRESULT rc);
@@ -275,7 +282,8 @@
 			      int sx, int sy, int x, int y,
 			      int w, int h) const
 {
-#if defined(MAC_OSX_TK) || defined(WIN32)
+
+#if defined(MAC_OSX_TK) || ( defined(WIN32) && (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION != 0))
         TkPutImage(NULL, 0, dpy, window, gc, image_, sx, sy, x, y, w, h);
 #else
 	XPutImage(dpy, window, gc, image_, sx, sy, x, y, w, h);