svn merge ^/branches/released .

1 files changed, 106 insertions, 108 deletions

diff --git a/libXaw/include/X11/Xaw/PannerP.h b/libXaw/include/X11/Xaw/PannerP.h
index aacf2e26c..893f5ca74 100644
--- a/libXaw/include/X11/Xaw/PannerP.h
+++ b/libXaw/include/X11/Xaw/PannerP.h
@@ -1,108 +1,106 @@
-/*
- * $Xorg: PannerP.h,v 1.4 2001/02/09 02:03:45 xorgcvs Exp $
- *
-Copyright 1989, 1998 The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
- *
- * Author:  Jim Fulton, MIT X Consortium
- */
-/* $XFree86: xc/lib/Xaw/PannerP.h,v 1.7 2001/01/17 19:42:29 dawes Exp $ */
-
-#ifndef _XawPannerP_h
-#define _XawPannerP_h
-
-#include <X11/Xaw/Panner.h>
-#include <X11/Xaw/SimpleP.h>
-
-/* new fields in widget class */
-typedef struct {
-    XtPointer extension;
-} PannerClassPart;
-
-/* Panner widget class */
-typedef struct _PannerClassRec {
-    CoreClassPart core_class;
-    SimpleClassPart simple_class;
-    PannerClassPart panner_class;
-} PannerClassRec;
-
-/* new fields in widget */
-typedef struct {
-    /* resources */
-    XtCallbackList report_callbacks;	/* callback/Callback */
-    Boolean allow_off;			/* allowOff/AllowOff */
-    Boolean resize_to_pref;		/* resizeToPreferred/Boolean */
-    Pixel foreground;			/* foreground/Foreground */
-    Pixel shadow_color;			/* shadowColor/ShadowColor */
-    Dimension shadow_thickness;		/* shadowThickness/ShadowThickness */
-    Dimension default_scale;		/* defaultScale/DefaultScale */
-    Dimension line_width;		/* lineWidth/LineWidth */
-    Dimension canvas_width;		/* canvasWidth/CanvasWidth */
-    Dimension canvas_height;		/* canvasHeight/CanvasHeight */
-    Position slider_x;			/* sliderX/SliderX */
-    Position slider_y;			/* sliderY/SliderY */
-    Dimension slider_width;		/* sliderWidth/SliderWidth */
-    Dimension slider_height;		/* sliderHeight/SliderHeight */
-    Dimension internal_border;		/* internalBorderWidth/BorderWidth */
-    String stipple_name;		/* backgroundStipple/BackgroundStipple
-					 */
-    /* private */
-    GC slider_gc;			/* background of slider */
-    GC shadow_gc;			/* edge of slider and shadow */
-    GC xor_gc;				/* for doing XOR tmp graphics */
-    double haspect, vaspect;		/* aspect ratio of core to canvas */
-    Boolean rubber_band;		/* true = rubber band, false = move */
-    struct {
-	Boolean doing;			/* tmp graphics in progress */
-	Boolean showing;		/* true if tmp graphics displayed */
-	Position startx, starty;	/* initial position of slider */
-	Position dx, dy;		/* offset loc for tmp graphics */
-	Position x, y;			/* location for tmp graphics */
-    } tmp;
-    Position knob_x, knob_y;		/* real upper left of knob in canvas */
-    Dimension knob_width, knob_height;	/* real size of knob in canvas */
-    Boolean shadow_valid;		/* true if rects are valid */
-    XRectangle shadow_rects[2];		/* location of shadows */
-    Position last_x, last_y;		/* previous location of knob */
-#ifndef OLDXAW
-    XtPointer pad[4];	/* for future use and keep binary compatability */
-#endif
-} PannerPart;
-
-typedef struct _PannerRec {
-    CorePart core;
-    SimplePart simple;
-    PannerPart panner;
-} PannerRec;
-
-#define PANNER_HSCALE(pw,val)	((pw)->panner.haspect * ((double)(val)))
-#define PANNER_VSCALE(pw,val)	((pw)->panner.vaspect * ((double)(val)))
-
-#define PANNER_DSCALE(pw,val) (Dimension)  \
-((((unsigned long)(val)) * (unsigned long)pw->panner.default_scale) / 100L)
-
-#define PANNER_DEFAULT_SCALE	8		/* percent */
-#define PANNER_OUTOFRANGE -30000
-
-extern PannerClassRec pannerClassRec;
-
-#endif /* _XawPannerP_h */
+/*

+ *

+Copyright 1989, 1998 The Open Group

+

+Permission to use, copy, modify, distribute, and sell this software and its

+documentation for any purpose is hereby granted without fee, provided that

+the above copyright notice appear in all copies and that both that

+copyright notice and this permission notice appear in supporting

+documentation.

+

+The above copyright notice and this permission notice shall be included in

+all copies or substantial portions of the Software.

+

+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE

+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+

+Except as contained in this notice, the name of The Open Group shall not be

+used in advertising or otherwise to promote the sale, use or other dealings

+in this Software without prior written authorization from The Open Group.

+ *

+ * Author:  Jim Fulton, MIT X Consortium

+ */

