diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/X11/CallbackI.h | 19 | ||||
| -rw-r--r-- | include/X11/Composite.h | 15 | ||||
| -rw-r--r-- | include/X11/ConvertI.h | 12 | ||||
| -rw-r--r-- | include/X11/EventI.h | 14 | ||||
| -rw-r--r-- | include/X11/InitialI.h | 44 | ||||
| -rw-r--r-- | include/X11/Intrinsic.h | 626 | ||||
| -rw-r--r-- | include/X11/IntrinsicI.h | 18 | ||||
| -rw-r--r-- | include/X11/IntrinsicP.h | 49 | ||||
| -rw-r--r-- | include/X11/PassivGraI.h | 18 | ||||
| -rw-r--r-- | include/X11/ResConfigP.h | 4 | ||||
| -rw-r--r-- | include/X11/ResourceI.h | 10 | ||||
| -rw-r--r-- | include/X11/ThreadsI.h | 14 | ||||
| -rw-r--r-- | include/X11/TranslateI.h | 78 | ||||
| -rw-r--r-- | include/X11/VarargsI.h | 16 | ||||
| -rw-r--r-- | include/X11/Xtos.h | 22 |
15 files changed, 24 insertions, 935 deletions
diff --git a/include/X11/CallbackI.h b/include/X11/CallbackI.h index 9d4db98..b45ef68 100644 --- a/include/X11/CallbackI.h +++ b/include/X11/CallbackI.h @@ -45,6 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ +/* $XFree86: xc/lib/Xt/CallbackI.h,v 1.4 2003/10/24 15:47:35 tsi Exp $ */ /**************************************************************** * @@ -68,67 +69,49 @@ typedef struct internalCallbackRec { } InternalCallbackRec, *InternalCallbackList; typedef Boolean (*_XtConditionProc)( -#if NeedFunctionPrototypes XtPointer /* data */ -#endif ); extern void _XtAddCallback( -#if NeedFunctionPrototypes InternalCallbackList* /* callbacks */, XtCallbackProc /* callback */, XtPointer /* closure */ -#endif ); extern void _XtAddCallbackOnce( -#if NeedFunctionPrototypes InternalCallbackList* /* callbacks */, XtCallbackProc /* callback */, XtPointer /* closure */ -#endif ); extern InternalCallbackList _XtCompileCallbackList( -#if NeedFunctionPrototypes XtCallbackList /* xtcallbacks */ -#endif ); extern XtCallbackList _XtGetCallbackList( -#if NeedFunctionPrototypes InternalCallbackList* /* callbacks */ -#endif ); extern void _XtRemoveAllCallbacks( -#if NeedFunctionPrototypes InternalCallbackList* /* callbacks */ -#endif ); extern void _XtRemoveCallback( -#if NeedFunctionPrototypes InternalCallbackList* /* callbacks */, XtCallbackProc /* callback */, XtPointer /* closure */ -#endif ); extern void _XtPeekCallback( -#if NeedFunctionPrototypes Widget /* widget */, XtCallbackList /* callbacks */, XtCallbackProc * /* callback */, XtPointer * /* closure */ -#endif ); extern void _XtCallConditionalCallbackList( -#if NeedFunctionPrototypes Widget /* widget */, XtCallbackList /* callbacks */, XtPointer /* call_data */, _XtConditionProc /* cond_proc */ -#endif ); diff --git a/include/X11/Composite.h b/include/X11/Composite.h index 4c1e029..90a8ba4 100644 --- a/include/X11/Composite.h +++ b/include/X11/Composite.h @@ -46,6 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ +/* $XFree86: xc/lib/Xt/Composite.h,v 1.4 2003/10/24 15:47:35 tsi Exp $ */ #ifndef _XtComposite_h #define _XtComposite_h @@ -53,59 +54,45 @@ SOFTWARE. typedef struct _CompositeClassRec *CompositeWidgetClass; typedef Cardinal (*XtOrderProc)( -#if NeedFunctionPrototypes Widget /* child */ -#endif ); _XFUNCPROTOBEGIN extern void XtManageChildren( -#if NeedFunctionPrototypes WidgetList /* children */, Cardinal /* num_children */ -#endif ); extern void XtManageChild( -#if NeedFunctionPrototypes Widget /* child */ -#endif ); extern void XtUnmanageChildren( -#if NeedFunctionPrototypes WidgetList /* children */, Cardinal /* num_children */ -#endif ); extern void XtUnmanageChild( -#if NeedFunctionPrototypes Widget /* child */ -#endif ); typedef void (*XtDoChangeProc)( -#if NeedFunctionPrototypes Widget /* composite_parent */, WidgetList /* unmanage_children */, Cardinal * /* num_unmanage_children */, WidgetList /* manage_children */, Cardinal * /* num_manage_children */, XtPointer /* client_data */ -#endif ); extern void XtChangeManagedSet( -#if NeedFunctionPrototypes WidgetList /* unmanage_children */, Cardinal /* num_unmanage_children */, XtDoChangeProc /* do_change_proc */, XtPointer /* client_data */, WidgetList /* manage_children */, Cardinal /* num_manage_children */ -#endif ); _XFUNCPROTOEND diff --git a/include/X11/ConvertI.h b/include/X11/ConvertI.h index 13689ab..674fdfb 100644 --- a/include/X11/ConvertI.h +++ b/include/X11/ConvertI.h @@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xt/ConvertI.h,v 1.3 2001/12/14 19:56:09 dawes Exp $ */ +/* $XFree86: xc/lib/Xt/ConvertI.h,v 1.4 2003/04/21 16:34:26 herrb Exp $ */ /* Representation types */ @@ -59,25 +59,18 @@ extern XrmQuark _XtQString; typedef struct _ConverterRec **ConverterTable; extern void _XtAddDefaultConverters( -#if NeedFunctionPrototypes ConverterTable /* table */ -#endif ); extern void _XtSetDefaultConverterTable( -#if NeedFunctionPrototypes ConverterTable* /* table */ -#endif ); extern void _XtFreeConverterTable( -#if NeedFunctionPrototypes ConverterTable /* table */ -#endif ); extern void _XtTableAddConverter( -#if NeedFunctionPrototypes ConverterTable /* table */, XrmRepresentation /* from_type */, XrmRepresentation /* to_type */, @@ -88,18 +81,15 @@ extern void _XtTableAddConverter( XtCacheType /* cache_type */, XtDestructor /* destructor */, _XtBoolean /* global */ -#endif ); extern Boolean _XtConvert( -#if NeedFunctionPrototypes Widget /* widget */, XrmRepresentation /* from_type */, XrmValuePtr /* from */, XrmRepresentation /* to_type */, XrmValuePtr /* to */, XtCacheRef* /* cache_ref_return */ -#endif ); void _XtConvertInitialize(void); diff --git a/include/X11/EventI.h b/include/X11/EventI.h index 73c9770..e2d7564 100644 --- a/include/X11/EventI.h +++ b/include/X11/EventI.h @@ -47,7 +47,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xt/EventI.h,v 1.3 2001/12/14 19:56:12 dawes Exp $ */ +/* $XFree86: xc/lib/Xt/EventI.h,v 1.4 2003/04/21 16:34:27 herrb Exp $ */ /* * Event.h - exported types and functions for toolkit event handler @@ -66,9 +66,7 @@ typedef struct _XtGrabRec *XtGrabList; #include "PassivGraI.h" extern void _XtEventInitialize( -#if NeedFunctionPrototypes void -#endif ); typedef struct _XtEventRec { @@ -96,35 +94,25 @@ typedef struct _BlockHookRec { } BlockHookRec, *BlockHook; extern void _XtFreeEventTable( -#if NeedFunctionPrototypes XtEventTable* /* event_table */ -#endif ); extern Boolean _XtOnGrabList( -#if NeedFunctionPrototypes Widget /* widget */, XtGrabRec* /* grabList */ -#endif ); extern void _XtRemoveAllInputs( -#if NeedFunctionPrototypes XtAppContext /* app */ -#endif ); extern void _XtRefreshMapping( -#if NeedFunctionPrototypes XEvent* /* event */, _XtBoolean /* dispatch */ -#endif ); extern EventMask _XtConvertTypeToMask( -#if NeedFunctionPrototypes int /* eventType */ -#endif ); /* EventUtil.c */ diff --git a/include/X11/InitialI.h b/include/X11/InitialI.h index 0fe1d25..b5f185c 100644 --- a/include/X11/InitialI.h +++ b/include/X11/InitialI.h @@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xt/InitialI.h,v 3.10 2001/12/14 19:56:18 dawes Exp $ */ +/* $XFree86: xc/lib/Xt/InitialI.h,v 3.11 2003/04/21 16:34:27 herrb Exp $ */ #ifndef _XtinitialI_h #define _XtinitialI_h @@ -208,12 +208,10 @@ extern void _XtHeapFree(Heap* heap); extern char *_XtHeapMalloc( -#if NeedFunctionPrototypes Heap* /* heap */, Cardinal /* size */, char * /* file */, int /* line */ -#endif ); #define _XtHeapAlloc(heap,bytes) _XtHeapMalloc(heap, bytes, __FILE__, __LINE__) @@ -221,44 +219,33 @@ extern char *_XtHeapMalloc( #else /* XTTRACEMEMORY */ extern char* _XtHeapAlloc( -#if NeedFunctionPrototypes Heap* /* heap */, Cardinal /* size */ -#endif ); #endif /* XTTRACEMEMORY */ extern void _XtSetDefaultErrorHandlers( -#if NeedFunctionPrototypes XtErrorMsgHandler* /* errMsg */, XtErrorMsgHandler* /* warnMsg */, XtErrorHandler* /* err */, XtErrorHandler* /* warn */ -#endif ); extern void _XtSetDefaultSelectionTimeout( -#if NeedFunctionPrototypes unsigned long* /* timeout */ -#endif ); extern XtAppContext _XtDefaultAppContext( -#if NeedFunctionPrototypes void -#endif ); extern ProcessContext _XtGetProcessContext( -#if NeedFunctionPrototypes void -#endif ); Display * _XtAppInit( -#if NeedFunctionPrototypes XtAppContext* /* app_context_return */, String /* application_class */, XrmOptionDescRec* /* options */, @@ -266,25 +253,19 @@ _XtAppInit( int* /* argc_in_out */, String** /* argv_in_out */, String* /* fallback_resources */ -#endif ); extern void _XtDestroyAppContexts( -#if NeedFunctionPrototypes void -#endif ); extern void _XtCloseDisplays( -#if NeedFunctionPrototypes XtAppContext /* app */ -#endif ); extern int _XtAppDestroyCount; extern int _XtWaitForSomething( -#if NeedFunctionPrototypes XtAppContext /* app */, _XtBoolean /* ignoreEvents */, _XtBoolean /* ignoreTimers */, @@ -295,7 +276,6 @@ extern int _XtWaitForSomething( _XtBoolean /* drop_lock */, #endif unsigned long* /* howlong */ -#endif ); typedef struct _CaseConverterRec *CaseConverterPtr; @@ -365,21 +345,15 @@ typedef struct _PerDisplayTable { extern PerDisplayTablePtr _XtperDisplayList; extern XtPerDisplay _XtSortPerDisplayList( -#if NeedFunctionPrototypes Display* /* dpy */ -#endif ); extern XtPerDisplay _XtGetPerDisplay( -#if NeedFunctionPrototypes Display* /* dpy */ -#endif ); extern XtPerDisplayInputRec* _XtGetPerDisplayInput( -#if NeedFunctionPrototypes Display* /* dpy */ -#endif ); #if 0 @@ -405,7 +379,6 @@ extern XtPerDisplayInputRec* _XtGetPerDisplayInput( #endif extern void _XtDisplayInitialize( -#if NeedFunctionPrototypes Display* /* dpy */, XtPerDisplay /* pd */, _Xconst char* /* name */, @@ -413,53 +386,38 @@ extern void _XtDisplayInitialize( Cardinal /* num_urs */, int* /* argc */, char** /* argv */ -#endif ); extern void _XtCacheFlushTag( -#if NeedFunctionPrototypes XtAppContext /* app */, XtPointer /* tag */ -#endif ); extern void _XtFreeActions( -#if NeedFunctionPrototypes struct _ActionListRec* /* action_table */ -#endif ); extern void _XtDoPhase2Destroy( -#if NeedFunctionPrototypes XtAppContext /* app */, int /* dispatch_level */ -#endif ); extern void _XtDoFreeBindings( -#if NeedFunctionPrototypes XtAppContext /* app */ -#endif ); extern void _XtExtensionSelect( -#if NeedFunctionPrototypes Widget /* widget */ -#endif ); #define _XtSafeToDestroy(app) ((app)->dispatch_level == 0) extern void _XtAllocWWTable( -#if NeedFunctionPrototypes XtPerDisplay pd -#endif ); extern void _XtFreeWWTable( -#if NeedFunctionPrototypes XtPerDisplay pd -#endif ); extern String _XtGetUserName(String dest, int len); diff --git a/include/X11/Intrinsic.h b/include/X11/Intrinsic.h index 3d41150..edbdfc2 100644 --- a/include/X11/Intrinsic.h +++ b/include/X11/Intrinsic.h @@ -48,7 +48,7 @@ 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/Xt/Intrinsic.h,v 3.8 2001/12/14 19:56:22 dawes Exp $ */ +/* $XFree86: xc/lib/Xt/Intrinsic.h,v 3.9 2003/04/21 16:34:27 herrb Exp $ */ #ifndef _XtIntrinsic_h #define _XtIntrinsic_h @@ -68,8 +68,6 @@ in this Software without prior written authorization from The Open Group. typedef char *String; -#if NeedFunctionPrototypes - /* We do this in order to get "const" declarations to work right. We * use _XtString instead of String so that C++ applications can * #define String to something else if they choose, to avoid conflicts @@ -92,8 +90,6 @@ typedef char *String; #define _XtXtEnum XtEnum #endif /* NeedWidePrototypes */ -#endif /* NeedFunctionPrototypes */ - #include <stddef.h> #ifdef VMS @@ -168,11 +164,7 @@ typedef unsigned int Cardinal; typedef unsigned short Dimension; /* Size in pixels */ typedef short Position; /* Offset from 0 coordinate */ -#if NeedFunctionPrototypes typedef void* XtPointer; -#else -typedef char* XtPointer; -#endif /* The type Opaque is NOT part of the Xt standard, do NOT use it. */ /* (It remains here only for backward compatibility.) */ @@ -189,12 +181,10 @@ typedef struct _TranslationData *XtAccelerators; typedef unsigned int Modifiers; typedef void (*XtActionProc)( -#if NeedFunctionPrototypes Widget /* widget */, XEvent* /* event */, String* /* params */, Cardinal* /* num_params */ -#endif ); typedef XtActionProc* XtBoundActions; @@ -223,11 +213,9 @@ typedef struct { } XtConvertArgRec, *XtConvertArgList; typedef void (*XtConvertArgProc)( -#if NeedFunctionPrototypes Widget /* widget */, Cardinal* /* size */, XrmValue* /* value */ -#endif ); typedef struct { @@ -245,33 +233,27 @@ typedef struct { #define XtSMDontChange 5 typedef void (*XtConverter)( /* obsolete */ -#if NeedFunctionPrototypes XrmValue* /* args */, Cardinal* /* num_args */, XrmValue* /* from */, XrmValue* /* to */ -#endif ); typedef Boolean (*XtTypeConverter)( -#if NeedFunctionPrototypes Display* /* dpy */, XrmValue* /* args */, Cardinal* /* num_args */, XrmValue* /* from */, XrmValue* /* to */, XtPointer* /* converter_data */ -#endif ); typedef void (*XtDestructor)( -#if NeedFunctionPrototypes XtAppContext /* app */, XrmValue* /* to */, XtPointer /* converter_data */, XrmValue* /* args */, Cardinal* /* num_args */ -#endif ); typedef Opaque XtCacheRef; @@ -279,50 +261,40 @@ typedef Opaque XtCacheRef; typedef Opaque XtActionHookId; typedef void (*XtActionHookProc)( -#if NeedFunctionPrototypes Widget /* w */, XtPointer /* client_data */, String /* action_name */, XEvent* /* event */, String* /* params */, Cardinal* /* num_params */ -#endif ); typedef unsigned long XtBlockHookId; typedef void (*XtBlockHookProc)( -#if NeedFunctionPrototypes XtPointer /* client_data */ -#endif ); typedef void (*XtKeyProc)( -#if NeedFunctionPrototypes Display* /* dpy */, _XtKeyCode /* keycode */, Modifiers /* modifiers */, Modifiers* /* modifiers_return */, KeySym* /* keysym_return */ -#endif ); typedef void (*XtCaseProc)( -#if NeedFunctionPrototypes Display* /* display */, KeySym /* keysym */, KeySym* /* lower_return */, KeySym* /* upper_return */ -#endif ); typedef void (*XtEventHandler)( -#if NeedFunctionPrototypes Widget /* widget */, XtPointer /* closure */, XEvent* /* event */, Boolean* /* continue_to_dispatch */ -#endif ); typedef unsigned long EventMask; @@ -335,25 +307,19 @@ typedef unsigned long XtInputMask; #define XtInputExceptMask (1L<<2) typedef void (*XtTimerCallbackProc)( -#if NeedFunctionPrototypes XtPointer /* closure */, XtIntervalId* /* id */ -#endif ); typedef void (*XtInputCallbackProc)( -#if NeedFunctionPrototypes XtPointer /* closure */, int* /* source */, XtInputId* /* id */ -#endif ); typedef void (*XtSignalCallbackProc)( -#if NeedFunctionPrototypes XtPointer /* closure */, XtSignalId* /* id */ -#endif ); typedef struct { @@ -364,11 +330,9 @@ typedef struct { typedef XtPointer XtVarArgsList; typedef void (*XtCallbackProc)( -#if NeedFunctionPrototypes Widget /* widget */, XtPointer /* closure */, /* data the application registered */ XtPointer /* call_data */ /* callback specific data */ -#endif ); typedef struct _XtCallbackRec { @@ -407,48 +371,36 @@ typedef struct _XtResource { } XtResource, *XtResourceList; typedef void (*XtResourceDefaultProc)( -#if NeedFunctionPrototypes Widget /* widget */, int /* offset */, XrmValue* /* value */ -#endif ); typedef String (*XtLanguageProc)( -#if NeedFunctionPrototypes Display* /* dpy */, String /* xnl */, XtPointer /* client_data */ -#endif ); typedef void (*XtErrorMsgHandler)( -#if NeedFunctionPrototypes String /* name */, String /* type */, String /* class */, String /* default */, String* /* params */, Cardinal* /* num_params */ -#endif ); typedef void (*XtErrorHandler)( -#if NeedFunctionPrototypes String /* msg */ -#endif ); typedef void (*XtCreatePopupChildProc)( -#if NeedFunctionPrototypes Widget /* shell */ -#endif ); typedef Boolean (*XtWorkProc)( -#if NeedFunctionPrototypes XtPointer /* closure */ /* data the application registered */ -#endif ); typedef struct { @@ -457,15 +409,12 @@ typedef struct { } SubstitutionRec, *Substitution; typedef Boolean (*XtFilePredicate)( -#if NeedFunctionPrototypes String /* filename */ -#endif ); typedef XtPointer XtRequestId; typedef Boolean (*XtConvertSelectionProc)( -#if NeedFunctionPrototypes Widget /* widget */, Atom* /* selection */, Atom* /* target */, @@ -473,26 +422,20 @@ typedef Boolean (*XtConvertSelectionProc)( XtPointer* /* value_return */, unsigned long* /* length_return */, int* /* format_return */ -#endif ); typedef void (*XtLoseSelectionProc)( -#if NeedFunctionPrototypes Widget /* widget */, Atom* /* selection */ -#endif ); typedef void (*XtSelectionDoneProc)( -#if NeedFunctionPrototypes Widget /* widget */, Atom* /* selection */, Atom* /* target */ -#endif ); typedef void (*XtSelectionCallbackProc)( -#if NeedFunctionPrototypes Widget /* widget */, XtPointer /* closure */, Atom* /* selection */, @@ -500,29 +443,23 @@ typedef void (*XtSelectionCallbackProc)( XtPointer /* value */, unsigned long* /* length */, int* /* format */ -#endif ); typedef void (*XtLoseSelectionIncrProc)( -#if NeedFunctionPrototypes Widget /* widget */, Atom* /* selection */, XtPointer /* client_data */ -#endif ); typedef void (*XtSelectionDoneIncrProc)( -#if NeedFunctionPrototypes Widget /* widget */, Atom* /* selection */, Atom* /* target */, XtRequestId* /* receiver_id */, XtPointer /* client_data */ -#endif ); typedef Boolean (*XtConvertSelectionIncrProc)( -#if NeedFunctionPrototypes Widget /* widget */, Atom* /* selection */, Atom* /* target */, @@ -533,33 +470,26 @@ typedef Boolean (*XtConvertSelectionIncrProc)( unsigned long* /* max_length */, XtPointer /* client_data */, XtRequestId* /* receiver_id */ -#endif ); typedef void (*XtCancelConvertSelectionProc)( -#if NeedFunctionPrototypes Widget /* widget */, Atom* /* selection */, Atom* /* target */, XtRequestId* /* receiver_id */, XtPointer /* client_data */ -#endif ); typedef Boolean (*XtEventDispatchProc)( -#if NeedFunctionPrototypes XEvent* /* event */ -#endif ); typedef void (*XtExtensionSelectProc)( -#if NeedFunctionPrototypes Widget /* widget */, int* /* event_types */, XtPointer* /* select_data */, int /* count */, XtPointer /* client_data */ -#endif ); /*************************************************************** @@ -571,17 +501,14 @@ typedef void (*XtExtensionSelectProc)( _XFUNCPROTOBEGIN extern Boolean XtConvertAndStore( -#if NeedFunctionPrototypes Widget /* widget */, _Xconst _XtString /* from_type */, XrmValue* /* from */, _Xconst _XtString /* to_type */, XrmValue* /* to_in_out */ -#endif ); extern Boolean XtCallConverter( -#if NeedFunctionPrototypes Display* /* dpy */, XtTypeConverter /* converter */, XrmValuePtr /* args */, @@ -589,95 +516,69 @@ extern Boolean XtCallConverter( XrmValuePtr /* from */, XrmValue* /* to_in_out */, XtCacheRef* /* cache_ref_return */ -#endif ); extern Boolean XtDispatchEvent( -#if NeedFunctionPrototypes XEvent* /* event */ -#endif ); extern Boolean XtCallAcceptFocus( -#if NeedFunctionPrototypes Widget /* widget */, Time* /* time */ -#endif ); extern Boolean XtPeekEvent( /* obsolete */ -#if NeedFunctionPrototypes XEvent* /* event_return */ -#endif ); extern Boolean XtAppPeekEvent( -#if NeedFunctionPrototypes XtAppContext /* app_context */, XEvent* /* event_return */ -#endif ); extern Boolean XtIsSubclass( -#if NeedFunctionPrototypes Widget /* widget */, WidgetClass /* widgetClass */ -#endif ); extern Boolean XtIsObject( -#if NeedFunctionPrototypes Widget /* object */ -#endif ); extern Boolean _XtCheckSubclassFlag( /* implementation-private */ -#if NeedFunctionPrototypes Widget /* object */, _XtXtEnum /* type_flag */ -#endif ); extern Boolean _XtIsSubclassOf( /* implementation-private */ -#if NeedFunctionPrototypes Widget /* object */, WidgetClass /* widget_class */, WidgetClass /* flag_class */, _XtXtEnum /* type_flag */ -#endif ); extern Boolean XtIsManaged( -#if NeedFunctionPrototypes Widget /* rectobj */ -#endif ); extern Boolean XtIsRealized( -#if NeedFunctionPrototypes Widget /* widget */ -#endif ); extern Boolean XtIsSensitive( -#if NeedFunctionPrototypes Widget /* widget */ -#endif ); extern Boolean XtOwnSelection( -#if NeedFunctionPrototypes Widget /* widget */, Atom /* selection */, Time /* time */, XtConvertSelectionProc /* convert */, XtLoseSelectionProc /* lose */, XtSelectionDoneProc /* done */ -#endif ); extern Boolean XtOwnSelectionIncremental( -#if NeedFunctionPrototypes Widget /* widget */, Atom /* selection */, Time /* time */, @@ -686,87 +587,69 @@ extern Boolean XtOwnSelectionIncremental( XtSelectionDoneIncrProc /* done_callback */, XtCancelConvertSelectionProc /* cancel_callback */, XtPointer /* client_data */ -#endif ); extern XtGeometryResult XtMakeResizeRequest( -#if NeedFunctionPrototypes Widget /* widget */, _XtDimension /* width */, _XtDimension /* height */, Dimension* /* width_return */, Dimension* /* height_return */ -#endif ); extern void XtTranslateCoords( -#if NeedFunctionPrototypes Widget /* widget */, _XtPosition /* x */, _XtPosition /* y */, Position* /* rootx_return */, Position* /* rooty_return */ -#endif ); extern KeySym* XtGetKeysymTable( -#if NeedFunctionPrototypes Display* /* dpy */, KeyCode* /* min_keycode_return */, int* /* keysyms_per_keycode_return */ -#endif ); extern void XtKeysymToKeycodeList( -#if NeedFunctionPrototypes Display* /* dpy */, KeySym /* keysym */, KeyCode** /* keycodes_return */, Cardinal* /* keycount_return */ -#endif ); extern void XtStringConversionWarning( /* obsolete */ -#if NeedFunctionPrototypes _Xconst _XtString /* from_value */, _Xconst _XtString /* to_type */ -#endif ); extern void XtDisplayStringConversionWarning( -#if NeedFunctionPrototypes Display* /* dpy */, _Xconst _XtString /* from_value */, _Xconst _XtString /* to_type */ -#endif ); externalref XtConvertArgRec const colorConvertArgs[]; externalref XtConvertArgRec const screenConvertArg[]; extern void XtAppAddConverter( /* obsolete */ -#if NeedFunctionPrototypes XtAppContext /* app_context */, _Xconst _XtString /* from_type */, _Xconst _XtString /* to_type */, XtConverter /* converter */, XtConvertArgList /* convert_args */, Cardinal /* num_args */ -#endif ); extern void XtAddConverter( /* obsolete */ -#if NeedFunctionPrototypes _Xconst _XtString /* from_type */, _Xconst _XtString /* to_type */, XtConverter /* converter */, XtConvertArgList /* convert_args */, Cardinal /* num_args */ -#endif ); extern void XtSetTypeConverter( -#if NeedFunctionPrototypes _Xconst _XtString /* from_type */, _Xconst _XtString /* to_type */, XtTypeConverter /* converter */, @@ -774,11 +657,9 @@ extern void XtSetTypeConverter( Cardinal /* num_args */, XtCacheType /* cache_type */, XtDestructor /* destructor */ -#endif ); extern void XtAppSetTypeConverter( -#if NeedFunctionPrototypes XtAppContext /* app_context */, _Xconst _XtString /* from_type */, _Xconst _XtString /* to_type */, @@ -787,27 +668,22 @@ extern void XtAppSetTypeConverter( Cardinal /* num_args */, XtCacheType /* cache_type */, XtDestructor /* destructor */ -#endif ); extern void XtConvert( /* obsolete */ -#if NeedFunctionPrototypes Widget /* widget */, _Xconst _XtString /* from_type */, XrmValue* /* from */, _Xconst _XtString /* to_type */, XrmValue* /* to_return */ -#endif ); extern void XtDirectConvert( /* obsolete */ -#if NeedFunctionPrototypes XtConverter /* converter */, XrmValuePtr /* args */, Cardinal /* num_args */, XrmValuePtr /* from */, XrmValue* /* to_return */ -#endif ); /**************************************************************** @@ -817,126 +693,92 @@ extern void XtDirectConvert( /* obsolete */ ****************************************************************/ extern XtTranslations XtParseTranslationTable( -#if NeedFunctionPrototypes _Xconst _XtString /* table */ -#endif ); extern XtAccelerators XtParseAcceleratorTable( -#if NeedFunctionPrototypes _Xconst _XtString /* source */ -#endif ); extern void XtOverrideTranslations( -#if NeedFunctionPrototypes Widget /* widget */, XtTranslations /* translations */ -#endif ); extern void XtAugmentTranslations( -#if NeedFunctionPrototypes Widget /* widget */, XtTranslations /* translations */ -#endif ); extern void XtInstallAccelerators( -#if NeedFunctionPrototypes Widget /* destination */, Widget /* source */ -#endif ); extern void XtInstallAllAccelerators( -#if NeedFunctionPrototypes Widget /* destination */, Widget /* source */ -#endif ); extern void XtUninstallTranslations( -#if NeedFunctionPrototypes Widget /* widget */ -#endif ); extern void XtAppAddActions( -#if NeedFunctionPrototypes XtAppContext /* app_context */, XtActionList /* actions */, Cardinal /* num_actions */ -#endif ); extern void XtAddActions( /* obsolete */ -#if NeedFunctionPrototypes XtActionList /* actions */, Cardinal /* num_actions */ -#endif ); extern XtActionHookId XtAppAddActionHook( -#if NeedFunctionPrototypes XtAppContext /* app_context */, XtActionHookProc /* proc */, XtPointer /* client_data */ -#endif ); extern void XtRemoveActionHook( -#if NeedFunctionPrototypes XtActionHookId /* id */ -#endif ); extern void XtGetActionList( -#if NeedFunctionPrototypes WidgetClass /* widget_class */, XtActionList* /* actions_return */, Cardinal* /* num_actions_return */ -#endif ); extern void XtCallActionProc( -#if NeedFunctionPrototypes Widget /* widget */, _Xconst _XtString /* action */, XEvent* /* event */, String* /* params */, Cardinal /* num_params */ -#endif ); extern void XtRegisterGrabAction( -#if NeedFunctionPrototypes XtActionProc /* action_proc */, _XtBoolean /* owner_events */, unsigned int /* event_mask */, int /* pointer_mode */, int /* keyboard_mode */ -#endif ); extern void XtSetMultiClickTime( -#if NeedFunctionPrototypes Display* /* dpy */, int /* milliseconds */ -#endif ); extern int XtGetMultiClickTime( -#if NeedFunctionPrototypes Display* /* dpy */ -#endif ); extern KeySym XtGetActionKeysym( -#if NeedFunctionPrototypes XEvent* /* event */, Modifiers* /* modifiers_return */ -#endif ); /*************************************************************** @@ -946,48 +788,38 @@ extern KeySym XtGetActionKeysym( ****************************************************************/ extern void XtTranslateKeycode( -#if NeedFunctionPrototypes Display* /* dpy */, _XtKeyCode /* keycode */, Modifiers /* modifiers */, Modifiers* /* modifiers_return */, KeySym* /* keysym_return */ -#endif ); extern void XtTranslateKey( -#if NeedFunctionPrototypes Display* /* dpy */, _XtKeyCode /* keycode */, Modifiers /* modifiers */, Modifiers* /* modifiers_return */, KeySym* /* keysym_return */ -#endif ); extern void XtSetKeyTranslator( -#if NeedFunctionPrototypes Display* /* dpy */, XtKeyProc /* proc */ -#endif ); extern void XtRegisterCaseConverter( -#if NeedFunctionPrototypes Display* /* dpy */, XtCaseProc /* proc */, KeySym /* start */, KeySym /* stop */ -#endif ); extern void XtConvertCase( -#if NeedFunctionPrototypes Display* /* dpy */, KeySym /* keysym */, KeySym* /* lower_return */, KeySym* /* upper_return */ -#endif ); /**************************************************************** @@ -1002,188 +834,142 @@ extern void XtConvertCase( #define XtAllEvents ((EventMask) -1L) extern void XtAddEventHandler( -#if NeedFunctionPrototypes Widget /* widget */, EventMask /* event_mask */, _XtBoolean /* nonmaskable */, XtEventHandler /* proc */, XtPointer /* closure */ -#endif ); extern void XtRemoveEventHandler( -#if NeedFunctionPrototypes Widget /* widget */, EventMask /* event_mask */, _XtBoolean /* nonmaskable */, XtEventHandler /* proc */, XtPointer /* closure */ -#endif ); extern void XtAddRawEventHandler( -#if NeedFunctionPrototypes Widget /* widget */, EventMask /* event_mask */, _XtBoolean /* nonmaskable */, XtEventHandler /* proc */, XtPointer /* closure */ -#endif ); extern void XtRemoveRawEventHandler( -#if NeedFunctionPrototypes Widget /* widget */, EventMask /* event_mask */, _XtBoolean /* nonmaskable */, XtEventHandler /* proc */, XtPointer /* closure */ -#endif ); extern void XtInsertEventHandler( -#if NeedFunctionPrototypes Widget /* widget */, EventMask /* event_mask */, _XtBoolean /* nonmaskable */, XtEventHandler /* proc */, XtPointer /* closure */, XtListPosition /* position */ -#endif ); extern void XtInsertRawEventHandler( -#if NeedFunctionPrototypes Widget /* widget */, EventMask /* event_mask */, _XtBoolean /* nonmaskable */, XtEventHandler /* proc */, XtPointer /* closure */, XtListPosition /* position */ -#endif ); extern XtEventDispatchProc XtSetEventDispatcher( -#if NeedFunctionPrototypes Display* /* dpy */, int /* event_type */, XtEventDispatchProc /* proc */ -#endif ); extern Boolean XtDispatchEventToWidget( -#if NeedFunctionPrototypes Widget /* widget */, XEvent* /* event */ -#endif ); extern void XtInsertEventTypeHandler( -#if NeedFunctionPrototypes Widget /* widget */, int /* type */, XtPointer /* select_data */, XtEventHandler /* proc */, XtPointer /* closure */, XtListPosition /* position */ -#endif ); extern void XtRemoveEventTypeHandler( -#if NeedFunctionPrototypes Widget /* widget */, int /* type */, XtPointer /* select_data */, XtEventHandler /* proc */, XtPointer /* closure */ -#endif ); extern EventMask XtBuildEventMask( -#if NeedFunctionPrototypes Widget /* widget */ -#endif ); extern void XtRegisterExtensionSelector( -#if NeedFunctionPrototypes Display* /* dpy */, int /* min_event_type */, int /* max_event_type */, XtExtensionSelectProc /* proc */, XtPointer /* client_data */ -#endif ); extern void XtAddGrab( -#if NeedFunctionPrototypes Widget /* widget */, _XtBoolean /* exclusive */, _XtBoolean /* spring_loaded */ -#endif ); extern void XtRemoveGrab( -#if NeedFunctionPrototypes Widget /* widget */ -#endif ); extern void XtProcessEvent( /* obsolete */ -#if NeedFunctionPrototypes XtInputMask /* mask */ -#endif ); extern void XtAppProcessEvent( -#if NeedFunctionPrototypes XtAppContext /* app_context */, XtInputMask /* mask */ -#endif ); extern void XtMainLoop( /* obsolete */ -#if NeedFunctionPrototypes void -#endif ); extern void XtAppMainLoop( -#if NeedFunctionPrototypes XtAppContext /* app_context */ -#endif ); extern void XtAddExposureToRegion( -#if NeedFunctionPrototypes XEvent* /* event */, Region /* region */ -#endif ); extern void XtSetKeyboardFocus( -#if NeedFunctionPrototypes Widget /* subtree */, Widget /* descendent */ -#endif ); extern Widget XtGetKeyboardFocusWidget( -#if NeedFunctionPrototypes Widget /* widget */ -#endif ); extern XEvent* XtLastEventProcessed( -#if NeedFunctionPrototypes Display* /* dpy */ -#endif ); extern Time XtLastTimestampProcessed( -#if NeedFunctionPrototypes Display* /* dpy */ -#endif ); /**************************************************************** @@ -1193,84 +979,62 @@ extern Time XtLastTimestampProcessed( ****************************************************************/ extern XtIntervalId XtAddTimeOut( /* obsolete */ -#if NeedFunctionPrototypes unsigned long /* interval */, XtTimerCallbackProc /* proc */, XtPointer /* closure */ -#endif ); extern XtIntervalId XtAppAddTimeOut( -#if NeedFunctionPrototypes XtAppContext /* app_context */, unsigned long /* interval */, XtTimerCallbackProc /* proc */, XtPointer /* closure */ -#endif ); extern void XtRemoveTimeOut( -#if NeedFunctionPrototypes XtIntervalId /* timer */ -#endif ); extern XtInputId XtAddInput( /* obsolete */ -#if NeedFunctionPrototypes int /* source */, XtPointer /* condition */, XtInputCallbackProc /* proc */, XtPointer /* closure */ -#endif ); extern XtInputId XtAppAddInput( -#if NeedFunctionPrototypes XtAppContext /* app_context */, int /* source */, XtPointer /* condition */, XtInputCallbackProc /* proc */, XtPointer /* closure */ -#endif ); extern void XtRemoveInput( -#if NeedFunctionPrototypes XtInputId /* id */ -#endif ); extern XtSignalId XtAppAddSignal( -#if NeedFunctionPrototypes XtAppContext /* app_context */, XtSignalCallbackProc /* proc */, XtPointer /* closure */ -#endif ); extern void XtRemoveSignal( -#if NeedFunctionPrototypes XtSignalId /* id */ -#endif ); extern void XtNoticeSignal( -#if NeedFunctionPrototypes XtSignalId /* id */ -#endif ); extern void XtNextEvent( /* obsolete */ -#if NeedFunctionPrototypes XEvent* /* event */ -#endif ); extern void XtAppNextEvent( -#if NeedFunctionPrototypes XtAppContext /* app_context */, XEvent* /* event_return */ -#endif ); #define XtIMXEvent 1 @@ -1280,29 +1044,21 @@ extern void XtAppNextEvent( #define XtIMAll (XtIMXEvent | XtIMTimer | XtIMAlternateInput | XtIMSignal) extern Boolean XtPending( /* obsolete */ -#if NeedFunctionPrototypes void -#endif ); extern XtInputMask XtAppPending( -#if NeedFunctionPrototypes XtAppContext /* app_context */ -#endif ); extern XtBlockHookId XtAppAddBlockHook( -#if NeedFunctionPrototypes XtAppContext /* app_context */, XtBlockHookProc /* proc */, XtPointer /* client_data */ -#endif ); extern void XtRemoveBlockHook( -#if NeedFunctionPrototypes XtBlockHookId /* id */ -#endif ); /**************************************************************** @@ -1335,59 +1091,43 @@ extern void XtRemoveBlockHook( (WidgetClass)topLevelShellWidgetClass, (XtEnum)0x80)) extern void XtRealizeWidget( -#if NeedFunctionPrototypes Widget /* widget */ -#endif ); void XtUnrealizeWidget( -#if NeedFunctionPrototypes Widget /* widget */ -#endif ); extern void XtDestroyWidget( -#if NeedFunctionPrototypes Widget /* widget */ -#endif ); extern void XtSetSensitive( -#if NeedFunctionPrototypes Widget /* widget */, _XtBoolean /* sensitive */ -#endif ); extern void XtSetMappedWhenManaged( -#if NeedFunctionPrototypes Widget /* widget */, _XtBoolean /* mapped_when_managed */ -#endif ); extern Widget XtNameToWidget( -#if NeedFunctionPrototypes Widget /* reference */, _Xconst _XtString /* names */ -#endif ); extern Widget XtWindowToWidget( -#if NeedFunctionPrototypes Display* /* display */, Window /* window */ -#endif ); extern XtPointer XtGetClassExtension( -#if NeedFunctionPrototypes WidgetClass /* object_class */, Cardinal /* byte_offset */, XrmQuark /* type */, long /* version */, Cardinal /* record_size */ -#endif ); /*************************************************************** @@ -1401,12 +1141,10 @@ extern XtPointer XtGetClassExtension( ((void)( (arg).name = (n), (arg).value = (XtArgVal)(d) )) extern ArgList XtMergeArgLists( -#if NeedFunctionPrototypes ArgList /* args1 */, Cardinal /* num_args1 */, ArgList /* args2 */, Cardinal /* num_args2 */ -#endif ); /*************************************************************** @@ -1419,9 +1157,7 @@ extern ArgList XtMergeArgLists( #define XtVaTypedArg "XtVaTypedArg" extern XtVarArgsList XtVaCreateArgsList( -#if NeedVarargsPrototypes XtPointer /*unused*/, ... -#endif ); /************************************************************* @@ -1435,63 +1171,43 @@ extern XtVarArgsList XtVaCreateArgsList( /* We're not included from the private file, so define these */ extern Display *XtDisplay( -#if NeedFunctionPrototypes Widget /* widget */ -#endif ); extern Display *XtDisplayOfObject( -#if NeedFunctionPrototypes Widget /* object */ -#endif ); extern Screen *XtScreen( -#if NeedFunctionPrototypes Widget /* widget */ -#endif ); extern Screen *XtScreenOfObject( -#if NeedFunctionPrototypes Widget /* object */ -#endif ); extern Window XtWindow( -#if NeedFunctionPrototypes Widget /* widget */ -#endif ); extern Window XtWindowOfObject( -#if NeedFunctionPrototypes Widget /* object */ -#endif ); extern String XtName( -#if NeedFunctionPrototypes Widget /* object */ -#endif ); extern WidgetClass XtSuperclass( -#if NeedFunctionPrototypes Widget /* object */ -#endif ); extern WidgetClass XtClass( -#if NeedFunctionPrototypes Widget /* object */ -#endif ); extern Widget XtParent( -#if NeedFunctionPrototypes Widget /* widget */ -#endif ); #endif /*_XtIntrinsicP_h*/ @@ -1501,68 +1217,52 @@ extern Widget XtParent( XUnmapWindow(XtDisplay(widget), XtWindow(widget)) extern void XtAddCallback( -#if NeedFunctionPrototypes Widget /* widget */, _Xconst _XtString /* callback_name */, XtCallbackProc /* callback */, XtPointer /* closure */ -#endif ); extern void XtRemoveCallback( -#if NeedFunctionPrototypes Widget /* widget */, _Xconst _XtString /* callback_name */, XtCallbackProc /* callback */, XtPointer /* closure */ -#endif ); extern void XtAddCallbacks( -#if NeedFunctionPrototypes Widget /* widget */, _Xconst _XtString /* callback_name */, XtCallbackList /* callbacks */ -#endif ); extern void XtRemoveCallbacks( -#if NeedFunctionPrototypes Widget /* widget */, _Xconst _XtString /* callback_name */, XtCallbackList /* callbacks */ -#endif ); extern void XtRemoveAllCallbacks( -#if NeedFunctionPrototypes Widget /* widget */, _Xconst _XtString /* callback_name */ -#endif ); extern void XtCallCallbacks( -#if NeedFunctionPrototypes Widget /* widget */, _Xconst _XtString /* callback_name */, XtPointer /* call_data */ -#endif ); extern void XtCallCallbackList( -#if NeedFunctionPrototypes Widget /* widget */, XtCallbackList /* callbacks */, XtPointer /* call_data */ -#endif ); extern XtCallbackStatus XtHasCallbacks( -#if NeedFunctionPrototypes Widget /* widget */, _Xconst _XtString /* callback_name */ -#endif ); /**************************************************************** @@ -1573,166 +1273,128 @@ extern XtCallbackStatus XtHasCallbacks( extern XtGeometryResult XtMakeGeometryRequest( -#if NeedFunctionPrototypes Widget /* widget */, XtWidgetGeometry* /* request */, XtWidgetGeometry* /* reply_return */ -#endif ); extern XtGeometryResult XtQueryGeometry( -#if NeedFunctionPrototypes Widget /* widget */, XtWidgetGeometry* /* intended */, XtWidgetGeometry* /* preferred_return */ -#endif ); extern Widget XtCreatePopupShell( -#if NeedFunctionPrototypes _Xconst _XtString /* name */, WidgetClass /* widgetClass */, Widget /* parent */, ArgList /* args */, Cardinal /* num_args */ -#endif ); extern Widget XtVaCreatePopupShell( -#if NeedVarargsPrototypes _Xconst _XtString /* name */, WidgetClass /* widgetClass */, Widget /* parent */, ... -#endif ); extern void XtPopup( -#if NeedFunctionPrototypes Widget /* popup_shell */, XtGrabKind /* grab_kind */ -#endif ); extern void XtPopupSpringLoaded( -#if NeedFunctionPrototypes Widget /* popup_shell */ -#endif ); extern void XtCallbackNone( -#if NeedFunctionPrototypes Widget /* widget */, XtPointer /* closure */, XtPointer /* call_data */ -#endif ); extern void XtCallbackNonexclusive( -#if NeedFunctionPrototypes Widget /* widget */, XtPointer /* closure */, XtPointer /* call_data */ -#endif ); extern void XtCallbackExclusive( -#if NeedFunctionPrototypes Widget /* widget */, XtPointer /* closure */, XtPointer /* call_data */ -#endif ); extern void XtPopdown( -#if NeedFunctionPrototypes Widget /* popup_shell */ -#endif ); extern void XtCallbackPopdown( -#if NeedFunctionPrototypes Widget /* widget */, XtPointer /* closure */, XtPointer /* call_data */ -#endif ); extern void XtMenuPopupAction( -#if NeedFunctionPrototypes Widget /* widget */, XEvent* /* event */, String* /* params */, Cardinal* /* num_params */ -#endif ); extern Widget XtCreateWidget( -#if NeedFunctionPrototypes _Xconst _XtString /* name */, WidgetClass /* widget_class */, Widget /* parent */, ArgList /* args */, Cardinal /* num_args */ -#endif ); extern Widget XtCreateManagedWidget( -#if NeedFunctionPrototypes _Xconst _XtString /* name */, WidgetClass /* widget_class */, Widget /* parent */, ArgList /* args */, Cardinal /* num_args */ -#endif ); extern Widget XtVaCreateWidget( -#if NeedVarargsPrototypes _Xconst _XtString /* name */, WidgetClass /* widget */, Widget /* parent */, ... -#endif ); extern Widget XtVaCreateManagedWidget( -#if NeedVarargsPrototypes _Xconst _XtString /* name */, WidgetClass /* widget_class */, Widget /* parent */, ... -#endif ); extern Widget XtCreateApplicationShell( /* obsolete */ -#if NeedFunctionPrototypes _Xconst _XtString /* name */, WidgetClass /* widget_class */, ArgList /* args */, Cardinal /* num_args */ -#endif ); extern Widget XtAppCreateShell( -#if NeedFunctionPrototypes _Xconst _XtString /* application_name */, _Xconst _XtString /* application_class */, WidgetClass /* widget_class */, Display* /* display */, ArgList /* args */, Cardinal /* num_args */ -#endif ); extern Widget XtVaAppCreateShell( -#if NeedVarargsPrototypes _Xconst _XtString /* application_name */, _Xconst _XtString /* application_class */, WidgetClass /* widget_class */, Display* /* display */, ... -#endif ); /**************************************************************** @@ -1742,21 +1404,16 @@ extern Widget XtVaAppCreateShell( ****************************************************************/ extern void XtToolkitInitialize( -#if NeedFunctionPrototypes void -#endif ); extern XtLanguageProc XtSetLanguageProc( -#if NeedFunctionPrototypes XtAppContext /* app_context */, XtLanguageProc /* proc */, XtPointer /* client_data */ -#endif ); extern void XtDisplayInitialize( -#if NeedFunctionPrototypes XtAppContext /* app_context */, Display* /* dpy */, _Xconst _XtString /* application_name */, @@ -1765,11 +1422,9 @@ extern void XtDisplayInitialize( Cardinal /* num_options */, int* /* argc */, char** /* argv */ -#endif ); extern Widget XtOpenApplication( -#if NeedFunctionPrototypes XtAppContext* /* app_context_return */, _Xconst _XtString /* application_class */, XrmOptionDescList /* options */, @@ -1780,11 +1435,9 @@ extern Widget XtOpenApplication( WidgetClass /* widget_class */, ArgList /* args */, Cardinal /* num_args */ -#endif ); extern Widget XtVaOpenApplication( -#if NeedVarargsPrototypes XtAppContext* /* app_context_return */, _Xconst _XtString /* application_class */, XrmOptionDescList /* options */, @@ -1794,11 +1447,9 @@ extern Widget XtVaOpenApplication( String* /* fallback_resources */, WidgetClass /* widget_class */, ... -#endif ); extern Widget XtAppInitialize( /* obsolete */ -#if NeedFunctionPrototypes XtAppContext* /* app_context_return */, _Xconst _XtString /* application_class */, XrmOptionDescList /* options */, @@ -1808,11 +1459,9 @@ extern Widget XtAppInitialize( /* obsolete */ String* /* fallback_resources */, ArgList /* args */, Cardinal /* num_args */ -#endif ); extern Widget XtVaAppInitialize( /* obsolete */ -#if NeedVarargsPrototypes XtAppContext* /* app_context_return */, _Xconst _XtString /* application_class */, XrmOptionDescList /* options */, @@ -1821,22 +1470,18 @@ extern Widget XtVaAppInitialize( /* obsolete */ String* /* argv_in_out */, String* /* fallback_resources */, ... -#endif ); extern Widget XtInitialize( /* obsolete */ -#if NeedFunctionPrototypes _Xconst _XtString /* shell_name */, _Xconst _XtString /* application_class */, XrmOptionDescRec* /* options */, Cardinal /* num_options */, int* /* argc */, char** /* argv */ -#endif ); extern Display *XtOpenDisplay( -#if NeedFunctionPrototypes XtAppContext /* app_context */, _Xconst _XtString /* display_string */, _Xconst _XtString /* application_name */, @@ -1845,87 +1490,63 @@ extern Display *XtOpenDisplay( Cardinal /* num_options */, int* /* argc */, char** /* argv */ -#endif ); extern XtAppContext XtCreateApplicationContext( -#if NeedFunctionPrototypes void -#endif ); extern void XtAppSetFallbackResources( -#if NeedFunctionPrototypes XtAppContext /* app_context */, String* /* specification_list */ -#endif ); extern void XtDestroyApplicationContext( -#if NeedFunctionPrototypes XtAppContext /* app_context */ -#endif ); extern void XtInitializeWidgetClass( -#if NeedFunctionPrototypes WidgetClass /* widget_class */ -#endif ); extern XtAppContext XtWidgetToApplicationContext( -#if NeedFunctionPrototypes Widget /* widget */ -#endif ); extern XtAppContext XtDisplayToApplicationContext( -#if NeedFunctionPrototypes Display* /* dpy */ -#endif ); extern XrmDatabase XtDatabase( -#if NeedFunctionPrototypes Display* /* dpy */ -#endif ); extern XrmDatabase XtScreenDatabase( -#if NeedFunctionPrototypes Screen* /* screen */ -#endif ); extern void XtCloseDisplay( -#if NeedFunctionPrototypes Display* /* dpy */ -#endif ); extern void XtGetApplicationResources( -#if NeedFunctionPrototypes Widget /* widget */, XtPointer /* base */, XtResourceList /* resources */, Cardinal /* num_resources */, ArgList /* args */, Cardinal /* num_args */ -#endif ); extern void XtVaGetApplicationResources( -#if NeedVarargsPrototypes Widget /* widget */, XtPointer /* base */, XtResourceList /* resources */, Cardinal /* num_resources */, ... -#endif ); extern void XtGetSubresources( -#if NeedFunctionPrototypes Widget /* widget */, XtPointer /* base */, _Xconst _XtString /* name */, @@ -1934,11 +1555,9 @@ extern void XtGetSubresources( Cardinal /* num_resources */, ArgList /* args */, Cardinal /* num_args */ -#endif ); extern void XtVaGetSubresources( -#if NeedVarargsPrototypes Widget /* widget */, XtPointer /* base */, _Xconst _XtString /* name */, @@ -1946,91 +1565,70 @@ extern void XtVaGetSubresources( XtResourceList /* resources */, Cardinal /* num_resources */, ... -#endif ); extern void XtSetValues( -#if NeedFunctionPrototypes Widget /* widget */, ArgList /* args */, Cardinal /* num_args */ -#endif ); extern void XtVaSetValues( -#if NeedVarargsPrototypes Widget /* widget */, ... -#endif ); extern void XtGetValues( -#if NeedFunctionPrototypes Widget /* widget */, ArgList /* args */, Cardinal /* num_args */ -#endif ); extern void XtVaGetValues( -#if NeedVarargsPrototypes Widget /* widget */, ... -#endif ); extern void XtSetSubvalues( -#if NeedFunctionPrototypes XtPointer /* base */, XtResourceList /* resources */, Cardinal /* num_resources */, ArgList /* args */, Cardinal /* num_args */ -#endif ); extern void XtVaSetSubvalues( -#if NeedVarargsPrototypes XtPointer /* base */, XtResourceList /* resources */, Cardinal /* num_resources */, ... -#endif ); extern void XtGetSubvalues( -#if NeedFunctionPrototypes XtPointer /* base */, XtResourceList /* resources */, Cardinal /* num_resources */, ArgList /* args */, Cardinal /* num_args */ -#endif ); extern void XtVaGetSubvalues( -#if NeedVarargsPrototypes XtPointer /* base */, XtResourceList /* resources */, Cardinal /* num_resources */, ... -#endif ); extern void XtGetResourceList( -#if NeedFunctionPrototypes WidgetClass /* widget_class */, XtResourceList* /* resources_return */, Cardinal* /* num_resources_return */ -#endif ); extern void XtGetConstraintResourceList( -#if NeedFunctionPrototypes WidgetClass /* widget_class */, XtResourceList* /* resources_return */, Cardinal* /* num_resources_return */ -#endif ); #define XtUnspecifiedPixmap ((Pixmap)2) @@ -2078,15 +1676,11 @@ typedef struct _XtCheckpointTokenRec { } XtCheckpointTokenRec, *XtCheckpointToken; XtCheckpointToken XtSessionGetToken( -#if NeedFunctionPrototypes Widget /* widget */ -#endif ); void XtSessionReturnToken( -#if NeedFunctionPrototypes XtCheckpointToken /* token */ -#endif ); /************************************************************* @@ -2096,33 +1690,24 @@ void XtSessionReturnToken( ************************************************************/ extern XtErrorMsgHandler XtAppSetErrorMsgHandler( -#if NeedFunctionPrototypes XtAppContext /* app_context */, XtErrorMsgHandler /* handler */ -#endif ); extern void XtSetErrorMsgHandler( /* obsolete */ -#if NeedFunctionPrototypes XtErrorMsgHandler /* handler */ -#endif ); extern XtErrorMsgHandler XtAppSetWarningMsgHandler( -#if NeedFunctionPrototypes XtAppContext /* app_context */, XtErrorMsgHandler /* handler */ -#endif ); extern void XtSetWarningMsgHandler( /* obsolete */ -#if NeedFunctionPrototypes XtErrorMsgHandler /* handler */ -#endif ); extern void XtAppErrorMsg( -#if NeedFunctionPrototypes XtAppContext /* app_context */, _Xconst _XtString /* name */, _Xconst _XtString /* type */, @@ -2130,22 +1715,18 @@ extern void XtAppErrorMsg( _Xconst _XtString /* default */, String* /* params */, Cardinal* /* num_params */ -#endif ); extern void XtErrorMsg( /* obsolete */ -#if NeedFunctionPrototypes _Xconst _XtString /* name */, _Xconst _XtString /* type */, _Xconst _XtString /* class */, _Xconst _XtString /* default */, String* /* params */, Cardinal* /* num_params */ -#endif ); extern void XtAppWarningMsg( -#if NeedFunctionPrototypes XtAppContext /* app_context */, _Xconst _XtString /* name */, _Xconst _XtString /* type */, @@ -2153,86 +1734,62 @@ extern void XtAppWarningMsg( _Xconst _XtString /* default */, String* /* params */, Cardinal* /* num_params */ -#endif ); extern void XtWarningMsg( /* obsolete */ -#if NeedFunctionPrototypes _Xconst _XtString /* name */, _Xconst _XtString /* type */, _Xconst _XtString /* class */, _Xconst _XtString /* default */, String* /* params */, Cardinal* /* num_params */ -#endif ); extern XtErrorHandler XtAppSetErrorHandler( -#if NeedFunctionPrototypes XtAppContext /* app_context */, XtErrorHandler /* handler */ -#endif ); extern void XtSetErrorHandler( /* obsolete */ -#if NeedFunctionPrototypes XtErrorHandler /* handler */ -#endif ); extern XtErrorHandler XtAppSetWarningHandler( -#if NeedFunctionPrototypes XtAppContext /* app_context */, XtErrorHandler /* handler */ -#endif ); extern void XtSetWarningHandler( /* obsolete */ -#if NeedFunctionPrototypes XtErrorHandler /* handler */ -#endif ); extern void XtAppError( -#if NeedFunctionPrototypes XtAppContext /* app_context */, _Xconst _XtString /* message */ -#endif ); extern void XtError( /* obsolete */ -#if NeedFunctionPrototypes _Xconst _XtString /* message */ -#endif ); extern void XtAppWarning( -#if NeedFunctionPrototypes XtAppContext /* app_context */, _Xconst _XtString /* message */ -#endif ); extern void XtWarning( /* obsolete */ -#if NeedFunctionPrototypes _Xconst _XtString /* message */ -#endif ); extern XrmDatabase *XtAppGetErrorDatabase( -#if NeedFunctionPrototypes XtAppContext /* app_context */ -#endif ); extern XrmDatabase *XtGetErrorDatabase( /* obsolete */ -#if NeedFunctionPrototypes void -#endif ); extern void XtAppGetErrorDatabaseText( -#if NeedFunctionPrototypes XtAppContext /* app_context */, _Xconst _XtString /* name */, _Xconst _XtString /* type */, @@ -2241,18 +1798,15 @@ extern void XtAppGetErrorDatabaseText( String /* buffer_return */, int /* nbytes */, XrmDatabase /* database */ -#endif ); extern void XtGetErrorDatabaseText( /* obsolete */ -#if NeedFunctionPrototypes _Xconst _XtString /* name */, _Xconst _XtString /* type */, _Xconst _XtString /* class */, _Xconst _XtString /* default */, String /* buffer_return */, int /* nbytes */ -#endif ); /**************************************************************** @@ -2262,63 +1816,47 @@ extern void XtGetErrorDatabaseText( /* obsolete */ ****************************************************************/ extern char *XtMalloc( -#if NeedFunctionPrototypes Cardinal /* size */ -#endif ); extern char *XtCalloc( -#if NeedFunctionPrototypes Cardinal /* num */, Cardinal /* size */ -#endif ); extern char *XtRealloc( -#if NeedFunctionPrototypes char* /* ptr */, Cardinal /* num */ -#endif ); extern void XtFree( -#if NeedFunctionPrototypes char* /* ptr */ -#endif ); #ifdef XTTRACEMEMORY extern char *_XtMalloc( /* implementation-private */ -#if NeedFunctionPrototypes Cardinal /* size */, char * /* file */, int /* line */ -#endif ); extern char *_XtRealloc( /* implementation-private */ -#if NeedFunctionPrototypes char * /* ptr */, Cardinal /* size */, char * /* file */, int /* line */ -#endif ); extern char *_XtCalloc( /* implementation-private */ -#if NeedFunctionPrototypes Cardinal /* num */, Cardinal /* size */, char * /* file */, int /* line */ -#endif ); extern void _XtFree( /* implementation-private */ -#if NeedFunctionPrototypes char * /* ptr */ -#endif ); #define XtMalloc(size) _XtMalloc(size, __FILE__, __LINE__) @@ -2339,24 +1877,18 @@ extern void _XtFree( /* implementation-private */ **************************************************************/ extern XtWorkProcId XtAddWorkProc( /* obsolete */ -#if NeedFunctionPrototypes XtWorkProc /* proc */, XtPointer /* closure */ -#endif ); extern XtWorkProcId XtAppAddWorkProc( -#if NeedFunctionPrototypes XtAppContext /* app_context */, XtWorkProc /* proc */, XtPointer /* closure */ -#endif ); extern void XtRemoveWorkProc( -#if NeedFunctionPrototypes XtWorkProcId /* id */ -#endif ); @@ -2366,22 +1898,18 @@ extern void XtRemoveWorkProc( *****************************************************************/ extern GC XtGetGC( -#if NeedFunctionPrototypes Widget /* widget */, XtGCMask /* valueMask */, XGCValues* /* values */ -#endif ); extern GC XtAllocateGC( -#if NeedFunctionPrototypes Widget /* widget */, Cardinal /* depth */, XtGCMask /* valueMask */, XGCValues* /* values */, XtGCMask /* dynamicMask */, XtGCMask /* unusedMask */ -#endif ); /* This implementation of XtDestroyGC differs from the formal specification @@ -2389,62 +1917,47 @@ extern GC XtAllocateGC( * may conform to the spec, use of XtReleaseGC is strongly encouraged. */ extern void XtDestroyGC( /* obsolete */ -#if NeedFunctionPrototypes GC /* gc */ -#endif ); extern void XtReleaseGC( -#if NeedFunctionPrototypes Widget /* object */, GC /* gc */ -#endif ); extern void XtAppReleaseCacheRefs( -#if NeedFunctionPrototypes XtAppContext /* app_context */, XtCacheRef* /* cache_ref */ -#endif ); extern void XtCallbackReleaseCacheRef( -#if NeedFunctionPrototypes Widget /* widget */, XtPointer /* closure */, /* XtCacheRef */ XtPointer /* call_data */ -#endif ); extern void XtCallbackReleaseCacheRefList( -#if NeedFunctionPrototypes Widget /* widget */, XtPointer /* closure */, /* XtCacheRef* */ XtPointer /* call_data */ -#endif ); extern void XtSetWMColormapWindows( -#if NeedFunctionPrototypes Widget /* widget */, Widget* /* list */, Cardinal /* count */ -#endif ); extern String XtFindFile( -#if NeedFunctionPrototypes _Xconst _XtString /* path */, Substitution /* substitutions */, Cardinal /* num_substitutions */, XtFilePredicate /* predicate */ -#endif ); extern String XtResolvePathname( -#if NeedFunctionPrototypes Display* /* dpy */, _Xconst _XtString /* type */, _Xconst _XtString /* filename */, @@ -2453,7 +1966,6 @@ extern String XtResolvePathname( Substitution /* substitutions */, Cardinal /* num_substitutions */, XtFilePredicate /* predicate */ -#endif ); /**************************************************************** @@ -2465,26 +1977,21 @@ extern String XtResolvePathname( #define XT_CONVERT_FAIL (Atom)0x80000001 extern void XtDisownSelection( -#if NeedFunctionPrototypes Widget /* widget */, Atom /* selection */, Time /* time */ -#endif ); extern void XtGetSelectionValue( -#if NeedFunctionPrototypes Widget /* widget */, Atom /* selection */, Atom /* target */, XtSelectionCallbackProc /* callback */, XtPointer /* closure */, Time /* time */ -#endif ); extern void XtGetSelectionValues( -#if NeedFunctionPrototypes Widget /* widget */, Atom /* selection */, Atom* /* targets */, @@ -2492,55 +1999,41 @@ extern void XtGetSelectionValues( XtSelectionCallbackProc /* callback */, XtPointer* /* closures */, Time /* time */ -#endif ); extern void XtAppSetSelectionTimeout( -#if NeedFunctionPrototypes XtAppContext /* app_context */, unsigned long /* timeout */ -#endif ); extern void XtSetSelectionTimeout( /* obsolete */ -#if NeedFunctionPrototypes unsigned long /* timeout */ -#endif ); extern unsigned long XtAppGetSelectionTimeout( -#if NeedFunctionPrototypes XtAppContext /* app_context */ -#endif ); extern unsigned long XtGetSelectionTimeout( /* obsolete */ -#if NeedFunctionPrototypes void -#endif ); extern XSelectionRequestEvent *XtGetSelectionRequest( -#if NeedFunctionPrototypes Widget /* widget */, Atom /* selection */, XtRequestId /* request_id */ -#endif ); extern void XtGetSelectionValueIncremental( -#if NeedFunctionPrototypes Widget /* widget */, Atom /* selection */, Atom /* target */, XtSelectionCallbackProc /* selection_callback */, XtPointer /* client_data */, Time /* time */ -#endif ); extern void XtGetSelectionValuesIncremental( -#if NeedFunctionPrototypes Widget /* widget */, Atom /* selection */, Atom* /* targets */, @@ -2548,22 +2041,18 @@ extern void XtGetSelectionValuesIncremental( XtSelectionCallbackProc /* callback */, XtPointer* /* client_data */, Time /* time */ -#endif ); extern void XtSetSelectionParameters( -#if NeedFunctionPrototypes Widget /* requestor */, Atom /* selection */, Atom /* type */, XtPointer /* value */, unsigned long /* length */, int /* format */ -#endif ); extern void XtGetSelectionParameters( -#if NeedFunctionPrototypes Widget /* owner */, Atom /* selection */, XtRequestId /* request_id */, @@ -2571,82 +2060,62 @@ extern void XtGetSelectionParameters( XtPointer* /* value_return */, unsigned long* /* length_return */, int* /* format_return */ -#endif ); extern void XtCreateSelectionRequest( -#if NeedFunctionPrototypes Widget /* requestor */, Atom /* selection */ -#endif ); extern void XtSendSelectionRequest( -#if NeedFunctionPrototypes Widget /* requestor */, Atom /* selection */, Time /* time */ -#endif ); extern void XtCancelSelectionRequest( -#if NeedFunctionPrototypes Widget /* requestor */, Atom /* selection */ -#endif ); extern Atom XtReservePropertyAtom( -#if NeedFunctionPrototypes Widget /* widget */ -#endif ); extern void XtReleasePropertyAtom( -#if NeedFunctionPrototypes Widget /* widget */, Atom /* selection */ -#endif ); extern void XtGrabKey( -#if NeedFunctionPrototypes Widget /* widget */, _XtKeyCode /* keycode */, Modifiers /* modifiers */, _XtBoolean /* owner_events */, int /* pointer_mode */, int /* keyboard_mode */ -#endif ); extern void XtUngrabKey( -#if NeedFunctionPrototypes Widget /* widget */, _XtKeyCode /* keycode */, Modifiers /* modifiers */ -#endif ); extern int XtGrabKeyboard( -#if NeedFunctionPrototypes Widget /* widget */, _XtBoolean /* owner_events */, int /* pointer_mode */, int /* keyboard_mode */, Time /* time */ -#endif ); extern void XtUngrabKeyboard( -#if NeedFunctionPrototypes Widget /* widget */, Time /* time */ -#endif ); extern void XtGrabButton( -#if NeedFunctionPrototypes Widget /* widget */, int /* button */, Modifiers /* modifiers */, @@ -2656,19 +2125,15 @@ extern void XtGrabButton( int /* keyboard_mode */, Window /* confine_to */, Cursor /* cursor */ -#endif ); extern void XtUngrabButton( -#if NeedFunctionPrototypes Widget /* widget */, unsigned int /* button */, Modifiers /* modifiers */ -#endif ); extern int XtGrabPointer( -#if NeedFunctionPrototypes Widget /* widget */, _XtBoolean /* owner_events */, unsigned int /* event_mask */, @@ -2677,43 +2142,32 @@ extern int XtGrabPointer( Window /* confine_to */, Cursor /* cursor */, Time /* time */ -#endif ); extern void XtUngrabPointer( -#if NeedFunctionPrototypes Widget /* widget */, Time /* time */ -#endif ); extern void XtGetApplicationNameAndClass( -#if NeedFunctionPrototypes Display* /* dpy */, String* /* name_return */, String* /* class_return */ -#endif ); extern void XtRegisterDrawable( -#if NeedFunctionPrototypes Display* /* dpy */, Drawable /* drawable */, Widget /* widget */ -#endif ); extern void XtUnregisterDrawable( -#if NeedFunctionPrototypes Display* /* dpy */, Drawable /* drawable */ -#endif ); extern Widget XtHooksOfDisplay( -#if NeedFunctionPrototypes Display* /* dpy */ -#endif ); typedef struct { @@ -2757,41 +2211,29 @@ typedef struct { } XtDestroyHookDataRec, *XtDestroyHookData; extern void XtGetDisplays( -#if NeedFunctionPrototypes XtAppContext /* app_context */, Display*** /* dpy_return */, Cardinal* /* num_dpy_return */ -#endif ); extern Boolean XtToolkitThreadInitialize( -#if NeedFunctionPrototypes void -#endif ); extern void XtAppSetExitFlag( -#if NeedFunctionPrototypes XtAppContext /* app_context */ -#endif ); extern Boolean XtAppGetExitFlag( -#if NeedFunctionPrototypes XtAppContext /* app_context */ -#endif ); extern void XtAppLock( -#if NeedFunctionPrototypes XtAppContext /* app_context */ -#endif ); extern void XtAppUnlock( -#if NeedFunctionPrototypes XtAppContext /* app_context */ -#endif ); /* @@ -2802,376 +2244,310 @@ extern void XtAppUnlock( /* String converters */ extern Boolean XtCvtStringToAcceleratorTable( -#if NeedFunctionPrototypes Display* /* dpy */, XrmValuePtr /* args */, /* none */ Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ -#endif ); extern Boolean XtCvtStringToAtom( -#if NeedFunctionPrototypes Display* /* dpy */, XrmValuePtr /* args */, /* Display */ Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ -#endif ); extern Boolean XtCvtStringToBool( -#if NeedFunctionPrototypes Display* /* dpy */, XrmValuePtr /* args */, /* none */ Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ -#endif ); extern Boolean XtCvtStringToBoolean( -#if NeedFunctionPrototypes Display* /* dpy */, XrmValuePtr /* args */, /* none */ Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ -#endif ); extern Boolean XtCvtStringToCommandArgArray( -#if NeedFunctionPrototypes Display* /* dpy */, XrmValuePtr /* args */, /* none */ Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ -#endif ); extern Boolean XtCvtStringToCursor( -#if NeedFunctionPrototypes Display* /* dpy */, XrmValuePtr /* args */, /* Display */ Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ -#endif ); extern Boolean XtCvtStringToDimension( -#if NeedFunctionPrototypes Display* /* dpy */, XrmValuePtr /* args */, /* none */ Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ -#endif ); extern Boolean XtCvtStringToDirectoryString( -#if NeedFunctionPrototypes Display* /* dpy */, XrmValuePtr /* args */, /* none */ Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ -#endif ); extern Boolean XtCvtStringToDisplay( -#if NeedFunctionPrototypes Display* /* dpy */, XrmValuePtr /* args */, /* none */ Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ -#endif ); extern Boolean XtCvtStringToFile( -#if NeedFunctionPrototypes Display* /* dpy */, XrmValuePtr /* args */, /* none */ Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ -#endif ); extern Boolean XtCvtStringToFloat( -#if NeedFunctionPrototypes Display* /* dpy */, XrmValuePtr /* args */, /* none */ Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ -#endif ); extern Boolean XtCvtStringToFont( -#if NeedFunctionPrototypes Display* /* dpy */, XrmValuePtr /* args */, /* Display */ Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ -#endif ); extern Boolean XtCvtStringToFontSet( -#if NeedFunctionPrototypes Display* /* dpy */, XrmValuePtr /* args */, /* Display, locale */ Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ -#endif ); extern Boolean XtCvtStringToFontStruct( -#if NeedFunctionPrototypes Display* /* dpy */, XrmValuePtr /* args */, /* Display */ Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ -#endif ); extern Boolean XtCvtStringToGravity( -#if NeedFunctionPrototypes Display* /* dpy */, XrmValuePtr /* args */, Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ -#endif ); extern Boolean XtCvtStringToInitialState( -#if NeedFunctionPrototypes Display* /* dpy */, XrmValuePtr /* args */, /* none */ Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ -#endif ); extern Boolean XtCvtStringToInt( -#if NeedFunctionPrototypes Display* /* dpy */, XrmValuePtr /* args */, /* none */ Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ -#endif ); extern Boolean XtCvtStringToPixel( -#if NeedFunctionPrototypes Display* /* dpy */, XrmValuePtr /* args */, /* Screen, Colormap */ Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ -#endif ); #define XtCvtStringToPosition XtCvtStringToShort extern Boolean XtCvtStringToRestartStyle( -#if NeedFunctionPrototypes Display* /* dpy */, XrmValuePtr /* args */, /* none */ Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ -#endif ); extern Boolean XtCvtStringToShort( -#if NeedFunctionPrototypes Display* /* dpy */, XrmValuePtr /* args */, /* none */ Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ -#endif ); extern Boolean XtCvtStringToTranslationTable( -#if NeedFunctionPrototypes Display* /* dpy */, XrmValuePtr /* args */, /* none */ Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ -#endif ); extern Boolean XtCvtStringToUnsignedChar( -#if NeedFunctionPrototypes Display* /* dpy */, XrmValuePtr /* args */, /* none */ Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ -#endif ); extern Boolean XtCvtStringToVisual( -#if NeedFunctionPrototypes Display* /* dpy */, XrmValuePtr /* args */, /* Screen, depth */ Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ -#endif ); /* int converters */ extern Boolean XtCvtIntToBool( -#if NeedFunctionPrototypes Display* /* dpy */, XrmValuePtr /* args */, /* none */ Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ -#endif ); extern Boolean XtCvtIntToBoolean( -#if NeedFunctionPrototypes Display* /* dpy */, XrmValuePtr /* args */, /* none */ Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ -#endif ); extern Boolean XtCvtIntToColor( -#if NeedFunctionPrototypes Display* /* dpy */, XrmValuePtr /* args */, /* Screen, Colormap */ Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ -#endif ); #define XtCvtIntToDimension XtCvtIntToShort extern Boolean XtCvtIntToFloat( -#if NeedFunctionPrototypes Display* /* dpy */, XrmValuePtr /* args */, /* none */ Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ -#endif ); extern Boolean XtCvtIntToFont( -#if NeedFunctionPrototypes Display* /* dpy */, XrmValuePtr /* args */, /* none */ Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ -#endif ); extern Boolean XtCvtIntToPixel( -#if NeedFunctionPrototypes Display* /* dpy */, XrmValuePtr /* args */, /* none */ Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ -#endif ); extern Boolean XtCvtIntToPixmap( -#if NeedFunctionPrototypes Display* /* dpy */, XrmValuePtr /* args */, /* none */ Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ -#endif ); #define XtCvtIntToPosition XtCvtIntToShort extern Boolean XtCvtIntToShort( -#if NeedFunctionPrototypes Display* /* dpy */, XrmValuePtr /* args */, /* none */ Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ -#endif ); extern Boolean XtCvtIntToUnsignedChar( -#if NeedFunctionPrototypes Display* /* dpy */, XrmValuePtr /* args */, /* none */ Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ -#endif ); /* Color converter */ extern Boolean XtCvtColorToPixel( -#if NeedFunctionPrototypes Display* /* dpy */, XrmValuePtr /* args */, /* none */ Cardinal* /* num_args */, XrmValuePtr /* fromVal */, XrmValuePtr /* toVal */, XtPointer* /* closure_ret */ -#endif ); /* Pixel converter */ diff --git a/include/X11/IntrinsicI.h b/include/X11/IntrinsicI.h index d1e000c..6b0e8ef 100644 --- a/include/X11/IntrinsicI.h +++ b/include/X11/IntrinsicI.h @@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xt/IntrinsicI.h,v 3.8 2001/12/14 19:56:25 dawes Exp $ */ +/* $XFree86: xc/lib/Xt/IntrinsicI.h,v 3.9 2003/04/21 16:34:28 herrb Exp $ */ #ifndef _XtintrinsicI_h #define _XtintrinsicI_h @@ -193,37 +193,27 @@ SOFTWARE. extern String XtCXtToolkitError; extern void _XtAllocError( -#if NeedFunctionPrototypes String /* alloc_type */ -#endif ); extern void _XtCompileResourceList( -#if NeedFunctionPrototypes XtResourceList /* resources */, Cardinal /* num_resources */ -#endif ); extern XtGeometryResult _XtMakeGeometryRequest( -#if NeedFunctionPrototypes Widget /* widget */, XtWidgetGeometry* /* request */, XtWidgetGeometry* /* reply_return */, Boolean* /* clear_rect_obj */ -#endif ); extern Boolean _XtIsHookObject( -#if NeedFunctionPrototypes Widget /* widget */ -#endif ); extern void _XtAddShellToHookObj( -#if NeedFunctionPrototypes Widget /* widget */ -#endif ); /* GCManager.c */ @@ -233,7 +223,7 @@ extern void _XtGClistFree(Display *dpy, XtPerDisplay pd); #ifdef XT_GEO_TATTLER -extern void _XtGeoTab (); +extern void _XtGeoTab (int); extern void _XtGeoTrace ( Widget widget, ... @@ -250,15 +240,11 @@ extern void _XtGeoTrace ( #ifndef XTTRACEMEMORY extern char* __XtMalloc ( -#if NeedFunctionPrototypes unsigned /* size */ -#endif ); extern char* __XtCalloc ( -#if NeedFunctionPrototypes unsigned /* num */, unsigned /* size */ -#endif ); #else diff --git a/include/X11/IntrinsicP.h b/include/X11/IntrinsicP.h index 255ef4c..ec70f05 100644 --- a/include/X11/IntrinsicP.h +++ b/include/X11/IntrinsicP.h @@ -46,6 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ +/* $XFree86: xc/lib/Xt/IntrinsicP.h,v 1.4 2003/10/24 15:47:35 tsi Exp $ */ #ifndef _XtintrinsicP_h #define _XtintrinsicP_h @@ -77,80 +78,60 @@ typedef unsigned long XtVersionType; #define XtVersionDontCheck 0 typedef void (*XtProc)( -#if NeedFunctionPrototypes void -#endif ); typedef void (*XtWidgetClassProc)( -#if NeedFunctionPrototypes WidgetClass /* class */ -#endif ); typedef void (*XtWidgetProc)( -#if NeedFunctionPrototypes Widget /* widget */ -#endif ); typedef Boolean (*XtAcceptFocusProc)( -#if NeedFunctionPrototypes Widget /* widget */, Time* /* time */ -#endif ); typedef void (*XtArgsProc)( -#if NeedFunctionPrototypes Widget /* widget */, ArgList /* args */, Cardinal* /* num_args */ -#endif ); typedef void (*XtInitProc)( -#if NeedFunctionPrototypes Widget /* request */, Widget /* new */, ArgList /* args */, Cardinal* /* num_args */ -#endif ); typedef Boolean (*XtSetValuesFunc)( -#if NeedFunctionPrototypes Widget /* old */, Widget /* request */, Widget /* new */, ArgList /* args */, Cardinal* /* num_args */ -#endif ); typedef Boolean (*XtArgsFunc)( -#if NeedFunctionPrototypes Widget /* widget */, ArgList /* args */, Cardinal* /* num_args */ -#endif ); typedef void (*XtAlmostProc)( -#if NeedFunctionPrototypes Widget /* old */, Widget /* new */, XtWidgetGeometry* /* request */, XtWidgetGeometry* /* reply */ -#endif ); typedef void (*XtExposeProc)( -#if NeedFunctionPrototypes Widget /* widget */, XEvent* /* event */, Region /* region */ -#endif ); /* compress_exposure options*/ @@ -166,26 +147,20 @@ typedef void (*XtExposeProc)( #define XtExposeNoRegion 0x80 typedef void (*XtRealizeProc)( -#if NeedFunctionPrototypes Widget /* widget */, XtValueMask* /* mask */, XSetWindowAttributes* /* attributes */ -#endif ); typedef XtGeometryResult (*XtGeometryHandler)( -#if NeedFunctionPrototypes Widget /* widget */, XtWidgetGeometry* /* request */, XtWidgetGeometry* /* reply */ -#endif ); typedef void (*XtStringProc)( -#if NeedFunctionPrototypes Widget /* widget */, String /* str */ -#endif ); typedef struct { @@ -196,7 +171,6 @@ typedef struct { } XtTypedArg, *XtTypedArgList; typedef void (*XtAllocateProc)( -#if NeedFunctionPrototypes WidgetClass /* widget_class */, Cardinal * /* constraint_size */, Cardinal * /* more_bytes */, @@ -206,14 +180,11 @@ typedef void (*XtAllocateProc)( Cardinal * /* num_typed_args */, Widget * /* widget_return */, XtPointer * /* more_bytes_return */ -#endif ); typedef void (*XtDeallocateProc)( -#if NeedFunctionPrototypes Widget /* widget */, XtPointer /* more_bytes */ -#endif ); struct _XtStateRec; /* Forward declare before use for C++ */ @@ -288,71 +259,53 @@ typedef struct _XtTMRec { _XFUNCPROTOBEGIN extern Widget _XtWindowedAncestor( /* internal; implementation-dependent */ -#if NeedFunctionPrototypes Widget /* object */ -#endif ); extern void _XtInherit( -#if NeedFunctionPrototypes void -#endif ); extern void XtCreateWindow( -#if NeedFunctionPrototypes Widget /* widget */, unsigned int /* window_class */, Visual* /* visual */, XtValueMask /* value_mask */, XSetWindowAttributes* /* attributes */ -#endif ); extern void XtResizeWidget( -#if NeedFunctionPrototypes Widget /* widget */, _XtDimension /* width */, _XtDimension /* height */, _XtDimension /* border_width */ -#endif ); extern void XtMoveWidget( -#if NeedFunctionPrototypes Widget /* widget */, _XtPosition /* x */, _XtPosition /* y */ -#endif ); extern void XtConfigureWidget( -#if NeedFunctionPrototypes Widget /* widget */, _XtPosition /* x */, _XtPosition /* y */, _XtDimension /* width */, _XtDimension /* height */, _XtDimension /* border_width */ -#endif ); extern void XtResizeWindow( -#if NeedFunctionPrototypes Widget /* widget */ -#endif ); extern void XtProcessLock( -#if NeedFunctionPrototypes void -#endif ); extern void XtProcessUnlock( -#if NeedFunctionPrototypes void -#endif ); _XFUNCPROTOEND diff --git a/include/X11/PassivGraI.h b/include/X11/PassivGraI.h index 178c5ef..91c3de4 100644 --- a/include/X11/PassivGraI.h +++ b/include/X11/PassivGraI.h @@ -51,7 +51,7 @@ 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/Xt/PassivGraI.h,v 1.3 2001/12/14 19:56:27 dawes Exp $ */ +/* $XFree86: xc/lib/Xt/PassivGraI.h,v 1.4 2003/04/21 16:34:28 herrb Exp $ */ #ifndef _PDI_h_ #define _PDI_h_ @@ -136,26 +136,20 @@ typedef struct XtPerDisplayInputRec{ #define IsPseudoGrab(g) ((g == XtPseudoPassiveServerGrab)) extern void _XtDestroyServerGrabs( -#if NeedFunctionPrototypes Widget /* w */, XtPointer /* pwi */, /*XtPerWidgetInput*/ XtPointer /* call_data */ -#endif ); extern XtPerWidgetInput _XtGetPerWidgetInput( -#if NeedFunctionPrototypes Widget /* widget */, _XtBoolean /* create */ -#endif ); extern XtServerGrabPtr _XtCheckServerGrabsOnWidget( -#if NeedFunctionPrototypes XEvent* /* event */, Widget /* widget */, _XtBoolean /* isKeyboard */ -#endif ); /* @@ -165,38 +159,28 @@ extern XtGrabList* _XtGetGrabList( XtPerDisplayInput ); #define _XtGetGrabList(pdi) (&(pdi)->grabList) extern void _XtFreePerWidgetInput( -#if NeedFunctionPrototypes Widget /* w */, XtPerWidgetInput /* pwi */ -#endif ); extern Widget _XtProcessKeyboardEvent( -#if NeedFunctionPrototypes XKeyEvent* /* event */, Widget /* widget */, XtPerDisplayInput /* pdi */ -#endif ); extern Widget _XtProcessPointerEvent( -#if NeedFunctionPrototypes XButtonEvent* /* event */, Widget /* widget */, XtPerDisplayInput /* pdi */ -#endif ); extern void _XtRegisterPassiveGrabs( -#if NeedFunctionPrototypes Widget /* widget */ -#endif ); extern void _XtClearAncestorCache( -#if NeedFunctionPrototypes Widget /* widget */ -#endif ); #endif /* _PDI_h_ */ diff --git a/include/X11/ResConfigP.h b/include/X11/ResConfigP.h index 60f9414..2fe22ee 100644 --- a/include/X11/ResConfigP.h +++ b/include/X11/ResConfigP.h @@ -52,7 +52,7 @@ dealings in this Software without prior written authorization from the IBM Corporation. ******************************************************************/ -/* $XFree86: xc/lib/Xt/ResConfigP.h,v 3.7 2001/12/20 19:40:59 tsi Exp $ */ +/* $XFree86: xc/lib/Xt/ResConfigP.h,v 3.8 2003/04/21 16:34:28 herrb Exp $ */ #ifndef _RESCONFIGP_H #define _RESCONFIGP_H @@ -68,11 +68,9 @@ _XFUNCPROTOBEGIN #define RCM_INIT "Custom Init" extern void _XtResourceConfigurationEH( -#if NeedFunctionPrototypes Widget /* w */, XtPointer /* client_data */, XEvent * /* event */ -#endif ); _XFUNCPROTOEND diff --git a/include/X11/ResourceI.h b/include/X11/ResourceI.h index 7a9d5a0..0957b96 100644 --- a/include/X11/ResourceI.h +++ b/include/X11/ResourceI.h @@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xt/ResourceI.h,v 1.5 2001/12/14 19:56:28 dawes Exp $ */ +/* $XFree86: xc/lib/Xt/ResourceI.h,v 1.6 2003/04/21 16:34:28 herrb Exp $ */ /**************************************************************** * @@ -62,33 +62,25 @@ SOFTWARE. #define StringToClass(string) XrmStringToClass(string) extern void _XtResourceDependencies( -#if NeedFunctionPrototypes WidgetClass /* wc */ -#endif ); extern void _XtConstraintResDependencies( -#if NeedFunctionPrototypes ConstraintWidgetClass /* wc */ -#endif ); extern XtCacheRef* _XtGetResources( -#if NeedFunctionPrototypes Widget /* w */, ArgList /* args */, Cardinal /* num_args */, XtTypedArgList /* typed_args */, Cardinal* /* num_typed_args */ -#endif ); extern void _XtCopyFromParent( -#if NeedFunctionPrototypes Widget /* widget */, int /* offset */, XrmValue* /* value */ -#endif ); extern void _XtCopyToArg(char *src, XtArgVal *dst, unsigned int size); diff --git a/include/X11/ThreadsI.h b/include/X11/ThreadsI.h index 3b51e07..14d34b0 100644 --- a/include/X11/ThreadsI.h +++ b/include/X11/ThreadsI.h @@ -53,7 +53,7 @@ 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/Xt/ThreadsI.h,v 3.5 2001/12/14 19:56:31 dawes Exp $ */ +/* $XFree86: xc/lib/Xt/ThreadsI.h,v 3.6 2003/04/21 16:34:29 herrb Exp $ */ #ifndef _XtThreadsI_h #define _XtThreadsI_h @@ -63,44 +63,32 @@ in this Software without prior written authorization from The Open Group. typedef struct _LockRec *LockPtr; typedef void (*ThreadAppProc)( -#if NeedFunctionPrototypes XtAppContext /* app */ -#endif ); typedef void (*ThreadAppYieldLockProc)( -#if NeedFunctionPrototypes XtAppContext, /* app */ Boolean*, /* push_thread */ Boolean*, /* pushed_thread */ int* /* level */ -#endif ); typedef void (*ThreadAppRestoreLockProc)( -#if NeedFunctionPrototypes XtAppContext /* app */, int, /* level */ Boolean* /* pushed_thread */ -#endif ); extern void (*_XtProcessLock)( -#if NeedFunctionPrototypes void -#endif ); extern void (*_XtProcessUnlock)( -#if NeedFunctionPrototypes void -#endif ); extern void (*_XtInitAppLock)( -#if NeedFunctionPrototypes XtAppContext /* app */ -#endif ); #define INIT_APP_LOCK(app) if(_XtInitAppLock) (*_XtInitAppLock)(app) diff --git a/include/X11/TranslateI.h b/include/X11/TranslateI.h index bb86ee2..3af90eb 100644 --- a/include/X11/TranslateI.h +++ b/include/X11/TranslateI.h @@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xt/TranslateI.h,v 1.3 2001/12/14 19:56:32 dawes Exp $ */ +/* $XFree86: xc/lib/Xt/TranslateI.h,v 1.4 2003/04/21 16:34:29 herrb Exp $ */ /* * TranslateI.h - Header file private to translation management @@ -376,80 +376,60 @@ extern TMGlobalRec _XtGlobalTM; */ extern void _XtPopup( -#if NeedFunctionPrototypes Widget /* widget */, XtGrabKind /* grab_kind */, _XtBoolean /* spring_loaded */ -#endif ); extern String _XtPrintXlations( -#if NeedFunctionPrototypes Widget /* w */, XtTranslations /* xlations */, Widget /* accelWidget */, _XtBoolean /* includeRHS */ -#endif ); extern void _XtRegisterGrabs( -#if NeedFunctionPrototypes Widget /* widget */ -#endif ); extern XtPointer _XtInitializeActionData( -#if NeedFunctionPrototypes struct _XtActionsRec * /* actions */, Cardinal /* count */, _XtBoolean /* inPlace */ -#endif ); extern void _XtAddEventSeqToStateTree( -#if NeedFunctionPrototypes EventSeqPtr /* eventSeq */, TMParseStateTree /* stateTree */ -#endif ); extern Boolean _XtMatchUsingStandardMods( -#if NeedFunctionPrototypes TMTypeMatch /* typeMatch */, TMModifierMatch /* modMatch */, TMEventPtr /* eventSeq */ -#endif ); extern Boolean _XtMatchUsingDontCareMods( -#if NeedFunctionPrototypes TMTypeMatch /* typeMatch */, TMModifierMatch /* modMatch */, TMEventPtr /* eventSeq */ -#endif ); extern Boolean _XtRegularMatch( -#if NeedFunctionPrototypes TMTypeMatch /* typeMatch */, TMModifierMatch /* modMatch */, TMEventPtr /* eventSeq */ -#endif ); extern Boolean _XtMatchAtom( -#if NeedFunctionPrototypes TMTypeMatch /* typeMatch */, TMModifierMatch /* modMatch */, TMEventPtr /* eventSeq */ -#endif ); extern void _XtTranslateEvent( -#if NeedFunctionPrototypes Widget /* widget */, XEvent* /* event */ -#endif ); #include "CallbackI.h" @@ -465,208 +445,152 @@ extern void _XtBuildKeysymTables(Display *dpy, XtPerDisplay pd); #ifndef NO_MIT_HACKS extern void _XtDisplayTranslations( -#if NeedFunctionPrototypes Widget /* widget */, XEvent* /* event */, String* /* params */, Cardinal* /* num_params */ -#endif ); extern void _XtDisplayAccelerators( -#if NeedFunctionPrototypes Widget /* widget */, XEvent* /* event */, String* /* params */, Cardinal* /* num_params */ -#endif ); extern void _XtDisplayInstalledAccelerators( -#if NeedFunctionPrototypes Widget /* widget */, XEvent* /* event */, String* /* params */, Cardinal* /* num_params */ -#endif ); #endif /* ifndef NO_MIT_HACKS */ extern void _XtPopupInitialize( -#if NeedFunctionPrototypes XtAppContext /* app_context */ -#endif ); extern void _XtBindActions( -#if NeedFunctionPrototypes Widget /* widget */, XtTM /* tm_rec */ -#endif ); extern Boolean _XtComputeLateBindings( -#if NeedFunctionPrototypes Display* /* dpy */, LateBindingsPtr /* lateModifiers */, Modifiers* /* computed */, Modifiers* /* computedMask */ -#endif ); extern XtTranslations _XtCreateXlations( -#if NeedFunctionPrototypes TMStateTree * /* stateTrees */, TMShortCard /* numStateTrees */, XtTranslations /* first */, XtTranslations /* second */ -#endif ); extern Boolean _XtCvtMergeTranslations( -#if NeedFunctionPrototypes Display* /* dpy */, XrmValuePtr /* args */, Cardinal* /* num_args */, XrmValuePtr /* from */, XrmValuePtr /* to */, XtPointer* /* closure_ret */ -#endif ); void _XtFreeTranslations( -#if NeedFunctionPrototypes XtAppContext /* app */, XrmValuePtr /* toVal */, XtPointer /* closure */, XrmValuePtr /* args */, Cardinal* /* num_args */ -#endif ); extern TMShortCard _XtGetModifierIndex( -#if NeedFunctionPrototypes Event* /* event */ -#endif ); extern TMShortCard _XtGetQuarkIndex( -#if NeedFunctionPrototypes TMParseStateTree /* stateTreePtr */, XrmQuark /* quark */ -#endif ); extern XtTranslations _XtGetTranslationValue( -#if NeedFunctionPrototypes Widget /* widget */ -#endif ); extern TMShortCard _XtGetTypeIndex( -#if NeedFunctionPrototypes Event* /* event */ -#endif ); extern void _XtGrabInitialize( -#if NeedFunctionPrototypes XtAppContext /* app */ -#endif ); extern void _XtInstallTranslations( -#if NeedFunctionPrototypes Widget /* widget */ -#endif ); extern void _XtRemoveTranslations( -#if NeedFunctionPrototypes Widget /* widget */ -#endif ); extern void _XtDestroyTMData( -#if NeedFunctionPrototypes Widget /* widget */ -#endif ); extern void _XtMergeTranslations( -#if NeedFunctionPrototypes Widget /* widget */, XtTranslations /* newXlations */, _XtTranslateOp /* operation */ -#endif ); extern void _XtActionInitialize( -#if NeedFunctionPrototypes XtAppContext /* app */ -#endif ); extern TMStateTree _XtParseTreeToStateTree( -#if NeedFunctionPrototypes TMParseStateTree /* parseTree */ -#endif ); extern String _XtPrintActions( -#if NeedFunctionPrototypes ActionRec* /* actions */, XrmQuark* /* quarkTbl */ -#endif ); extern String _XtPrintEventSeq( -#if NeedFunctionPrototypes EventSeqPtr /* eventSeq */, Display* /* dpy */ -#endif ); typedef Boolean (*_XtTraversalProc)( -#if NeedFunctionPrototypes StatePtr /* state */, XtPointer /* data */ -#endif ); extern void _XtTraverseStateTree( -#if NeedFunctionPrototypes TMStateTree /* tree */, _XtTraversalProc /* func */, XtPointer /* data */ -#endif ); extern void _XtTranslateInitialize( -#if NeedFunctionPrototypes void -#endif ); extern void _XtAddTMConverters( -#if NeedFunctionPrototypes ConverterTable /* table */ -#endif ); extern void _XtUnbindActions( -#if NeedFunctionPrototypes Widget /* widget */, XtTranslations /* xlations */, TMBindData /* bindData */ -#endif ); extern void _XtUnmergeTranslations( -#if NeedFunctionPrototypes Widget /* widget */, XtTranslations /* xlations */ -#endif ); /* TMKey.c */ diff --git a/include/X11/VarargsI.h b/include/X11/VarargsI.h index 6e4bd60..87a26db 100644 --- a/include/X11/VarargsI.h +++ b/include/X11/VarargsI.h @@ -25,7 +25,7 @@ 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/Xt/VarargsI.h,v 3.6 2001/12/14 19:56:32 dawes Exp $ */ +/* $XFree86: xc/lib/Xt/VarargsI.h,v 3.7 2003/04/21 16:34:29 herrb Exp $ */ #ifndef _VarargsI_h_ #define _VarargsI_h_ @@ -35,45 +35,31 @@ in this Software without prior written authorization from The Open Group. /* private routines */ extern void _XtCountVaList( -#if NeedFunctionPrototypes va_list /*var*/, int* /*total_count*/, int* /*typed_count*/ -#endif ); extern void _XtVaToArgList( -#if NeedFunctionPrototypes Widget /*widget*/, va_list /*var*/, int /*max_count*/, ArgList* /*args_return*/, Cardinal* /*num_args_return*/ -#endif ); extern void _XtVaToTypedArgList( -#if NeedFunctionPrototypes va_list /*var*/, int /*count*/, XtTypedArgList* /*args_return*/, Cardinal* /*num_args_return*/ -#endif ); extern XtTypedArgList _XtVaCreateTypedArgList( -#if NeedFunctionPrototypes va_list /*var*/, int /*count*/ -#endif ); extern void _XtFreeArgList( -#if NeedFunctionPrototypes ArgList /*args*/, int /*total_count*/, int /*typed_count*/ -#endif ); extern void _XtGetApplicationResources( -#if NeedFunctionPrototypes Widget /*w*/, XtPointer /*base*/, XtResourceList /*resources*/, Cardinal /*num_resources*/, ArgList /*args*/, Cardinal /*num_args*/, XtTypedArgList /*typed_args*/, Cardinal /*num_typed_args*/ -#endif ); extern void _XtGetSubresources( -#if NeedFunctionPrototypes Widget /*w*/, XtPointer /*base*/, const char* /*name*/, const char* /*class*/, XtResourceList /*resources*/, Cardinal /*num_resources*/, ArgList /*args*/, Cardinal /*num_args*/, XtTypedArgList /*typed_args*/, Cardinal /*num_typed_args*/ -#endif ); #endif /* _VarargsI_h_ */ diff --git a/include/X11/Xtos.h b/include/X11/Xtos.h index 3b1b91d..f87fdb2 100644 --- a/include/X11/Xtos.h +++ b/include/X11/Xtos.h @@ -31,13 +31,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL @@ -48,7 +48,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xt/Xtos.h,v 3.10 2002/04/04 14:05:35 eich Exp $ */ +/* $XFree86: xc/lib/Xt/Xtos.h,v 3.13 2003/10/24 15:47:35 tsi Exp $ */ #ifndef _Xtos_h #define _Xtos_h @@ -61,20 +61,16 @@ SOFTWARE. #define WORD64 #endif -#if defined(__alpha) || defined(__alpha__) || \ +#if defined (_LP64) || \ + defined(__alpha) || defined(__alpha__) || \ defined(__ia64__) || defined(ia64) || \ defined(__sparc64__) || \ defined(__s390x__) || \ (defined(__hppa__) && defined(__LP64__)) || \ - defined(__x86_64__) || defined(x86_64) + defined(__AMD64__) || defined(AMD64) || \ + (defined(sgi) && (_MIPS_SZLONG == 64)) #define LONG64 #endif -#ifdef __sgi -#if (_MIPS_SZLONG == 64) -#define LONG64 -#endif -#endif - #endif /* _Xtos_h */ /* DON'T ADD STUFF AFTER THIS #endif */ |