summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2018-12-26 14:55:18 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2018-12-26 14:55:18 (GMT)
commitb68e469c6fcec04a86935ae2e8853197213f40db (patch)
tree164aafce2e7295d828252e8f67e1696ed5720c73 /win
parent81b0bd7641a9d2f63154c97d41c27bbb696ef674 (diff)
downloadtk-b68e469c6fcec04a86935ae2e8853197213f40db.zip
tk-b68e469c6fcec04a86935ae2e8853197213f40db.tar.gz
tk-b68e469c6fcec04a86935ae2e8853197213f40db.tar.bz2
Change None/ControlMask on win32 (and MacOSX - which is harmless) to being an enum. This fixes (hopefully) the ***POTENTIAL INCOMPATABILITY*** in previous commit
Diffstat (limited to 'win')
-rw-r--r--win/tkWinInt.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/win/tkWinInt.h b/win/tkWinInt.h
index b6f7a98..abac7b0 100644
--- a/win/tkWinInt.h
+++ b/win/tkWinInt.h
@@ -41,11 +41,6 @@
#define SPI_SETKEYBOARDCUES 0x100B
#endif
-#if defined(_WIN32) && !defined(ControlMask) /* prevent conflicting define against windows.h, bug [9e31fd9449] */
-# define ControlMask (1<<2)
-#endif
-
-
/*
* The TkWinDCState is used to save the state of a device context so that it
* can be restored later.