diff options
| author | Lauri Kasanen <cand@gmx.com> | 2014-08-21 12:34:07 +0000 |
|---|---|---|
| committer | Lauri Kasanen <cand@gmx.com> | 2014-08-21 12:34:07 +0000 |
| commit | 9d96c7a26cf869226c95e8494129f135995789be (patch) | |
| tree | 7b0348687cc2f8533a1dd49e01b718d3eea2e368 | |
| parent | 64dd5df14145b95ee1730468c43afd60bfc7600a (diff) | |
X11: Use libX11 UTF-8 support when available.
This saves quite a bit of library size. STR #3107
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10237 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | FL/Xutf8.h | 4 | ||||
| -rw-r--r-- | src/xutf8/utf8Input.c | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/FL/Xutf8.h b/FL/Xutf8.h index 1e26cf97d..51fc28291 100644 --- a/FL/Xutf8.h +++ b/FL/Xutf8.h @@ -142,6 +142,9 @@ long XKeysymToUcs( KeySym keysym); +#ifdef X_HAVE_UTF8_STRING +#define XUtf8LookupString Xutf8LookupString +#else int XUtf8LookupString( XIC ic, @@ -150,6 +153,7 @@ XUtf8LookupString( int bytes_buffer, KeySym* keysym, Status* status_return); +#endif unsigned short XUtf8IsNonSpacing( diff --git a/src/xutf8/utf8Input.c b/src/xutf8/utf8Input.c index ee2c229e5..dc7ed3388 100644 --- a/src/xutf8/utf8Input.c +++ b/src/xutf8/utf8Input.c @@ -407,6 +407,7 @@ XConvertEucToUtf8(const char* locale, return len; } +#ifndef X_HAVE_UTF8_STRING int XUtf8LookupString(XIC ic, XKeyPressedEvent* event, @@ -447,6 +448,7 @@ XUtf8LookupString(XIC ic, } return len; } +#endif /* X11 has utf-8 */ #endif /* X11 only */ |