summaryrefslogtreecommitdiffstats
path: root/generic/tkInt.h
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2010-01-02 10:43:25 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2010-01-02 10:43:25 (GMT)
commit0343b4ad6fd53a1cdb11625ea07929ea2a8b5208 (patch)
tree53a45c4d70540a15b2d1bb2508e567ad721e65b6 /generic/tkInt.h
parentf9835439f2dda098e304b915a68e9ef127ada168 (diff)
downloadtk-0343b4ad6fd53a1cdb11625ea07929ea2a8b5208.zip
tk-0343b4ad6fd53a1cdb11625ea07929ea2a8b5208.tar.gz
tk-0343b4ad6fd53a1cdb11625ea07929ea2a8b5208.tar.bz2
Fix [Bug 1373712] and [Bug 1924761].
Diffstat (limited to 'generic/tkInt.h')
-rw-r--r--generic/tkInt.h23
1 files changed, 19 insertions, 4 deletions
diff --git a/generic/tkInt.h b/generic/tkInt.h
index 9cec9ab..cb6c7d9 100644
--- a/generic/tkInt.h
+++ b/generic/tkInt.h
@@ -11,7 +11,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: $Id: tkInt.h,v 1.82.2.5 2010/01/01 23:03:42 dkf Exp $
+ * RCS: $Id: tkInt.h,v 1.82.2.6 2010/01/02 10:43:26 dkf Exp $
*/
#ifndef _TKINT
@@ -853,6 +853,22 @@ typedef struct TkWindow {
} TkWindow;
/*
+ * Real definition of some events. Note that these events come from outside
+ * but have internally generated pieces added to them.
+ */
+
+typedef struct {
+ XKeyEvent keyEvent; /* The real event from X11. */
+ char *charValuePtr; /* A pointer to a string that holds the key's
+ * %A substitution text (before backslash
+ * adding), or NULL if that has not been
+ * computed yet. If non-NULL, this string was
+ * allocated with ckalloc(). */
+ int charValueLen; /* Length of string in charValuePtr when that
+ * is non-NULL. */
+} TkKeyEvent;
+
+/*
* The following structure is used as a two way map between integers and
* strings, usually to map between an internal C representation and the
* strings used in Tcl.
@@ -1113,9 +1129,8 @@ MODULE_SCOPE int Tk_WmObjCmd(ClientData clientData, Tcl_Interp *interp,
int objc, Tcl_Obj *const objv[]);
MODULE_SCOPE int Tk_GetDoublePixelsFromObj(Tcl_Interp *interp,
- Tk_Window tkwin,
- Tcl_Obj *objPtr,
- double *doublePtr);
+ Tk_Window tkwin, Tcl_Obj *objPtr,
+ double *doublePtr);
MODULE_SCOPE void TkEventInit(void);
MODULE_SCOPE void TkRegisterObjTypes(void);