summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Cedilnik <andy.cedilnik@kitware.com>2002-09-19 15:00:48 (GMT)
committerAndy Cedilnik <andy.cedilnik@kitware.com>2002-09-19 15:00:48 (GMT)
commit5eeb0793ae2e9195901400632fb694d0f3063bd9 (patch)
tree41855c166f9c9b1f9097674e14872c94fe76ed42
parent1cce2ed6e781ca47244846c0a1d86fb2f62bf9ed (diff)
downloadCMake-5eeb0793ae2e9195901400632fb694d0f3063bd9.zip
CMake-5eeb0793ae2e9195901400632fb694d0f3063bd9.tar.gz
CMake-5eeb0793ae2e9195901400632fb694d0f3063bd9.tar.bz2
Fix all defines on Windows
-rw-r--r--Source/WXDialog/wxincludes.h34
1 files changed, 27 insertions, 7 deletions
diff --git a/Source/WXDialog/wxincludes.h b/Source/WXDialog/wxincludes.h
index be5b4e6..e673aab 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"