more AFM metrics fixes

[wxWidgets.git] / src / generic / prop.cpp

diff --git a/src/generic/prop.cpp b/src/generic/prop.cpp
index 537588ba1879a5f5964152d3e5818b6672391d89..a44800754d93571f8c731d1b0a98d0ac27a7bb9d 100644 (file)
--- a/src/generic/prop.cpp
+++ b/src/generic/prop.cpp
@@ -369,12 +369,18 @@ void wxPropertyValue::Copy(wxPropertyValue& copyFrom)
     case wxPropertyValueStringPtr:
     {
       wxChar** s = copyFrom.StringValuePtr();
     case wxPropertyValueStringPtr:
     {
       wxChar** s = copyFrom.StringValuePtr();

+      
+#if 0      

       // what is this? are you trying to assign a bool or a string?  VA can't figure it out..
 #if defined(__VISAGECPP__) || defined( __VISUALC__ )
       (*this) = s;
 #else
       (*this) = s != 0;
 #endif
       // what is this? are you trying to assign a bool or a string?  VA can't figure it out..
 #if defined(__VISAGECPP__) || defined( __VISUALC__ )
       (*this) = s;
 #else
       (*this) = s != 0;
 #endif

+#endif // if 0
+
+      (*this) = (bool)(s != 0);
+      

       return ;
     }
 
       return ;
     }