Int�gration du code des commandes externes qui se trouvaient

dans tkZinc.c

1 files changed, 33 insertions, 163 deletions

diff --git a/generic/MapInfo.h b/generic/MapInfo.h
index c8b7fb3..26bb7d7 100644
--- a/generic/MapInfo.h
+++ b/generic/MapInfo.h
@@ -65,171 +65,41 @@ typedef enum {
 typedef struct {
   int	x, y;
 } MapInfoPointStruct, *MapInfoPoint;
+  
+  
+void MapInfoGetLine(MapInfoId map_info, unsigned int index, ZnPtr *tag,
+		    MapInfoLineStyle *line_style, int *line_width,
+		    int *x_from, int *y_from, int *x_to, int *y_to);
+unsigned int MapInfoNumLines(MapInfoId map_info);
+void MapInfoGetMarks(MapInfoId map_info, unsigned int index,
+		     MapInfoPoint *marks, unsigned int *num_marks);
+void MapInfoGetSymbol(MapInfoId map_info, unsigned int index, ZnPtr *tag,
+		      int *x, int *y, char *symbol);
+unsigned int MapInfoNumSymbols(MapInfoId map_info);
+void MapInfoGetText(MapInfoId map_info, unsigned int index, ZnPtr *tag,
+		    MapInfoTextStyle *text_style, MapInfoLineStyle *line_style,
+		    int *x, int *y, char **text);
+unsigned int MapInfoNumTexts(MapInfoId map_info);
+void MapInfoGetArc(MapInfoId map_info, unsigned int index, ZnPtr *tag,
+		   MapInfoLineStyle *line_style, int *line_width,
+		   int *center_x, int *center_y, unsigned int *radius,
+		   int *start_angle, int *extend);
+unsigned int MapInfoNumArcs(MapInfoId map_info);
+
+
+typedef void (*MapInfoChangeProc)(ClientData client_data, MapInfoId map_info);
+
+MapInfoId ZnGetMapInfo(Tcl_Interp *interp, char *name, MapInfoChangeProc proc,
+		       ClientData client_data);
+void ZnFreeMapInfo(MapInfoId map_info, MapInfoChangeProc proc,
+		   ClientData client_data);
+
+int MapInfoObjCmd(ClientData client_data, Tcl_Interp *interp,
+		  int argc, Tcl_Obj *CONST args[]);
+int VideomapObjCmd(ClientData client_data, Tcl_Interp *interp,
+		   int argc, Tcl_Obj *CONST args[]);
 
 
-MapInfoId
-MapInfoCreate(char *name);
-char *
-MapInfoName(MapInfoId	/* map_info */);
-MapInfoId
-MapInfoDuplicate(MapInfoId	/* map_info */);
-void
-MapInfoEmpty(MapInfoId	/* map_info */);
-void
-MapInfoDelete(MapInfoId	/* map_info */);
-void
-MapInfoAddLine(MapInfoId	/* map_info */,
-	       unsigned int	/* index */,
-	       ZnPtr		/* tag */,
-	       MapInfoLineStyle	/* line_style */,
-	       int		/* line_width */,
-	       int		/* x_from */,
-	       int		/* y_from */,
-	       int		/* x_to */,
-	       int		/* y_to */);
-void
-MapInfoReplaceLine(MapInfoId		/* map_info */,
-		   unsigned int		/* index */,
-		   ZnPtr		/* tag */,
-		   MapInfoLineStyle	/* line_style */,
-		   int			/* line_width */,
-		   int			/* x_from */,
-		   int			/* y_from */,
-		   int			/* x_to */,
-		   int			/* y_to */);
-void
-MapInfoRemoveLine(MapInfoId	/* map_info */,
-		  unsigned int	/* index */);
-void
-MapInfoGetLine(MapInfoId	/* map_info */,
-	       unsigned int	/* index */,
-	       ZnPtr		*/* tag */,
-	       MapInfoLineStyle	*/* line_style */,
-	       int		*/* line_width */,
-	       int		*/* x_from */,
-	       int		*/* y_from */,
-	       int		*/* x_to */,
-	       int		*/* y_to */);
-void
-MapInfoGetMarks(MapInfoId	/* map_info */,
-		unsigned int	/* index */,
-		MapInfoPoint	*/* marks */,
-		unsigned int	*/* num_marks */);
-unsigned int
-MapInfoNumLines(MapInfoId /* map_info */);
-void
-MapInfoAddSymbol(MapInfoId	/* map_info */,
-		 unsigned int	/* index */,
-		 ZnPtr		/* tag */,
-		 int		/* x */,
-		 int		/* y */,
-		 char		/* symbol */);
-void
-MapInfoReplaceSymbol(MapInfoId		/* map_info */,
-		     unsigned int	/* index */,
-		     ZnPtr		/* tag */,
-		     int		/* x */,
-		     int		/* y */,
-		     char		/* symbol */);
-void
-MapInfoRemoveSymbol(MapInfoId		/* map_info */,
-		    unsigned int	/* index */);
-void
-MapInfoGetSymbol(MapInfoId	/* map_info */,
-		 unsigned int	/* index */,
-		 ZnPtr		*/* tag */,
-		 int		*/* x */,
-		 int		*/* y */,
-		 char		*/* symbol */);
-unsigned int
-MapInfoNumSymbols(MapInfoId /* map_info */);
-void
-MapInfoAddText(MapInfoId	/* map_info */,
-	       unsigned int	/* index */,
-	       ZnPtr		/* tag */,
-	       MapInfoTextStyle	/* text_style */,
-	       MapInfoLineStyle	/* line_style */,
-	       int		/* x */,
-	       int		/* y */,
-	       char		*/* text */);
-void
-MapInfoReplaceText(MapInfoId		/* map_info */,
-		   unsigned int		/* index */,
-		   ZnPtr		/* tag */,
-		   MapInfoTextStyle	/* text_style */,
-		   MapInfoLineStyle	/* line_style */,
-		   int			/* x */,
-		   int			/* y */,
-		   char			*/* text */);
-void
-MapInfoRemoveText(MapInfoId	/* map_info */,
-		  unsigned int	/* index */);
-void
-MapInfoGetText(MapInfoId	/* map_info */,
-	       unsigned int	/* index */,
-	       ZnPtr		*/* tag */,
-	       MapInfoTextStyle	*/* text_style */,
-	       MapInfoLineStyle	*/* line_style */,
-	       int		*/* x */,
-	       int		*/* y */,
-	       char		**/* text */);
-unsigned int
-MapInfoNumTexts(MapInfoId /* map_info */);
-void
-MapInfoAddArc(MapInfoId	/* map_info */,
-	      unsigned int	/* index */,
-	      ZnPtr		/* tag */,
-	      MapInfoLineStyle	/* line_style */,
-	      int		/* line_width */,
-	      int		/* center_x */,
-	      int		/* center_y */,
-	      unsigned int	/* radius */,
-	      int		/* start_angle */,
-	      int		/* extend */);
-void
-MapInfoReplaceArc(MapInfoId		/* map_info */,
-		  unsigned int		/* index */,
-		  ZnPtr			/* tag */,
-		  MapInfoLineStyle	/* line_style */,
-		  int			/* line_width */,
-		  int			/* center_x */,
-		  int			/* center_y */,
-		  unsigned int		/* radius */,
-		  int			/* start_angle */,
-		  int			/* extend */);
-void
-MapInfoRemoveArc(MapInfoId	/* map_info */,
-		 unsigned int	/* index */);
-void
-MapInfoGetArc(MapInfoId		/* map_info */,
-	      unsigned int	/* index */,
-	      ZnPtr		*/* tag */,
-	      MapInfoLineStyle	*/* line_style */,
-	      int		*/* line_width */,
-	      int		*/* center_x */,
-	      int		*/* center_y */,
-	      unsigned int	*/* radius */,
-	      int		*/* start_angle */,
-	      int		*/* extend */);
-unsigned int
-MapInfoNumArcs(MapInfoId	/* map_info */);
-
-void
-MapInfoScale(MapInfoId	/* map_info */,
-	     double	/* factor */);
-void
-MapInfoTranslate(MapInfoId	/* map_info */,
-		 int		x,
-		 int		y);
-
-int
-MapInfoGetVideomap(MapInfoId	/* map_info */,
-		   char		*/* filename */,
-		   int		/* map_index */);
-
-ZnList
-MapInfoVideomapIds(char	*/* filename */);
-
 #ifdef __CPLUSPLUS__
 }
 #endif