Update from the Windows port and general cleanup/restructure

1 files changed, 42 insertions, 42 deletions

diff --git a/generic/MapInfo.h b/generic/MapInfo.h
index 26bb7d7..dd1b0cd 100644
--- a/generic/MapInfo.h
+++ b/generic/MapInfo.h
@@ -1,5 +1,5 @@
 /*
- * MapInfo.c -- Public include file for MapInfo interface.
+ * MapInfo.h -- Public include file for MapInfo interface.
  *
  * Authors		: Patrick Lecoanet.
  * Creation date	: 
@@ -47,58 +47,58 @@ extern "C" {
  *-----------------------------------------------------------------------
  */
 
-typedef void		*MapInfoId;
+typedef void	*ZnMapInfoId;
 
 typedef enum {
-  MapInfoLineSimple,
-  MapInfoLineDashed,
-  MapInfoLineDotted,
-  MapInfoLineMixed,
-  MapInfoLineMarked
-} MapInfoLineStyle;
+  ZnMapInfoLineSimple,
+  ZnMapInfoLineDashed,
+  ZnMapInfoLineDotted,
+  ZnMapInfoLineMixed,
+  ZnMapInfoLineMarked
+} ZnMapInfoLineStyle;
 
 typedef enum {
-  MapInfoNormalText,
-  MapInfoUnderlinedText
-} MapInfoTextStyle;
+  ZnMapInfoNormalText,
+  ZnMapInfoUnderlinedText
+} ZnMapInfoTextStyle;
 
 typedef struct {
   int	x, y;
-} MapInfoPointStruct, *MapInfoPoint;
+} ZnMapInfoPointStruct, *ZnMapInfoPoint;
   
   
-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,
+void ZnMapInfoGetLine(ZnMapInfoId map_info, unsigned int index, ZnPtr *tag,
+		      ZnMapInfoLineStyle *line_style, int *line_width,
+		      int *x_from, int *y_from, int *x_to, int *y_to);
+unsigned int ZnMapInfoNumLines(ZnMapInfoId map_info);
+void ZnMapInfoGetMarks(ZnMapInfoId map_info, unsigned int index,
+		       ZnMapInfoPoint *marks, unsigned int *num_marks);
+void ZnMapInfoGetSymbol(ZnMapInfoId map_info, unsigned int index, ZnPtr *tag,
+			int *x, int *y, char *symbol);
+unsigned int ZnMapInfoNumSymbols(ZnMapInfoId map_info);
+void ZnMapInfoGetText(ZnMapInfoId map_info, unsigned int index, ZnPtr *tag,
+		      ZnMapInfoTextStyle *text_style, ZnMapInfoLineStyle *line_style,
+		      int *x, int *y, char **text);
+unsigned int ZnMapInfoNumTexts(ZnMapInfoId map_info);
+void ZnMapInfoGetArc(ZnMapInfoId map_info, unsigned int index, ZnPtr *tag,
+		     ZnMapInfoLineStyle *line_style, int *line_width,
+		     int *center_x, int *center_y, int *radius,
+		     int *start_angle, int *extend);
+unsigned int ZnMapInfoNumArcs(ZnMapInfoId map_info);
+
+
+typedef void (*ZnMapInfoChangeProc)(ClientData client_data, ZnMapInfoId map_info);
+
+ZnMapInfoId ZnGetMapInfo(Tcl_Interp *interp, char *name, ZnMapInfoChangeProc proc,
+			 ClientData client_data);
+void ZnFreeMapInfo(ZnMapInfoId map_info, ZnMapInfoChangeProc 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[]);
-
+int ZnMapInfoObjCmd(ClientData client_data, Tcl_Interp *interp,
+		    int argc, Tcl_Obj *CONST args[]);
+int ZnVideomapObjCmd(ClientData client_data, Tcl_Interp *interp,
+		     int argc, Tcl_Obj *CONST args[]);
+  
 
 #ifdef __CPLUSPLUS__
 }