summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormdejong <mdejong>2002-03-07 02:08:32 (GMT)
committermdejong <mdejong>2002-03-07 02:08:32 (GMT)
commit129c51ddc0f82377e4e4ef3600ab4639035192e1 (patch)
treee3d5d25b8fc9d06638a6af9192d5451260ba7893
parentb19ac659c5733dd06776232de8a0d012e49a0c4a (diff)
downloadtk-129c51ddc0f82377e4e4ef3600ab4639035192e1.zip
tk-129c51ddc0f82377e4e4ef3600ab4639035192e1.tar.gz
tk-129c51ddc0f82377e4e4ef3600ab4639035192e1.tar.bz2
* win/tkWinX.c: Define _WIN32_IE as 0x0300
before including commctrl.h so that we can access the InitCommonControlsEx API when building Tk with mingw.
-rw-r--r--ChangeLog7
-rw-r--r--win/tkWinX.c13
2 files changed, 19 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e41a93f..ab60253 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-03-06 Mo DeJong <mdejong@users.sourceforge.net>
+
+ * win/tkWinX.c: Define _WIN32_IE as 0x0300
+ before including commctrl.h so that we can
+ access the InitCommonControlsEx API when
+ building Tk with mingw.
+
2002-03-06 Donal K. Fellows <fellowsd@cs.man.ac.uk>
* README, generic/tk.h, unix/configure.in, unix/tk.spec:
diff --git a/win/tkWinX.c b/win/tkWinX.c
index e17a8fb..3fd0956 100644
--- a/win/tkWinX.c
+++ b/win/tkWinX.c
@@ -10,10 +10,21 @@
* 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.18 2002/01/25 21:09:37 dgp Exp $
+ * RCS: @(#) $Id: tkWinX.c,v 1.19 2002/03/07 02:08:32 mdejong Exp $
*/
#include "tkWinInt.h"
+
+/*
+ * The w32api 1.1 package (included in Mingw 1.1) does not define _WIN32_IE
+ * by default. Define it here to gain access to the InitCommonControlsEx API
+ * in commctrl.h.
+ */
+
+#ifndef _WIN32_IE
+#define _WIN32_IE 0x0300
+#endif
+
#include <commctrl.h>
/*