summaryrefslogtreecommitdiffstats
path: root/xlib
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2018-10-05 21:26:32 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2018-10-05 21:26:32 (GMT)
commite762154f0bff6ba4f30c05b791f85c1ea8c5840f (patch)
tree7ae4f023810416ab755f8319d3bafdf15b58435e /xlib
parentb5e5eb8d4b8a55802c54fa30f26ae49fab86033b (diff)
downloadtk-e762154f0bff6ba4f30c05b791f85c1ea8c5840f.zip
tk-e762154f0bff6ba4f30c05b791f85c1ea8c5840f.tar.gz
tk-e762154f0bff6ba4f30c05b791f85c1ea8c5840f.tar.bz2
More code cleanup, related to (unused) wchar_t, TCL_THREADS macro, and better use of size_t
Diffstat (limited to 'xlib')
-rw-r--r--xlib/X11/Xlib.h15
-rw-r--r--xlib/X11/Xutil.h25
2 files changed, 0 insertions, 40 deletions
diff --git a/xlib/X11/Xlib.h b/xlib/X11/Xlib.h
index b027e28..09dc518 100644
--- a/xlib/X11/Xlib.h
+++ b/xlib/X11/Xlib.h
@@ -45,13 +45,6 @@
#endif
#endif
-#ifndef X_WCHAR
-#include <stddef.h>
-#else
-/* replace this with #include or typedef appropriate for your system */
-typedef unsigned long wchar_t;
-#endif
-
typedef char *XPointer;
#define Bool int
@@ -1053,13 +1046,6 @@ typedef struct {
XFontSet font_set;
} XmbTextItem;
-typedef struct {
- wchar_t *chars;
- int nchars;
- int delta;
- XFontSet font_set;
-} XwcTextItem;
-
typedef void (*XIMProc)();
typedef struct _XIM *XIM;
@@ -1143,7 +1129,6 @@ typedef struct _XIMText {
Bool encoding_is_wchar;
union {
char *multi_byte;
- wchar_t *wide_char;
} string;
} XIMText;
diff --git a/xlib/X11/Xutil.h b/xlib/X11/Xutil.h
index 8141b1d..38ae9f5 100644
--- a/xlib/X11/Xutil.h
+++ b/xlib/X11/Xutil.h
@@ -748,22 +748,6 @@ extern int XmbTextListToTextProperty(
#endif
);
-extern int XwcTextListToTextProperty(
-#if NeedFunctionPrototypes
- Display* /* display */,
- wchar_t** /* list */,
- int /* count */,
- XICCEncodingStyle /* style */,
- XTextProperty* /* text_prop_return */
-#endif
-);
-
-extern void XwcFreeStringList(
-#if NeedFunctionPrototypes
- wchar_t** /* list */
-#endif
-);
-
extern Status XTextPropertyToStringList(
#if NeedFunctionPrototypes
XTextProperty* /* text_prop */,
@@ -781,15 +765,6 @@ extern int XmbTextPropertyToTextList(
#endif
);
-extern int XwcTextPropertyToTextList(
-#if NeedFunctionPrototypes
- Display* /* display */,
- XTextProperty* /* text_prop */,
- wchar_t*** /* list_return */,
- int* /* count_return */
-#endif
-);
-
extern void XUnionRectWithRegion(
#if NeedFunctionPrototypes
XRectangle* /* rectangle */,