diff options
Diffstat (limited to 'include/X11/Xaw/PannerP.h')
| -rw-r--r-- | include/X11/Xaw/PannerP.h | 35 |
1 files changed, 20 insertions, 15 deletions
diff --git a/include/X11/Xaw/PannerP.h b/include/X11/Xaw/PannerP.h index a952b02..1d185f2 100644 --- a/include/X11/Xaw/PannerP.h +++ b/include/X11/Xaw/PannerP.h @@ -25,25 +25,29 @@ 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.8 2001/12/14 19:54:41 dawes Exp $ */ #ifndef _XawPannerP_h #define _XawPannerP_h #include <X11/Xaw/Panner.h> -#include <X11/Xaw/SimpleP.h> /* parent */ +#include <X11/Xaw/SimpleP.h> -typedef struct { /* new fields in widget class */ - int dummy; +/* new fields in widget class */ +typedef struct { + XtPointer extension; } PannerClassPart; -typedef struct _PannerClassRec { /* Panner widget class */ +/* Panner widget class */ +typedef struct _PannerClassRec { CoreClassPart core_class; SimpleClassPart simple_class; PannerClassPart panner_class; } PannerClassRec; -typedef struct { /* new fields in widget */ - /* resources... */ +/* new fields in widget */ +typedef struct { + /* resources */ XtCallbackList report_callbacks; /* callback/Callback */ Boolean allow_off; /* allowOff/AllowOff */ Boolean resize_to_pref; /* resizeToPreferred/Boolean */ @@ -59,8 +63,9 @@ typedef struct { /* new fields in widget */ Dimension slider_width; /* sliderWidth/SliderWidth */ Dimension slider_height; /* sliderHeight/SliderHeight */ Dimension internal_border; /* internalBorderWidth/BorderWidth */ - String stipple_name; /* backgroundStipple/BackgroundStipple */ - /* private data... */ + 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 */ @@ -78,6 +83,9 @@ typedef struct { /* new fields in widget */ 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 { @@ -86,18 +94,15 @@ typedef struct _PannerRec { 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_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 */ +((((unsigned long)(val)) * (unsigned long)pw->panner.default_scale) / 100L) +#define PANNER_DEFAULT_SCALE 8 /* percent */ #define PANNER_OUTOFRANGE -30000 -/* - * external declarations - */ extern PannerClassRec pannerClassRec; #endif /* _XawPannerP_h */ |