From e973fb3e972330537f35b3462e7d904463fa49f5 Mon Sep 17 00:00:00 2001
From: rlar <rlar>
Date: Sun, 8 May 2011 09:04:04 +0000
Subject: [PATCH] cleanup Xt usage

---
 ChangeLog                   |  4 ++++
 src/frontend/help/x11disp.c | 24 +++++++++++++-----------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index dda1f1296..c4a464387 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-05-08  Robert Larice
+ * src/frontend/help/x11disp.c :
+    cleanup Xt usage
+
 2011-05-08  Robert Larice
  * xgraph/alloc.c :
     rename macros public and private  -->  PUBLIC and PRIVATE
diff --git a/src/frontend/help/x11disp.c b/src/frontend/help/x11disp.c
index 36f7b258f..af9f81246 100644
--- a/src/frontend/help/x11disp.c
+++ b/src/frontend/help/x11disp.c
@@ -23,7 +23,9 @@ $Id$
 
 static bool started = FALSE;
 static topic *topics = NULL;
-void newtopic(Widget w, caddr_t client_data, caddr_t call_data), delete_w(Widget w, caddr_t client_data, caddr_t call_data), quit(Widget w, caddr_t client_data, caddr_t call_data);
+static void newtopic(Widget w, XtPointer client_data, XtPointer call_data);
+static void delete_w(Widget w, XtPointer client_data, XtPointer call_data);
+static void quit(Widget w, XtPointer client_data, XtPointer call_data);
 static void sputline(char *buf, char *s);
 /* atoms for catching window delet by WM x-button */
 static Atom atom_wm_delete_window;
@@ -120,11 +122,11 @@ hlp_xdisplay(topic *top)
     XtSetArg(buttonargs[0], XtNlabel, "quit help");
     buttonwidget = XtCreateManagedWidget("quit", commandWidgetClass,
             top->titlewidget, buttonargs, 1);
-    XtAddCallback(buttonwidget, XtNcallback, (XtCallbackProc) quit, top);
+    XtAddCallback(buttonwidget, XtNcallback, quit, top);
     XtSetArg(buttonargs[0], XtNlabel, "delete window");
     buttonwidget = XtCreateManagedWidget("delete", commandWidgetClass,
             top->titlewidget, buttonargs, XtNumber(buttonargs));
-    XtAddCallback(buttonwidget, XtNcallback, (XtCallbackProc) delete_w, top);
+    XtAddCallback(buttonwidget, XtNcallback, delete_w, top);
 
     buf = TMALLOC(char, 80 * top->numlines + 100);
     buf[0] = '\0';
@@ -170,7 +172,7 @@ hlp_xdisplay(topic *top)
         hand = TMALLOC(handle, 1);
         hand->result = tl;
         hand->parent = top;
-        XtAddCallback(buttonwidget, XtNcallback, (XtCallbackProc) newtopic, hand);
+        XtAddCallback(buttonwidget, XtNcallback, newtopic, hand);
       }
     }
 
@@ -203,7 +205,7 @@ hlp_xdisplay(topic *top)
                                 /* core leak XXX */
         hand->result = tl;
         hand->parent = top;
-        XtAddCallback(buttonwidget, XtNcallback, (XtCallbackProc) newtopic, hand);
+        XtAddCallback(buttonwidget, XtNcallback, newtopic, hand);
       }
     }
 
@@ -224,8 +226,8 @@ hlp_xdisplay(topic *top)
 
 }
 
-void
-newtopic(Widget w, caddr_t client_data, caddr_t call_data)
+static void
+newtopic(Widget w, XtPointer client_data, XtPointer call_data)
 {
     topic *parent = ((handle *) client_data)->parent;
     toplink *result = ((handle *) client_data)->result;
@@ -249,8 +251,8 @@ newtopic(Widget w, caddr_t client_data, caddr_t call_data)
     }
 }
 
-void
-delete_w(Widget w, caddr_t client_data, caddr_t call_data)
+static void
+delete_w(Widget w, XtPointer client_data, XtPointer call_data)
 {
 
     topic *top = (topic *) client_data;
@@ -262,8 +264,8 @@ delete_w(Widget w, caddr_t client_data, caddr_t call_data)
     hlp_fixchildren(top);
 }
 
-void
-quit(Widget w, caddr_t client_data, caddr_t call_data)
+static void
+quit(Widget w, XtPointer client_data, XtPointer call_data)
 {
 
     topic *top = (topic *) client_data, *parent = top->parent;