diff options
Diffstat (limited to 'include/X11/Xaw/ViewportP.h')
| -rw-r--r-- | include/X11/Xaw/ViewportP.h | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/include/X11/Xaw/ViewportP.h b/include/X11/Xaw/ViewportP.h index 6792426..4801885 100644 --- a/include/X11/Xaw/ViewportP.h +++ b/include/X11/Xaw/ViewportP.h @@ -49,6 +49,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +/* $XFree86: xc/lib/Xaw/ViewportP.h,v 1.8 2001/12/14 19:54:46 dawes Exp $ */ #ifndef _ViewportP_h #define _ViewportP_h @@ -56,7 +57,9 @@ SOFTWARE. #include <X11/Xaw/Viewport.h> #include <X11/Xaw/FormP.h> -typedef struct {int empty;} ViewportClassPart; +typedef struct { + XtPointer extension; +} ViewportClassPart; typedef struct _ViewportClassRec { CoreClassPart core_class; @@ -70,20 +73,24 @@ extern ViewportClassRec viewportClassRec; typedef struct _ViewportPart { /* resources */ - Boolean forcebars; /* Whether we should always display */ - /* the selected scrollbars. */ - Boolean allowhoriz; /* Whether we allow horizontal scrollbars. */ - Boolean allowvert; /* Whether we allow vertical scrollbars. */ - Boolean usebottom; /* True iff horiz bars appear at bottom. */ - Boolean useright; /* True iff vert bars appear at right. */ - XtCallbackList report_callbacks; /* when size/position changes */ - /* private state */ + Boolean forcebars; /* Whether we should always display + the selected scrollbars */ + Boolean allowhoriz; /* Whether we allow horizontal scrollbars */ + Boolean allowvert; /* Whether we allow vertical scrollbars */ + Boolean usebottom; /* True if horiz bars appear at bottom */ + Boolean useright; /* True if vert bars appear at right */ + XtCallbackList report_callbacks;/* when size/position changes */ + + /* private */ Widget clip, child; /* The clipping and (scrolled) child widgets */ - Widget horiz_bar, vert_bar;/* What scrollbars we currently have. */ + Widget horiz_bar, vert_bar; /* What scrollbars we currently have */ +#ifndef OLDXAW + XtPointer pad[4]; /* for future use and keep binary compatability */ +#endif } ViewportPart; typedef struct _ViewportRec { - CorePart core; + CorePart core; CompositePart composite; ConstraintPart constraint; FormPart form; @@ -91,10 +98,7 @@ typedef struct _ViewportRec { } ViewportRec; typedef struct { - /* resources */ - - /* private state */ - Boolean reparented; /* True if child has been re-parented */ + Bool reparented; /* True if child has been re-parented */ } ViewportConstraintsPart; typedef struct _ViewportConstraintsRec { |