corrected (after wxTString untimely death) and expanded

[wxWidgets.git] / utils / wxprop / src / prop.cpp

diff --git a/utils/wxprop/src/prop.cpp b/utils/wxprop/src/prop.cpp
index 35bf277302ce64c1b43cf7313dce1a10cf8d23bd..4bd8d72efe1103c7bc4782dac37c101460194bce 100644 (file)
--- a/utils/wxprop/src/prop.cpp
+++ b/utils/wxprop/src/prop.cpp
@@ -29,7 +29,7 @@
 #include <math.h>
 #include <string.h>
 
-#if defined(__WINDOWS__) && !defined(__GNUWIN32__)
+#if defined(__WXMSW__) && !defined(__GNUWIN32__)
 #include <strstrea.h>
 #else
 #include <strstream.h>
@@ -307,7 +307,7 @@ wxPropertyValue *wxPropertyValue::NewCopy(void)
     case wxPropertyValueInteger:
       return new wxPropertyValue(value.integer);
     case wxPropertyValuebool:
-      return new wxPropertyValue((value.integer != 0));
+      return new wxPropertyValue((bool) (value.integer != 0));
     case wxPropertyValueReal:
       return new wxPropertyValue(value.real);
     case wxPropertyValueString: