merge XFree86 4.3.0.1 to -CURRENT

1 files changed, 18 insertions, 20 deletions

diff --git a/Dialog.c b/Dialog.c
index ebf0a3b..1706022 100644
--- a/Dialog.c
+++ b/Dialog.c
@@ -26,6 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
+/* $XFree86: xc/programs/bitmap/Dialog.c,v 1.4 2001/12/14 20:00:40 dawes Exp $ */
 
 /*
  * Author:  Davor Matic, MIT X Consortium
@@ -43,7 +44,9 @@ from The Open Group.
 #define min(x, y)                     (((x) < (y)) ? (x) : (y))
 #define max(x, y)                     (((x) > (y)) ? (x) : (y))
 
-static void SetDialogButton();
+
+static void SetDialogButton(Widget w, XEvent *event, 
+			    String *argv, Cardinal *argc);
 
 static XtActionsRec actions_table[] = {
   {"set-dialog-button", SetDialogButton},
@@ -62,9 +65,8 @@ static DialogButton dialog_buttons[] = {
 static unsigned long selected;
 
 /* ARGSUSED */
-static void SetSelected(w, clientData, callData) /* ARGSUSED */
-     Widget w;
-     XtPointer clientData, callData;
+static void 
+SetSelected(Widget w, XtPointer clientData, XtPointer callData) /* ARGSUSED */
 {
     String name = (String)clientData;
     int i;
@@ -75,11 +77,11 @@ static void SetSelected(w, clientData, callData) /* ARGSUSED */
 }
 
 /* ARGSUSED */
-static void SetDialogButton(w, event, argv, argc)
-     Widget w;         /* not used */
-     XEvent *event;    /* not used */
-     String *argv;
-     Cardinal *argc;  
+static void 
+SetDialogButton(Widget w,	/* not used */
+		XEvent *event,	/* not used */
+		String *argv, 
+		Cardinal *argc)
 {
   char button_name[80];
   XtPointer dummy = NULL;
@@ -93,10 +95,8 @@ static void SetDialogButton(w, event, argv, argc)
 
 static Boolean firstTime = True;
 
-Dialog CreateDialog(top_widget, name, options)
-     Widget top_widget;
-     String name;
-     unsigned long options;
+Dialog 
+CreateDialog(Widget top_widget, String name, unsigned long options)
 {
     int i;
     Dialog popup;
@@ -128,9 +128,8 @@ Dialog CreateDialog(top_widget, name, options)
 	return NULL;
 }
 
-void PopdownDialog(popup, answer)
-    Dialog popup;
-    String *answer;
+void 
+PopdownDialog(Dialog popup, String *answer)
 {
     if (answer)
 	*answer = XawDialogGetValueString(popup->dialog_widget);
@@ -138,10 +137,9 @@ void PopdownDialog(popup, answer)
     XtPopdown(popup->shell_widget);
 }
 
-unsigned long PopupDialog(popup, message, suggestion, answer, grab)
-    Dialog popup;
-    String message, suggestion, *answer;
-    XtGrabKind grab;
+unsigned long 
+PopupDialog(Dialog popup, String message, String suggestion, 
+	    String *answer, XtGrabKind grab)
 {
   Position popup_x, popup_y, top_x, top_y;
   Dimension popup_width, popup_height, top_width, top_height, border_width;