more AFM metrics fixes

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

diff --git a/src/generic/prop.cpp b/src/generic/prop.cpp
index 44827dcf22326684472620fb7f7f8c1433f06717..a44800754d93571f8c731d1b0a98d0ac27a7bb9d 100644 (file)
--- a/src/generic/prop.cpp
+++ b/src/generic/prop.cpp
@@ -328,9 +328,7 @@ wxPropertyValue *wxPropertyValue::NewCopy(void) const
      return new wxPropertyValue(m_value.stringPtr);
 
    case wxPropertyValueNull:
-#ifdef __X__
-    cerr << "Should never get here!\n";
-#endif
+    wxFAIL_MSG( _T("Should never get here!\n" ) );
     break;
   }
   return NULL;
@@ -371,7 +369,18 @@ void wxPropertyValue::Copy(wxPropertyValue& copyFrom)
     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
+#endif // if 0
+
+      (*this) = (bool)(s != 0);
+      
       return ;
     }
 
@@ -390,9 +399,7 @@ void wxPropertyValue::Copy(wxPropertyValue& copyFrom)
       return;
     }
    case wxPropertyValueNull:
-#ifdef __X__
-    cerr << "Should never get here!\n";
-#endif
+    wxFAIL_MSG( _T("Should never get here!\n" ) );
     break;
   }
 }