--- a/lwlib/xlwscrollbarP.h	Mon Aug 13 08:51:05 2007 +0200
+++ b/lwlib/xlwscrollbarP.h	Mon Aug 13 08:51:32 2007 +0200
@@ -27,88 +27,104 @@
 /*
 ** 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 {
+typedef struct
+{
+  /* resources */
+  XtCallbackList valueChangedCBL;
+  XtCallbackList incrementCBL;
+  XtCallbackList decrementCBL;
+  XtCallbackList pageIncrementCBL;
+  XtCallbackList pageDecrementCBL;
+  XtCallbackList toTopCBL;
+  XtCallbackList toBottomCBL;
+  XtCallbackList dragCBL;
 
-    /* resources */
-    XtCallbackList	valueChangedCBL;
-    XtCallbackList	incrementCBL;
-    XtCallbackList	decrementCBL;
-    XtCallbackList	pageIncrementCBL;
-    XtCallbackList	pageDecrementCBL;
-    XtCallbackList	toTopCBL;
-    XtCallbackList	toBottomCBL;
-    XtCallbackList	dragCBL;
+  Pixel		foreground;
 
-    Pixel		foreground;
+  Pixel		topShadowColor;
+  Pixel		bottomShadowColor;
 
-    Pixel		topShadowColor;
-    Pixel		bottomShadowColor;
+  Pixel		troughColor;
 
-    Pixel		troughColor;
+  Pixel		armColor;
+  Pixel		armTopShadowColor;
+  Pixel		armBottomShadowColor;
+
+  Pixmap	topShadowPixmap;
+  Pixmap	bottomShadowPixmap;
 
-    Pixel		armColor;
-    Pixel		armTopShadowColor;
-    Pixel		armBottomShadowColor;
+  int		shadowThickness;
+
+  Boolean	showArrows;
 
-    Pixmap		topShadowPixmap;
-    Pixmap		bottomShadowPixmap;
-
-    int			shadowThickness;
-
-    Boolean		showArrows;
+  int		minimum;
+  int		maximum;
+  int		sliderSize;
+  int		value;
+  int		pageIncrement;
+  int		increment;
 
-    int			minimum;
-    int			maximum;
-    int			sliderSize;
-    int			value;
-    int			pageIncrement;
-    int			increment;
+  int		initialDelay;
+  int		repeatDelay;
+
+  unsigned char	orientation;
+
+  char		*sliderStyle;
+  char		*arrowPosition;
 
-    int			initialDelay;
-    int			repeatDelay;
+  /* private */
+  Pixmap	grayPixmap;
 
-    unsigned char	orientation;
+  GC		backgroundGC;
+  GC		topShadowGC;
+  GC		bottomShadowGC;
 
-    char		*knobStyle;
-    char		*arrowPosition;
+  int		above, ss, below;
+  int		lastY;
 
-    /* private */
-    Pixmap		grayPixmap;
-
-    GC			backgroundGC;
-    GC			topShadowGC;
-    GC			bottomShadowGC;
+  enum {
+    ARM_NONE,
+    ARM_SLIDER,
+    ARM_UP,
+    ARM_DOWN,
+    ARM_PAGEUP,
+    ARM_PAGEDOWN
+  } 		armed;
 
-    int			above, ss, below;
-    int			lastY;
-
-    int			armed;
+  enum {
+    FORCED_SCROLL_NONE,
+    FORCED_SCROLL_DOWNRIGHT,
+    FORCED_SCROLL_UPLEFT
+  } 		forced_scroll;
 
-    int			savedValue;
+  int		savedValue;
 
-    Boolean		fullRedrawNext;
+  Boolean	fullRedrawNext;
 
-    Boolean		timerActive;
-    XtIntervalId	timerId;
+  Boolean	timerActive;
+  XtIntervalId	timerId;
 
 } XlwScrollBarPart;
 
-typedef struct _XlwScrollBarRec {
-    CorePart          core;
-    XlwScrollBarPart  sb;
+typedef struct _XlwScrollBarRec
+{
+  CorePart          core;
+  XlwScrollBarPart  sb;
 } XlwScrollBarRec;
 
-#endif
+#endif /* _XlwScrollBarP_h */