diff options
Diffstat (limited to 'include/X11/Xaw/SmeP.h')
| -rw-r--r-- | include/X11/Xaw/SmeP.h | 62 |
1 files changed, 24 insertions, 38 deletions
diff --git a/include/X11/Xaw/SmeP.h b/include/X11/Xaw/SmeP.h index 9a5d9fd..02b8018 100644 --- a/include/X11/Xaw/SmeP.h +++ b/include/X11/Xaw/SmeP.h @@ -23,10 +23,9 @@ 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. */ +/* $XFree86: xc/lib/Xaw/SmeP.h,v 1.9 2001/12/19 21:37:31 dawes Exp $ */ /* - * SmeP.h - Private Header file for Sme object. - * * This is the private header file for the Athena Sme object. * This object is intended to be used with the simple menu widget. * @@ -40,28 +39,24 @@ in this Software without prior written authorization from The Open Group. #ifndef _XawSmeP_h #define _XawSmeP_h -/*********************************************************************** - * +/* * Sme Widget Private Data - * - ***********************************************************************/ + */ +#include <X11/Xfuncproto.h> #include <X11/Xaw/Sme.h> -/************************************************************ - * - * New fields for the Sme widget class record. - * - ************************************************************/ +_XFUNCPROTOBEGIN +/* New fields for the Sme widget class */ typedef struct _SmeClassPart { - void (*highlight)(); - void (*unhighlight)(); - void (*notify)(); - XtPointer extension; + XtWidgetProc highlight; + XtWidgetProc unhighlight; + XtWidgetProc notify; + XtPointer extension; } SmeClassPart; -/* Full class record declaration */ +/* Full class record */ typedef struct _SmeClassRec { RectObjClassPart rect_class; SmeClassPart sme_class; @@ -69,36 +64,27 @@ typedef struct _SmeClassRec { extern SmeClassRec smeClassRec; -/* New fields for the Sme widget record */ +/* New fields for the Sme widget */ typedef struct { /* resources */ - XtCallbackList callbacks; /* The callback list */ - Boolean international; - + XtCallbackList callbacks; + Boolean international; +#ifndef OLDXAW + XtPointer pad[4]; /* for future use and keep binary compatability */ +#endif } SmePart; -/**************************************************************** - * - * Full instance record declaration - * - ****************************************************************/ - +/* Full instance record */ typedef struct _SmeRec { - ObjectPart object; - RectObjPart rectangle; - SmePart sme; + ObjectPart object; + RectObjPart rectangle; + SmePart sme; } SmeRec; -/************************************************************ - * - * Private declarations. - * - ************************************************************/ - -typedef void (*_XawEntryVoidFunc)(); - -#define XtInheritHighlight ((_XawEntryVoidFunc) _XtInherit) +#define XtInheritHighlight ((XtWidgetProc)_XtInherit) #define XtInheritUnhighlight XtInheritHighlight #define XtInheritNotify XtInheritHighlight +_XFUNCPROTOEND + #endif /* _XawSmeP_h */ |