summaryrefslogtreecommitdiffstats
path: root/xlib/X11/Xlib.h
diff options
context:
space:
mode:
authorstanton <stanton>1999-04-16 01:51:06 (GMT)
committerstanton <stanton>1999-04-16 01:51:06 (GMT)
commit03656f44f81469f459031fa3a4a7b09c8bc77712 (patch)
tree31378e81bd58f8c726fc552d6b30cbf3ca07497b /xlib/X11/Xlib.h
parent404fc236f34304df53b7e44bc7971d786b87d453 (diff)
downloadtk-03656f44f81469f459031fa3a4a7b09c8bc77712.zip
tk-03656f44f81469f459031fa3a4a7b09c8bc77712.tar.gz
tk-03656f44f81469f459031fa3a4a7b09c8bc77712.tar.bz2
* Merged 8.1 branch into the main trunk
Diffstat (limited to 'xlib/X11/Xlib.h')
-rw-r--r--xlib/X11/Xlib.h71
1 files changed, 1 insertions, 70 deletions
diff --git a/xlib/X11/Xlib.h b/xlib/X11/Xlib.h
index 44358bd..b185394 100644
--- a/xlib/X11/Xlib.h
+++ b/xlib/X11/Xlib.h
@@ -546,7 +546,7 @@ typedef struct {
Bool same_screen; /* same screen flag */
char trans_chars[XMaxTransChars];
/* translated characters */
- int nchars;
+ int nbytes;
} XKeyEvent;
typedef XKeyEvent XKeyPressedEvent;
typedef XKeyEvent XKeyReleasedEvent;
@@ -1190,24 +1190,6 @@ typedef int (*XErrorHandler) ( /* WARNING, this type not in Xlib spec */
_XFUNCPROTOBEGIN
-extern Atom XInternAtom(
-#if NeedFunctionPrototypes
- Display* /* display */,
- _Xconst char* /* atom_name */,
- Bool /* only_if_exists */
-#endif
-);
-
-
-extern GC XCreateGC(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Drawable /* d */,
- unsigned long /* valuemask */,
- XGCValues* /* values */
-#endif
-);
-
extern void XDrawLine(
#if NeedFunctionPrototypes
@@ -1234,57 +1216,6 @@ extern void XFillRectangle(
#endif
);
-extern void XFreeGC(
-#if NeedFunctionPrototypes
- Display* /* display */,
- GC /* gc */
-#endif
-);
-
-extern Status XParseColor(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Colormap /* colormap */,
- _Xconst char* /* spec */,
- XColor* /* exact_def_return */
-#endif
-);
-
-extern void XSetClipMask(
-#if NeedFunctionPrototypes
- Display* /* display */,
- GC /* gc */,
- Pixmap /* pixmap */
-#endif
-);
-
-
-extern void XSetClipOrigin(
-#if NeedFunctionPrototypes
- Display* /* display */,
- GC /* gc */,
- int /* clip_x_origin */,
- int /* clip_y_origin */
-#endif
-);
-
-extern void XSetForeground(
-#if NeedFunctionPrototypes
- Display* /* display */,
- GC /* gc */,
- unsigned long /* foreground */
-#endif
-);
-
-extern void XSetTSOrigin(
-#if NeedFunctionPrototypes
- Display* /* display */,
- GC /* gc */,
- int /* ts_x_origin */,
- int /* ts_y_origin */
-#endif
-);
-
#include "tkIntXlibDecls.h"