* graph/Gdraws/Gfun.c (GDrawLine): Make string parameter of type

	const char*.
	(GDrawPushButton): Likewise.
	(GDrawString): Likewise.
	(PSCreateContext): Likewise.
	(centerX): Likewise.
	* Makefile.am (all-graph): Require all-utils.

3 files changed, 9 insertions, 8 deletions

diff --git a/src/graph/Gdraws/Gfun.c b/src/graph/Gdraws/Gfun.c
index 07237838..e931b0ad 100644
--- a/src/graph/Gdraws/Gfun.c
+++ b/src/graph/Gdraws/Gfun.c
@@ -246,7 +246,7 @@ GDrawImageString(
                  GC gc,         /* graphics context */
                  Window wid,    /* window id */
                  int x, int y,
-                 char *string,
+                 const char* string,
                  int length, int dFlag)
 {
   int s;
@@ -562,7 +562,7 @@ GDrawPushButton(
                 GC gc1, GC gc2, GC gc3,
                 Window windowId,
                 short int x,short int y,short  int width,short  int height,
-                int isOn, char *text,
+                int isOn, const char *text,
                 unsigned long buttonColor, unsigned long color,
                 int dFlag)
 {
@@ -597,7 +597,7 @@ GDrawString(
             GC gc,              /* graphics context */
             Window wid,         /* window id */
             int x, int y,
-            char *string,       /* string to be drawn */
+            const char* string,       /* string to be drawn */
             int length, int dFlag)
 {
   int s;
@@ -827,7 +827,7 @@ PSInit(Window vw, Window tw)
 int
 PSCreateContext(
                 GC gc,       /* graphics context */
-                char *C_gc,     /* GC name to be used as postscript variable */
+                const char *C_gc,     /* GC name to be used as postscript variable */
                 int lineWidth, int capStyle, int joinStyle,
                 float bg, float fg)
 {
@@ -1074,7 +1074,7 @@ PSClose(void)
 
 
 int 
-centerX (GC viewGCx,char * theString,int strlength,int windowWidth)
+centerX (GC viewGCx, const char* theString,int strlength,int windowWidth)
 {
   XFontStruct *fontStruct;
   GContext con;
diff --git a/src/graph/Gdraws/data.c b/src/graph/Gdraws/data.c
index d3f58173..e448f18d 100644
--- a/src/graph/Gdraws/data.c
+++ b/src/graph/Gdraws/data.c
@@ -47,12 +47,12 @@ Gdraws_data(int dFlag)
     static Vertex vlist[5];
     static int vcount = 5;
     static int x0, y0, x1, y1;
-    static char *str = "This is a text string.";
+    static const char* str = "This is a text string.";
     static int x, y;
     static int FirstTime = yes;
     static int Rx, Ry, Rwidth, Rheight;
     static int Ix, Iy;
-    static char *Istr = "Image text string.";
+    static const char* Istr = "Image text string.";
     static XPoint points[7];
     static XPoint p1[7];
     static int np1 = 7;
diff --git a/src/graph/Gdraws/menu.c b/src/graph/Gdraws/menu.c
index 7380065a..91443a60 100644
--- a/src/graph/Gdraws/menu.c
+++ b/src/graph/Gdraws/menu.c
@@ -42,7 +42,8 @@ extern GC gc;
 void
 Gdraws_draw_menu(Window menu, char *str, int width, int height)
 {
-   char *str1 = "y e s", *str2 = "n o";
+   const char* str1 = "y e s";
+   const char* str2 = "n o";
    int x0=0, y0=0;
 
    XDrawString(dsply, menu, gc, 30, height/4+3, str, strlen(str));