diff --git a/lib/modules/Graphics.pmod/Graph.pmod/create_bars.pike b/lib/modules/Graphics.pmod/Graph.pmod/create_bars.pike
index 53dcc9453fe0cfd7939223887bbecb795ce85c22..095e563f575d31f8b7076b5ca5ce20b6f4558556 100755
--- a/lib/modules/Graphics.pmod/Graph.pmod/create_bars.pike
+++ b/lib/modules/Graphics.pmod/Graph.pmod/create_bars.pike
@@ -11,7 +11,7 @@ import Stdio;
 inherit "polyline.pike";
 inherit "create_graph.pike";
 
-constant cvs_version = "$Id: create_bars.pike,v 1.3 2000/09/28 03:38:42 hubbe Exp $";
+constant cvs_version = "$Id: create_bars.pike,v 1.4 2000/10/12 00:42:15 nilsson Exp $";
 
 /*
  * name = "BG: Create bars";
@@ -211,7 +211,7 @@ mapping(string:mixed) create_bars(mapping(string:mixed) diagram_data)
     else
       label=diagram_data["labels"][0];
 
-    GETFONT(xaxisfont);
+    object notext=GETFONT(xaxisfont);
     if ((label!="")&&(label!=0))
       labelimg=notext
 	->write(UNICODE(label,diagram_data["encoding"]))
@@ -782,7 +782,7 @@ mapping(string:mixed) create_bars(mapping(string:mixed) diagram_data)
       label=diagram_data["labels"][1]+" ["+diagram_data["labels"][3]+"]"; //Yquantity
     else
       label=diagram_data["labels"][1];
-    GETFONT(yaxisfont);
+    object notext=GETFONT(yaxisfont);
     if ((label!="")&&(label!=0))
       labelimg=notext
 	->write(label)->scale(0,diagram_data["labelsize"]);
diff --git a/lib/modules/Graphics.pmod/Graph.pmod/create_graph.pike b/lib/modules/Graphics.pmod/Graph.pmod/create_graph.pike
index a05cfafeb5463d5545d60d7ee1c86fe8d01b3339..c64fbda022f9ed1eaab7bdd49c0e15f1dd694730 100755
--- a/lib/modules/Graphics.pmod/Graph.pmod/create_graph.pike
+++ b/lib/modules/Graphics.pmod/Graph.pmod/create_graph.pike
@@ -10,7 +10,7 @@ import Stdio;
 
 inherit "polyline.pike";
 
-constant cvs_version = "$Id: create_graph.pike,v 1.4 2000/09/28 03:38:43 hubbe Exp $";
+constant cvs_version = "$Id: create_graph.pike,v 1.5 2000/10/12 00:42:15 nilsson Exp $";
 
 /*
  * name = "BG: Create graphs";
@@ -471,8 +471,8 @@ mapping(string:mixed) create_text(mapping(string:mixed) diagram_data)
     if (r>9)
       throw( ({"Very bad error while trying to resize the textfont!\n",
 	       backtrace()}));
-      
-    GETFONT(xnamesfont);
+
+    object notext=GETFONT(xnamesfont);
     int j;
     diagram_data["xnamesimg"]=allocate(j=sizeof(diagram_data["xnames"]));
     for(int i=0; i<j; i++)
@@ -493,7 +493,7 @@ mapping(string:mixed) create_text(mapping(string:mixed) diagram_data)
 					   diagram_data["fontsize"]);
     }
       
-    GETFONT(ynamesfont);
+    notext=GETFONT(ynamesfont);
 
     diagram_data["ynamesimg"]=allocate(j=sizeof(diagram_data["ynames"]));
     if ((diagram_data["type"]=="bars")||
@@ -743,7 +743,7 @@ mapping set_legend_size(mapping diagram_data)
 	texts=allocate(sizeof(diagram_data["legend_texts"]));
 	plupps=allocate(sizeof(diagram_data["legend_texts"]));
 	
-	GETFONT(legendfont);
+	object notext=GETFONT(legendfont);
 	
 	j=sizeof(texts);
 	if (!diagram_data["legendcolor"])
@@ -923,7 +923,7 @@ int write_name(mapping diagram_data)
 {
   if (!diagram_data["name"])
     return 0;
-  GETFONT(namefont);
+  object notext=GETFONT(namefont);
 
   object text;
   int y,x;
@@ -1132,7 +1132,7 @@ mapping(string:mixed) create_graph(mapping diagram_data)
   int labelx=0;
   int labely=0;
 
-  GETFONT(xaxisfont);
+  object notext=GETFONT(xaxisfont);
 
   if (diagram_data["labels"])
   {
@@ -1559,7 +1559,7 @@ mapping(string:mixed) create_graph(mapping diagram_data)
     string label;
     int x;
     int y;
-    GETFONT(yaxisfont);
+    object notext=GETFONT(yaxisfont);
     if (diagram_data["labels"][3] && sizeof(diagram_data["labels"][3]))
       label=diagram_data["labels"][1]+" ["+diagram_data["labels"][3]+"]"; //Ystorhet
     else
diff --git a/lib/modules/Graphics.pmod/Graph.pmod/create_pie.pike b/lib/modules/Graphics.pmod/Graph.pmod/create_pie.pike
index 53926d9899677f92c1489519e0c50eb2608c248a..0f847143aa8868851584719d1794092e059f1045 100644
--- a/lib/modules/Graphics.pmod/Graph.pmod/create_pie.pike
+++ b/lib/modules/Graphics.pmod/Graph.pmod/create_pie.pike
@@ -12,7 +12,7 @@ inherit "polyline.pike";
 inherit "create_graph.pike";
 inherit "create_bars.pike";
 
-constant cvs_version = "$Id: create_pie.pike,v 1.4 2000/09/28 03:38:43 hubbe Exp $";
+constant cvs_version = "$Id: create_pie.pike,v 1.5 2000/10/12 00:42:15 nilsson Exp $";
 
 /*
  * name = "BG: Create pies";
@@ -107,7 +107,7 @@ mapping(string:mixed) create_pie(mapping(string:mixed) diagram_data)
   if (diagram_data["3Ddepth"]>diagram_data["ysize"]/5)
     diagram_data["3Ddepth"]=diagram_data["ysize"]/5;
   
-  GETFONT(xnamesfont);
+  notext=GETFONT(xnamesfont);
   if (names)
     if (notext)
       for(int i=0; i<sizeof(names); i++)
diff --git a/lib/modules/Graphics.pmod/Graph.pmod/graph.h b/lib/modules/Graphics.pmod/Graph.pmod/graph.h
index 2876beb03151f8f16cd2e48af9eff1caa8814448..ad010a0b7716a2480be1b122da7de70cff69d5bd 100644
--- a/lib/modules/Graphics.pmod/Graph.pmod/graph.h
+++ b/lib/modules/Graphics.pmod/Graph.pmod/graph.h
@@ -2,7 +2,7 @@
  * name = "BG: diagram.h";
  * doc = "Business Graphics common things. You must upgrade this component to use newer versions of BG.";
  *
- * string cvs_version="$Id: graph.h,v 1.1 1999/09/30 13:04:11 hedda Exp $";
+ * string cvs_version="$Id: graph.h,v 1.2 2000/10/12 00:42:15 nilsson Exp $";
  */
 
 
@@ -22,8 +22,8 @@ private constant STORT = 1.0e30;
 
 
 //This is used in Roxen. Don't work with only Pike
-//#define GETFONT(WHATFONT) object notext=resolve_font(diagram_data->WHATFONT||diagram_data->font);
-#define GETFONT(WHATFONT) object notext=diagram_data->font;
+//#define GETFONT(WHATFONT) resolve_font(diagram_data->WHATFONT||diagram_data->font);
+#define GETFONT(WHATFONT) diagram_data->font;
 
 //#define BG_DEBUG 1
 #define error(X) throw( ({ (X), backtrace()[0..sizeof(backtrace())-2] }) )