+

+#ifndef _XawPannerP_h

+#define _XawPannerP_h

+

+#include <X11/Xaw/Panner.h>

+#include <X11/Xaw/SimpleP.h>

+

+/* new fields in widget class */

+typedef struct {

+    XtPointer extension;

+} PannerClassPart;

+

+/* Panner widget class */

+typedef struct _PannerClassRec {

+    CoreClassPart core_class;

+    SimpleClassPart simple_class;

+    PannerClassPart panner_class;

+} PannerClassRec;

+

+/* new fields in widget */

+typedef struct {

+    /* resources */

+    XtCallbackList report_callbacks;	/* callback/Callback */

+    Boolean allow_off;			/* allowOff/AllowOff */

+    Boolean resize_to_pref;		/* resizeToPreferred/Boolean */

+    Pixel foreground;			/* foreground/Foreground */

+    Pixel shadow_color;			/* shadowColor/ShadowColor */

+    Dimension shadow_thickness;		/* shadowThickness/ShadowThickness */

+    Dimension default_scale;		/* defaultScale/DefaultScale */

+    Dimension line_width;		/* lineWidth/LineWidth */

+    Dimension canvas_width;		/* canvasWidth/CanvasWidth */

+    Dimension canvas_height;		/* canvasHeight/CanvasHeight */

+    Position slider_x;			/* sliderX/SliderX */

+    Position slider_y;			/* sliderY/SliderY */

+    Dimension slider_width;		/* sliderWidth/SliderWidth */

+    Dimension slider_height;		/* sliderHeight/SliderHeight */

+    Dimension internal_border;		/* internalBorderWidth/BorderWidth */

+    String stipple_name;		/* backgroundStipple/BackgroundStipple

+					 */

+    /* private */

+    GC slider_gc;			/* background of slider */

+    GC shadow_gc;			/* edge of slider and shadow */

+    GC xor_gc;				/* for doing XOR tmp graphics */

+    double haspect, vaspect;		/* aspect ratio of core to canvas */

+    Boolean rubber_band;		/* true = rubber band, false = move */

+    struct {

+	Boolean doing;			/* tmp graphics in progress */

+	Boolean showing;		/* true if tmp graphics displayed */

+	Position startx, starty;	/* initial position of slider */

+	Position dx, dy;		/* offset loc for tmp graphics */

+	Position x, y;			/* location for tmp graphics */

+    } tmp;

+    Position knob_x, knob_y;		/* real upper left of knob in canvas */

+    Dimension knob_width, knob_height;	/* real size of knob in canvas */

+    Boolean shadow_valid;		/* true if rects are valid */

+    XRectangle shadow_rects[2];		/* location of shadows */

+    Position last_x, last_y;		/* previous location of knob */

+#ifndef OLDXAW

+    XtPointer pad[4];	/* for future use and keep binary compatability */

+#endif

+} PannerPart;

+

+typedef struct _PannerRec {

+    CorePart core;

+    SimplePart simple;

+    PannerPart panner;

+} PannerRec;

+

+#define PANNER_HSCALE(pw,val)	((pw)->panner.haspect * ((double)(val)))

+#define PANNER_VSCALE(pw,val)	((pw)->panner.vaspect * ((double)(val)))

+

+#define PANNER_DSCALE(pw,val) (Dimension)  \

+((((unsigned long)(val)) * (unsigned long)pw->panner.default_scale) / 100L)

+

+#define PANNER_DEFAULT_SCALE	8		/* percent */

+#define PANNER_OUTOFRANGE -30000

+

+extern PannerClassRec pannerClassRec;

+

+#endif /* _XawPannerP_h */