From 5eeb0793ae2e9195901400632fb694d0f3063bd9 Mon Sep 17 00:00:00 2001
From: Andy Cedilnik <andy.cedilnik@kitware.com>
Date: Thu, 19 Sep 2002 11:00:48 -0400
Subject: [PATCH] Fix all defines on Windows

---
 Source/WXDialog/wxincludes.h | 34 +++++++++++++++++++++++++++-------
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/Source/WXDialog/wxincludes.h b/Source/WXDialog/wxincludes.h
index be5b4e668..e673aab0c 100644
--- a/Source/WXDialog/wxincludes.h
+++ b/Source/WXDialog/wxincludes.h
@@ -1,12 +1,32 @@
 #ifdef WIN32
 
-#define __WIN32 
-#define _WINDOWS
-#define __WINDOWS__
-#define __WXMSW__
-#define __WIN32__
-#define WINVER 0x0400
-#define STRICT
+#ifndef __WIN32
+#  define __WIN32 
+#endif 
+
+#ifndef _WINDOWS
+#  define _WINDOWS
+#endif
+
+#ifndef __WINDOWS__
+#  define __WINDOWS__
+#endif
+
+#ifndef __WXMSW__
+#  define __WXMSW__
+#endif
+
+#ifndef __WIN32__
+#  define __WIN32__
+#endif
+
+#ifndef WINVER
+#  define WINVER 0x0400
+#endif
+
+#ifndef STRICT
+#  define STRICT
+#endif
 
 
 #include "wx/defs.h"