From 07d529beffc9cd3f7e50d532f77dd47ca2bd6234 Mon Sep 17 00:00:00 2001
From: patthoyts <patthoyts@users.sourceforge.net>
Date: Mon, 10 Dec 2007 12:03:53 +0000
Subject: Only tkWin.h should include windows.h unless we have an explicit
 override of the WINVER macro.

---
 ChangeLog           | 4 ++++
 win/ttkWinMonitor.c | 3 +--
 win/ttkWinTheme.c   | 4 +---
 win/ttkWinXPTheme.c | 5 ++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index dfa2961..790565f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-12-10  Pat Thoyts  <patthoyts@users.sourceforge.net>
 
+	* win/ttkWinMonitor.c:  Only tkWin.h should include windows.h
+	* win/ttkWinTheme.c:    unless we have an explicit override of
+	* tin/ttkWinXPTheme.c:  the WINVER macro.
+
 	* win/rules.vc: Handle MSVC 9 (aka: Visual Studio 2008)
 
 	* tests/safe.test: Update for 'unload' as a safe command (tcl 8.5b3+)
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
 
-- 
cgit v0.12