regrouped the fix by VZ so that __MWERKS__ comes first, since CW also defines _MSC_VE...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1170 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 110c18ae7ade03da370507b49129e967bcb802dc..41cef19c9623e348dd86754ba68899239048119d 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -104,16 +104,16 @@
 // VC++ 4.0 is 1000.
 
 // Add more tests here for compilers that don't already define bool.
-#if defined(_MSC_VER) && (_MSC_VER <= 1000)
+#if defined( __MWERKS__ )
+    #if (__MWERKS__ < 0x1000) || !__option(bool)
+        typedef unsigned int bool;
+    #endif
+#elif defined(_MSC_VER) && (_MSC_VER <= 1000)
     typedef unsigned int bool;
 #elif defined(_MSC_VER) && (_MSC_VER == 1020)
     #define bool unsigned int
 #elif defined(__BORLANDC__) && (__BORLANDC__ < 0x500)
     typedef unsigned int bool;
-#elif defined(__MWERKS__) 
-    #if (__MWERKS__ < 0x1000) || !__option(bool)
-        typedef unsigned int bool;
-    #endif
 #endif
 
 #if ( defined(_MSC_VER) && (_MSC_VER <= 800) ) || defined(__GNUWIN32__)