diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-26 22:48:39 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-26 22:48:39 +0000 |
| commit | b90c05162b5edd08338a060f5777419654fa6d2e (patch) | |
| tree | 346b8c7439d7d8db30404ad9f4db4c4e1725c252 /src/Resources.c | |
| parent | a6bdd56c5b098599942e4091ae7e2af2d4631b44 (diff) | |
merge latest (4.3.99.16) from XFree86 (vendor) branch
Diffstat (limited to 'src/Resources.c')
| -rw-r--r-- | src/Resources.c | 68 |
1 files changed, 21 insertions, 47 deletions
diff --git a/src/Resources.c b/src/Resources.c index d8e5d40..859a801 100644 --- a/src/Resources.c +++ b/src/Resources.c @@ -59,7 +59,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xt/Resources.c,v 1.9 2001/12/14 19:56:28 dawes Exp $ */ +/* $XFree86: xc/lib/Xt/Resources.c,v 1.12 2003/08/27 21:39:38 tsi Exp $ */ /*LINTLIBRARY*/ #include "IntrinsicI.h" @@ -1071,33 +1071,17 @@ XtCacheRef *_XtGetResources(w, args, num_args, typed_args, num_typed_args) } /* _XtGetResources */ -#if NeedFunctionPrototypes void _XtGetSubresources ( - Widget w, - XtPointer base, - const char* name, - const char* class, - XtResourceList resources, - Cardinal num_resources, - ArgList args, + Widget w, /* Widget "parent" of subobject */ + XtPointer base, /* Base address to write to */ + const char* name, /* name of subobject */ + const char* class, /* class of subobject */ + XtResourceList resources, /* resource list for subobject */ + Cardinal num_resources, + ArgList args, /* arg list to override resources */ Cardinal num_args, XtTypedArgList typed_args, - Cardinal num_typed_args - ) -#else -void _XtGetSubresources (w, base, name, class, resources, num_resources, - args, num_args) - Widget w; /* Widget "parent" of subobject */ - XtPointer base; /* Base address to write to */ - String name; /* name of subobject */ - String class; /* class of subobject */ - XtResourceList resources; /* resource list for subobject */ - Cardinal num_resources; - ArgList args; /* arg list to override resources */ - Cardinal num_args; - XtTypedArgsList typed_args; - Cardinal num_typed_args; -#endif + Cardinal num_typed_args) { XrmName *names, names_s[50]; XrmClass *classes, classes_s[50]; @@ -1144,29 +1128,15 @@ void _XtGetSubresources (w, base, name, class, resources, num_resources, UNLOCK_APP(app); } -#if NeedFunctionPrototypes void XtGetSubresources ( - Widget w, - XtPointer base, - _Xconst char* name, - _Xconst char* class, - XtResourceList resources, - Cardinal num_resources, - ArgList args, - Cardinal num_args - ) -#else -void XtGetSubresources (w, base, name, class, resources, num_resources, - args, num_args) - Widget w; /* Widget "parent" of subobject */ - XtPointer base; /* Base address to write to */ - String name; /* name of subobject */ - String class; /* class of subobject */ - XtResourceList resources; /* resource list for subobject */ - Cardinal num_resources; - ArgList args; /* arg list to override resources */ - Cardinal num_args; -#endif + Widget w, /* Widget "parent" of subobject */ + XtPointer base, /* Base address to write to */ + _Xconst char* name, /* name of subobject */ + _Xconst char* class, /* class of subobject */ + XtResourceList resources, /* resource list for subobject */ + Cardinal num_resources, + ArgList args, /* arg list to override resources */ + Cardinal num_args) { _XtGetSubresources (w, base, name, class, resources, num_resources, args, num_args, NULL, 0); } @@ -1189,12 +1159,16 @@ void _XtGetApplicationResources XrmQuarkList quark_args; XrmResourceList* table; Cardinal count, ntyped_args = num_typed_args; +#ifdef XTHREADS XtAppContext app; +#endif if (num_resources == 0) return; +#ifdef XTHREADS if (w == NULL) app = _XtDefaultAppContext(); else app = XtWidgetToApplicationContext(w); +#endif LOCK_APP(app); /* Get full name, class of application */ |