Passage en Tcl_Objs et compilation conditionnelle de GPC

1 files changed, 8 insertions, 7 deletions

diff --git a/generic/Track.c b/generic/Track.c
index 45a13ef..586b5b9 100644
--- a/generic/Track.c
+++ b/generic/Track.c
@@ -33,6 +33,7 @@
 #include "Item.h"
 #include "Types.h"
 #include "WidgetInfo.h"
+#include "tkZinc.h"
 
 
 static const char rcsid[] = "$Id$";
@@ -307,9 +308,9 @@ static ZnAttrConfig	wp_attrs[] = {
  **********************************************************************************
  */
 static int
-Init(Item	item,
-     int	*argc,
-     Arg	**args)
+Init(Item		item,
+     int		*argc,
+     Tcl_Obj *CONST	*args[])
 {
   TrackItem	track = (TrackItem) item;
   FieldSet	field_set = &track->field_set;
@@ -368,8 +369,8 @@ Init(Item	item,
   /*
    * Then try to see if some fields are needed.
    */
-  if ((*argc > 0) && (LangString((*args)[0])[0] != '-') &&
-      (Tcl_GetInt(wi->interp, (args[0])[0], &field_set->num_fields) != ZN_ERROR)) {
+  if ((*argc > 0) && (Tcl_GetString((*args)[0])[0] != '-') &&
+      (Tcl_GetIntFromObj(wi->interp, (*args)[0], &field_set->num_fields) != ZN_ERROR)) {
     *args += 1;
     *argc -= 1;
     ITEM_P.InitFields(field_set);
@@ -533,7 +534,7 @@ AddToHistory(TrackItem	track,
 static int
 Configure(Item		item,
 	  int		argc,
-	  ZnAttrList	argv,
+	  Tcl_Obj *CONST argv[],
 	  int		*flags)
 {
   TrackItem	track = (TrackItem) item;
@@ -609,7 +610,7 @@ Configure(Item		item,
 static int
 Query(Item		item,
       int		argc,
-      ZnAttrList	argv)
+      Tcl_Obj *CONST	argv[])
 {
   if (ITEM_P.QueryAttribute((char *) item, -1, argv[0]) == ZN_ERROR) {
     return ZN_ERROR;