X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lwlib%2Fxlwgauge.c;h=074a6c7e3136ad7954d848817e82195cb199642e;hb=04860de3ca150fb9e4e06d82567b36f49e072259;hp=3d81e8f7793f900743bae4e1743a03dcac39007c;hpb=3890a2e3064a7f562107c58e59d928284ec04741;p=chise%2Fxemacs-chise.git

diff --git a/lwlib/xlwgauge.c b/lwlib/xlwgauge.c
index 3d81e8f..074a6c7 100644
--- a/lwlib/xlwgauge.c
+++ b/lwlib/xlwgauge.c
@@ -1,4 +1,4 @@
-/* Gauge Widget for XEmacs. 
+/* Gauge Widget for XEmacs.
    Copyright (C) 1999 Edward A. Falk
 
 This file is part of XEmacs.
@@ -25,7 +25,7 @@ Boston, MA 02111-1307, USA.  */
  *
  * Author: Edward A. Falk
  *         falk@falconer.vip.best.com
- *  
+ *
  * Date:   July 9, 1997
  *
  * Note: for fun and demonstration purposes, I have added selection
@@ -52,7 +52,7 @@ Boston, MA 02111-1307, USA.  */
 #include <X11/IntrinsicP.h>
 #include <X11/Xatom.h>
 #include <X11/StringDefs.h>
-#include ATHENA_INCLUDE(XawInit.h)
+#include ATHENA_XawInit_h_
 #include "xlwgaugeP.h"
 #include "../src/xmu.h"
 #ifdef HAVE_XMU
@@ -135,11 +135,11 @@ static void GaugeGetValue (XtPointer, XtIntervalId *);
 static void GaugeMercury (Display *, Window, GC, GaugeWidget, Cardinal, Cardinal);
 
 static Boolean GaugeConvert (Widget, Atom *, Atom *, Atom *,
-			     XtPointer *, u_long *, int *);
+			     XtPointer *, unsigned long *, int *);
 static void GaugeLoseSel (Widget, Atom *);
 static void GaugeDoneSel (Widget, Atom *, Atom *);
 static void GaugeGetSelCB (Widget, XtPointer, Atom *, Atom *,
-			   XtPointer, u_long *, int *);
+			   XtPointer, unsigned long *, int *);
 
 static GC Get_GC (GaugeWidget, Pixel);
 
@@ -160,7 +160,7 @@ static	XtActionsRec	actionsList[] =
 
 GaugeClassRec gaugeClassRec = {
   {
-/* core_class fields */	
+/* core_class fields */
     /* superclass	  	*/	(WidgetClass) &labelClassRec,
     /* class_name	  	*/	"Gauge",
     /* widget_size	  	*/	sizeof(GaugeRec),
@@ -334,7 +334,7 @@ GaugeResize (Widget w)
 	  }
 	  else
 	  {
-	    gw->gauge.margin0 = 
+	    gw->gauge.margin0 =
 	    gw->gauge.margin1 = lh / 2 ;
 	    size += lwm + vmargin ;
 	  }
@@ -404,7 +404,7 @@ register Window	win = XtWindow(w) ;
 	}
 
 	/* if the gauge is selected, signify by drawing the background
-	 * in a constrasting color.
+	 * in a contrasting color.
 	 */
 
 	if( gw->gauge.selected )
@@ -540,7 +540,7 @@ GaugeSetValues (Widget   old,
 	  else
 	    GaugeResize(new) ;
 	}
-	
+
 	if( gw->gauge.update != oldgw->gauge.update )
 	  {
 	    if( gw->gauge.update > 0 )
@@ -636,7 +636,7 @@ GaugeConvert (Widget	w,
 	      Atom	*target,	/* requested target */
 	      Atom	*type,		/* returned type */
 	      XtPointer *value,		/* returned value */
-	      u_long	*length,	/* returned length */
+	      unsigned long	*length,	/* returned length */
 	      int	*format)	/* returned format */
 {
 	GaugeWidget	gw = (GaugeWidget)w ;
@@ -650,7 +650,7 @@ GaugeConvert (Widget	w,
 	if( *target == XA_TARGETS(XtDisplay(w)) )
 	{
 	  Atom *rval, *stdTargets ;
-	  u_long stdLength ;
+	  unsigned long stdLength ;
 
 	  /* XmuConvertStandardSelection can handle this.  This function
 	   * will return a list of standard targets.  We prepend TEXT,
@@ -674,7 +674,7 @@ GaugeConvert (Widget	w,
 	  return True ;
 	}
 
-	else 
+	else
 #endif
 	  if( *target == XA_INTEGER )
 	{
@@ -685,10 +685,10 @@ GaugeConvert (Widget	w,
 	  return True ;
 	}
 
-	else if( *target == XA_STRING 
+	else if( *target == XA_STRING
 #ifdef HAVE_XMU
-		 || 
-		 *target == XA_TEXT(XtDisplay(w)) 
+		 ||
+		 *target == XA_TEXT(XtDisplay(w))
 #endif
 		 )
 	{
@@ -707,7 +707,7 @@ GaugeConvert (Widget	w,
 	  if( XmuConvertStandardSelection(w, req->time, selection, target,
 	  	type, (XPointer *) value, length, format) )
 	    return True ;
-	  else 
+	  else
 #endif
 	    {
 	    printf(
@@ -774,7 +774,7 @@ GaugeGetSelCB (Widget    w,
 	       Atom      *selection,
 	       Atom      *type,
 	       XtPointer value,
-	       u_long    *length,
+	       unsigned long    *length,
 	       int       *format)
 {
 	Display	*dpy = XtDisplay(w) ;
@@ -787,12 +787,12 @@ GaugeGetSelCB (Widget    w,
 	  XawGaugeSetValue(w, *iptr) ;
 	}
 
-	else if( *type == XA_STRING  
+	else if( *type == XA_STRING
 #ifdef HAVE_XMU
 		 ||
-		 *type == XA_TEXT(dpy) 
+		 *type == XA_TEXT(dpy)
 #endif
-		 ) 
+		 )
 	  {
 	  cptr = (char *)value ;
 	  XawGaugeSetValue(w, atoi(cptr)) ;