From 14af846df5c01a8d5e6edc35e2ba6fa2e3011b56 Mon Sep 17 00:00:00 2001
From: lecoanet
Date: Mon, 5 Jun 2000 12:03:13 +0000
Subject: Passage en Tcl_Objs et compilation conditionnelle de GPC

---
 generic/Tabular.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'generic/Tabular.c')

diff --git a/generic/Tabular.c b/generic/Tabular.c
index 2c91706..00bd019 100644
--- a/generic/Tabular.c
+++ b/generic/Tabular.c
@@ -31,6 +31,7 @@
 #include "WidgetInfo.h"
 #include "Item.h"
 #include "Geo.h"
+#include "tkZinc.h"
 
 
 static const char rcsid[] = "$Id$";
@@ -102,9 +103,9 @@ static ZnAttrConfig	tabular_attrs[] = {
  **********************************************************************************
  */
 static int
-Init(Item	item,
-     int	*argc,
-     Arg	**args)
+Init(Item		item,
+     int		*argc,
+     Tcl_Obj *CONST	*args[])
 {
   WidgetInfo	*wi = item->wi;
   TabularItem	tab = (TabularItem) item;
@@ -127,8 +128,9 @@ 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);
@@ -182,7 +184,7 @@ Destroy(Item	item)
 static int
 Configure(Item		item,
 	  int		argc,
-	  ZnAttrList	argv,
+	  Tcl_Obj *CONST argv[],
 	  int		*flags)
 {
   Item	old_connected;
@@ -220,7 +222,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;
-- 
cgit v1.1