summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2011-10-11 11:33:00 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2011-10-11 11:33:00 (GMT)
commitbf90364eb7e18c50416631c1dc5f6401871886df (patch)
tree34de26ac635c3d2578714c975e3d025874302663
parentf75dd076093970f42c020063f04446e8e3abef86 (diff)
downloadtk-bf90364eb7e18c50416631c1dc5f6401871886df.zip
tk-bf90364eb7e18c50416631c1dc5f6401871886df.tar.gz
tk-bf90364eb7e18c50416631c1dc5f6401871886df.tar.bz2
Add dummy user_data field to XVirtualEvent, for improved upwards compatibility with Tk 8.5
-rw-r--r--ChangeLog6
-rw-r--r--generic/tk.h5
2 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index fb75794..8cf7f10 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-10-11 Jan Nijtmans <nijtmans@users.sf.net>
+
+ * generic/tk.h: Add dummy user_data field to
+ XVirtualEvent, for improved upwards compatibility
+ with Tk 8.5.
+
2011-09-26 Jan Nijtmans <nijtmans@users.sf.net>
* win/rules.vc: Supporrt Visual Studio 11
diff --git a/generic/tk.h b/generic/tk.h
index f03992f..e777947 100644
--- a/generic/tk.h
+++ b/generic/tk.h
@@ -653,6 +653,10 @@ typedef struct Tk_GeomMgr {
* the most information to the user. The only difference is the changing
* of the detail field for a virtual event so that it holds the name of the
* virtual event being triggered.
+ *
+ * When using this structure, if you want your code to work correctly
+ * in Tk 8.5 as well, you should ensure that you zero out all the
+ * fields first using memset() or bzero().
*/
typedef struct {
@@ -669,6 +673,7 @@ typedef struct {
unsigned int state; /* key or button mask */
Tk_Uid name; /* Name of virtual event. */
Bool same_screen; /* same screen flag */
+ Tcl_Obj *user_data; /* not used in Tk 8.4 */
} XVirtualEvent;
typedef struct {