summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-05-02 11:42:15 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-05-02 11:42:15 (GMT)
commit5df3264a13d55f5084edd72ee1d3f46b6009c389 (patch)
treeacca09601df9018655b163341b6f6ae34ff234e6
parent64ac9dba8558f572db2bd2d6f908134796bf92c3 (diff)
parentaa8efe88661be2b380149cb1e1d7c0e9313c4130 (diff)
downloadtk-5df3264a13d55f5084edd72ee1d3f46b6009c389.zip
tk-5df3264a13d55f5084edd72ee1d3f46b6009c389.tar.gz
tk-5df3264a13d55f5084edd72ee1d3f46b6009c389.tar.bz2
merge-mark
-rw-r--r--ChangeLog2
-rw-r--r--generic/tkStubInit.c6
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 3cc2e47..047b464 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
2012-04-29 Jan Nijtmans <nijtmans@users.sf.net>
- * library/tk.tcl: [Bug 3508771]: Window placement with multiple screens
+ * library/tk.tcl: [Bug 533519]: Window placement with multiple screens
* generic/tkBind.c:
* generic/tkFocus.c:
* generic/tkMenuDraw.c:
diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c
index fe04206..e19180f 100644
--- a/generic/tkStubInit.c
+++ b/generic/tkStubInit.c
@@ -98,6 +98,12 @@ static void *Tk_GetHINSTANCE()
(const char *) &tkIntStubs, &hInstance);
return hInstance;
}
+ /* TODO: To be implemented for Cygwin */
+# define Tk_AttachHWND 0
+# define Tk_GetHWND 0
+# define Tk_HWNDToWindow 0
+# define Tk_PointerEvent 0
+# define Tk_TranslateWinEvent 0
# else /* !__CYGWIN__ */
# define TkPutImage 0