--- a/lwlib/xlwscrollbarP.h	Mon Aug 13 09:00:04 2007 +0200
+++ b/lwlib/xlwscrollbarP.h	Mon Aug 13 09:02:59 2007 +0200
@@ -14,11 +14,11 @@
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+along with GNU Emacs; see the file COPYING.  If not, write to
+the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 /* Created by Douglas Keller <dkeller@vnet.ibm.com> */
+/* Last changed 02/05/95 */
 
 #ifndef _XlwScrollBarP_h
 #define _XlwScrollBarP_h
@@ -27,104 +27,85 @@
 /*
 ** Widget class
 */
-typedef struct
-{
-  int dummy_field;	/* keep compiler happy */
+typedef struct {
+	int dummy_field;	/* keep compiler happy */
 } XlwScrollBarClassPart;
 
-typedef struct _XlwScrollbarClassRec
-{
-  CoreClassPart	core_class;
-  XlwScrollBarClassPart scrollbar_class;
+typedef struct _XlwScrollbarClassRec {
+    CoreClassPart	  core_class;
+    XlwScrollBarClassPart scrollbar_class;
 } XlwScrollBarClassRec;
 
 
 /*
 ** Widget instance
 */
-typedef struct
-{
-  /* resources */
-  XtCallbackList valueChangedCBL;
-  XtCallbackList incrementCBL;
-  XtCallbackList decrementCBL;
-  XtCallbackList pageIncrementCBL;
-  XtCallbackList pageDecrementCBL;
-  XtCallbackList toTopCBL;
-  XtCallbackList toBottomCBL;
-  XtCallbackList dragCBL;
+typedef struct {
 
-  Pixel		foreground;
+    /* resources */
+    XtCallbackList      valueChangedCBL;
+    XtCallbackList      incrementCBL;
+    XtCallbackList      decrementCBL;
+    XtCallbackList      pageIncrementCBL;
+    XtCallbackList      pageDecrementCBL;
+    XtCallbackList      toTopCBL;
+    XtCallbackList      toBottomCBL;
+    XtCallbackList      dragCBL;
 
-  Pixel		topShadowColor;
-  Pixel		bottomShadowColor;
+    Pixel               foreground;
 
-  Pixel		troughColor;
+    Pixel               topShadowColor;
+    Pixel               bottomShadowColor;
 
-  Pixel		armColor;
-  Pixel		armTopShadowColor;
-  Pixel		armBottomShadowColor;
-
-  Pixmap	topShadowPixmap;
-  Pixmap	bottomShadowPixmap;
+    Pixel               troughColor;
 
-  int		shadowThickness;
-
-  Boolean	showArrows;
+    Pixel               armColor;
+    Pixel               armTopShadowColor;
+    Pixel               armBottomShadowColor;
 
-  int		minimum;
-  int		maximum;
-  int		sliderSize;
-  int		value;
-  int		pageIncrement;
-  int		increment;
+    Pixmap              topShadowPixmap;
+    Pixmap              bottomShadowPixmap;
+
+    int                 shadowThickness;
+
+    Boolean             showArrows;
 
-  int		initialDelay;
-  int		repeatDelay;
-
-  unsigned char	orientation;
-
-  char		*sliderStyle;
-  char		*arrowPosition;
+    int                 minimum;
+    int                 maximum;
+    int                 sliderSize;
+    int                 value;
+    int                 pageIncrement;
+    int                 increment;
 
-  /* private */
-  Pixmap	grayPixmap;
+    int                 initialDelay;
+    int                 repeatDelay;
 
-  GC		backgroundGC;
-  GC		topShadowGC;
-  GC		bottomShadowGC;
+    unsigned char       orientation;
 
-  int		above, ss, below;
-  int		lastY;
+    char               *knobStyle;
+    char               *arrowPosition;
 
-  enum {
-    ARM_NONE,
-    ARM_SLIDER,
-    ARM_UP,
-    ARM_DOWN,
-    ARM_PAGEUP,
-    ARM_PAGEDOWN
-  } 		armed;
+    /* private */
+    Pixmap              grayPixmap;
+
+    GC                  backgroundGC;
+    GC                  topShadowGC;
+    GC                  bottomShadowGC;
 
-  enum {
-    FORCED_SCROLL_NONE,
-    FORCED_SCROLL_DOWNRIGHT,
-    FORCED_SCROLL_UPLEFT
-  } 		forced_scroll;
+    int                 above, ss, below;
+    int                 lastY;
 
-  int		savedValue;
+    int                 armed;
 
-  Boolean	fullRedrawNext;
+    int                 savedValue;
 
-  Boolean	timerActive;
-  XtIntervalId	timerId;
+    Boolean             fullRedrawNext;
 
 } XlwScrollBarPart;
 
-typedef struct _XlwScrollBarRec
-{
-  CorePart          core;
-  XlwScrollBarPart  sb;
+typedef struct _XlwScrollBarRec {
+    CorePart          core;
+    XlwScrollBarPart  sb;
 } XlwScrollBarRec;
 
-#endif /* _XlwScrollBarP_h */
+#endif