diff options
| author | dgp <dgp@users.sourceforge.net> | 2013-04-01 17:12:10 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2013-04-01 17:12:10 (GMT) |
| commit | d5b7206362a9e60c41e3de7e60ead1034c8d50f5 (patch) | |
| tree | ecb30d7095d0f07e259d36913140447b6303e4a7 /generic | |
| parent | b8f8082aad49088238582658c22248f9469ad055 (diff) | |
| parent | d81f8f7c49270ddc93b4d639c0e7f77767c4fd47 (diff) | |
| download | tk-d5b7206362a9e60c41e3de7e60ead1034c8d50f5.zip tk-d5b7206362a9e60c41e3de7e60ead1034c8d50f5.tar.gz tk-d5b7206362a9e60c41e3de7e60ead1034c8d50f5.tar.bz2 | |
3607830 Runtime checks that Xkb is available in the X server before trying to
use. Adapted from patch from Brian Griffin.
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkCmds.c | 2 | ||||
| -rw-r--r-- | generic/tkInt.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/generic/tkCmds.c b/generic/tkCmds.c index acb7496..ebf6444 100644 --- a/generic/tkCmds.c +++ b/generic/tkCmds.c @@ -423,7 +423,7 @@ TkFreeBindingTags( * have to be freed. */ - ckfree(p); + ckfree((char *)p); } } ckfree((char *) winPtr->tagPtr); diff --git a/generic/tkInt.h b/generic/tkInt.h index 9a36e1e..74fd351 100644 --- a/generic/tkInt.h +++ b/generic/tkInt.h @@ -570,6 +570,7 @@ typedef struct TkDisplay { #define TK_DISPLAY_USE_IM (1 << 1) #define TK_DISPLAY_WM_TRACING (1 << 3) #define TK_DISPLAY_IN_WARP (1 << 4) +#define TK_DISPLAY_USE_XKB (1 << 5) /* * One of the following structures exists for each error handler created by a |