[Sumover-dev] [svn commit] r3981 - vic/branches/mpeg4

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

Author: piers
Date: Fri Mar 30 11:34:24 2007
New Revision: 3981

Modified:
   vic/branches/mpeg4/tkStripchart.c

Log:
Changes for tk-8.4
- Replaced XDrawSegments() with XDrawLine() call.
- Tweaked the Barz's #ifdef for use of the internal TkClearArea function - now it will be used #ifndef XClearArea
(which basically is on Mac and Win)

Modified: vic/branches/mpeg4/tkStripchart.c
==============================================================================
--- vic/branches/mpeg4/tkStripchart.c	(original)
+++ vic/branches/mpeg4/tkStripchart.c	Fri Mar 30 11:34:24 2007
@@ -1141,9 +1141,12 @@
 					PADDING + hasatitle(SPtr) *
 					(lineHeight + PADDING) + i *
 					SPtr->max_height / (SPtr->num_ticks-1);
+			XDrawLine(Tk_Display(tkwin), Tk_WindowId(tkwin),
+			      SPtr->tickGC, ticks[i].x1, ticks[i].y1, ticks[i].x2, ticks[i].y2);
+
 		}
-		XDrawSegments(Tk_Display(tkwin), Tk_WindowId(tkwin),
-			      SPtr->tickGC, ticks, SPtr->num_ticks);
+		//XDrawSegments(Tk_Display(tkwin), Tk_WindowId(tkwin),
+		//	      SPtr->tickGC, ticks, SPtr->num_ticks);
 	}
 
 	/* Draw the bar */
@@ -1190,8 +1193,7 @@
 	          Tk_GetGC(tkwin, 0, NULL), src_x, src_y, w, h, dest_x, dest_y);
 }
 
-#ifdef MAC_OSX_TK
-
+#ifndef XClearArea
 // XXX
 #define HAVE_LIMITS_H
 
@@ -1212,15 +1214,10 @@
         Tk_FreeGC(Tk_Display(tkwin), gc);
 }
 #else
-#ifdef WIN32
-void XClearArea(display, w, x ,y, width, height, exposures);
-#endif
-
 void
 TkClearArea(Tk_Window tkwin, int x, int y, int width, int height)
 {
         XClearArea(Tk_Display(tkwin), Tk_WindowId(tkwin),
                    x, y, width, height, False);
 }
-#endif 
-
+#endif