summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--win/tkWin.h8
-rw-r--r--win/tkWinDialog.c4
-rw-r--r--win/tkWinMenu.c4
-rw-r--r--win/tkWinX.c10
5 files changed, 14 insertions, 19 deletions
diff --git a/ChangeLog b/ChangeLog
index fb47146..deffb07 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2013-09-13 Jan Nijtmans <nijtmans@users.sf.net>
+
+ * win/tkWin.h Move definitions of WINVER/_WIN32_WINNT
+ * win/tkWinDialog.h to one place, now that we only support
+ * win/tkWinMenu.c Win2000+
+ * win/tkWinX.c
+
2010-09-10 Jan Nijtmans <nijtmans@users.sf.net>
* win/tkWinEmbed.c: Make compilable with -DUNICODE
diff --git a/win/tkWin.h b/win/tkWin.h
index ae03a93..08d6184 100644
--- a/win/tkWin.h
+++ b/win/tkWin.h
@@ -9,7 +9,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkWin.h,v 1.16 2010/04/29 15:28:04 nijtmans Exp $
+ * RCS: @(#) $Id: tkWin.h,v 1.17 2010/09/13 08:11:59 nijtmans Exp $
*/
#ifndef _TKWIN
@@ -24,10 +24,10 @@
*/
#ifndef WINVER
-#define WINVER 0x0410
+#define WINVER 0x0500
#endif
-#ifndef _WIN32_WINDOWS
-#define _WIN32_WINDOWS 0x0410
+#ifndef _WIN32_WINNT
+#define _WIN32_WINNT 0x0500
#endif
#ifndef _TK
diff --git a/win/tkWinDialog.c b/win/tkWinDialog.c
index 97248bc..4a09bae 100644
--- a/win/tkWinDialog.c
+++ b/win/tkWinDialog.c
@@ -8,7 +8,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkWinDialog.c,v 1.76 2010/09/10 08:59:26 nijtmans Exp $
+ * RCS: @(#) $Id: tkWinDialog.c,v 1.77 2010/09/13 08:11:59 nijtmans Exp $
*
*/
@@ -18,8 +18,6 @@
#undef UNICODE
#undef _UNICODE
-#define WINVER 0x0500 /* Requires Windows 2K definitions */
-#define _WIN32_WINNT 0x0500
#include "tkWinInt.h"
#include "tkFileFilter.h"
#include "tkFont.h"
diff --git a/win/tkWinMenu.c b/win/tkWinMenu.c
index 367d916..6760e14 100644
--- a/win/tkWinMenu.c
+++ b/win/tkWinMenu.c
@@ -10,7 +10,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkWinMenu.c,v 1.74 2010/09/10 08:59:25 nijtmans Exp $
+ * RCS: @(#) $Id: tkWinMenu.c,v 1.75 2010/09/13 08:11:59 nijtmans Exp $
*/
/* TODO: This file does not compile in UNICODE mode.
@@ -19,8 +19,6 @@
#undef UNICODE
#undef _UNICODE
-#define WINVER 0x0500 /* Requires Windows 2K definitions */
-#define _WIN32_WINNT 0x0500
#define OEMRESOURCE
#include "tkWinInt.h"
#include "tkMenu.h"
diff --git a/win/tkWinX.c b/win/tkWinX.c
index 1de32fc..c093474 100644
--- a/win/tkWinX.c
+++ b/win/tkWinX.c
@@ -10,7 +10,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkWinX.c,v 1.67 2010/09/10 08:59:26 nijtmans Exp $
+ * RCS: @(#) $Id: tkWinX.c,v 1.68 2010/09/13 08:11:59 nijtmans Exp $
*/
/* TODO: This file does not compile in UNICODE mode.
@@ -19,14 +19,6 @@
#undef UNICODE
#undef _UNICODE
-/*
- * Make sure the SendInput API is available (NT SP 3):
- */
-#if (_WIN32_WINNT <= 0x0400)
-#undef _WIN32_WINNT
-#define _WIN32_WINNT 0x0403
-#endif
-
#include "tkWinInt.h"
/*