summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorpatthoyts@users.sourceforge.net <patthoyts>2007-12-10 12:03:53 (GMT)
committerpatthoyts@users.sourceforge.net <patthoyts>2007-12-10 12:03:53 (GMT)
commit4be83ea69132771c36b5af13b0f4c8fac9d43bf2 (patch)
tree3be0766e5ef672f698f05a31cca0c975813c7535 /win
parenta8a763814c98596b928a37bcc460ed88c2c6b815 (diff)
downloadtk-4be83ea69132771c36b5af13b0f4c8fac9d43bf2.zip
tk-4be83ea69132771c36b5af13b0f4c8fac9d43bf2.tar.gz
tk-4be83ea69132771c36b5af13b0f4c8fac9d43bf2.tar.bz2
Only tkWin.h should include windows.h unless we have an explicit override of
the WINVER macro.
Diffstat (limited to 'win')
-rw-r--r--win/ttkWinMonitor.c3
-rw-r--r--win/ttkWinTheme.c4
-rw-r--r--win/ttkWinXPTheme.c5
3 files changed, 4 insertions, 8 deletions
diff --git a/win/ttkWinMonitor.c b/win/ttkWinMonitor.c
index 2856365..8be32e4 100644
--- a/win/ttkWinMonitor.c
+++ b/win/ttkWinMonitor.c
@@ -1,11 +1,10 @@
-/* $Id: ttkWinMonitor.c,v 1.14 2007/12/05 19:08:00 hobbs Exp $
+/* $Id: ttkWinMonitor.c,v 1.15 2007/12/10 12:03:55 patthoyts Exp $
*/
#ifdef _MSC_VER
#define WIN32_LEAN_AND_MEAN
#endif
-#include <windows.h>
#include <tkWinInt.h>
#include "ttk/ttkTheme.h"
diff --git a/win/ttkWinTheme.c b/win/ttkWinTheme.c
index e8b32e4..2e29f46 100644
--- a/win/ttkWinTheme.c
+++ b/win/ttkWinTheme.c
@@ -1,14 +1,12 @@
/* winTheme.c - Copyright (C) 2004 Pat Thoyts <patthoyts@users.sf.net>
*
- * $Id: ttkWinTheme.c,v 1.10 2007/12/02 04:32:23 jenglish Exp $
+ * $Id: ttkWinTheme.c,v 1.11 2007/12/10 12:03:55 patthoyts Exp $
*/
#ifdef _MSC_VER
#define WIN32_LEAN_AND_MEAN
#endif
-#include <windows.h>
-
#include <tkWinInt.h>
#ifndef DFCS_HOT /* Windows 98/Me, Windows 200/XP only */
diff --git a/win/ttkWinXPTheme.c b/win/ttkWinXPTheme.c
index 34371f2..7cd7f48 100644
--- a/win/ttkWinXPTheme.c
+++ b/win/ttkWinXPTheme.c
@@ -1,5 +1,5 @@
/*
- * $Id: ttkWinXPTheme.c,v 1.16 2007/12/02 04:32:23 jenglish Exp $
+ * $Id: ttkWinXPTheme.c,v 1.17 2007/12/10 12:03:55 patthoyts Exp $
*
* Tk theme engine which uses the Windows XP "Visual Styles" API
* Adapted from Georgios Petasis' XP theme patch.
@@ -19,8 +19,7 @@
#ifndef HAVE_UXTHEME_H
/* Stub for platforms that lack the XP theme API headers: */
-#include <windows.h>
-#include <tcl.h>
+#include <tkWinInt.h>
int TtkXPTheme_Init(Tcl_Interp *interp, HWND hwnd) { return TCL_OK; }
#else