WinCE build fix.

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

diff --git a/utils/wxprop/src/prop.cpp b/utils/wxprop/src/prop.cpp
index 933f38a56cd8f26f70c45393fa6590685f8273d0..59802962dee99168788d1d8a93279ea2ab561930 100644 (file)
--- a/utils/wxprop/src/prop.cpp
+++ b/utils/wxprop/src/prop.cpp
@@ -29,11 +29,15 @@
 #include <math.h>
 #include <string.h>
 
+#if wxUSE_IOSTREAMH
 #if defined(__WXMSW__) && !defined(__GNUWIN32__)
 #include <strstrea.h>
 #else
 #include <strstream.h>
 #endif
+#else
+#include <strstream>
+#endif
 
 #include "wx/window.h"
 #include "wx/utils.h"
@@ -204,7 +208,7 @@ wxPropertyValue::~wxPropertyValue(void)
     }
    case wxPropertyValueString:
    {
-     delete m_value.string;
+     delete[] m_value.string;
      break;
    }
    case wxPropertyValueList:
@@ -378,7 +382,7 @@ void wxPropertyValue::Copy(wxPropertyValue& copyFrom)
     case wxPropertyValueStringPtr:
     {
       char** s = copyFrom.StringValuePtr();
-      (*this) = s;
+      (*this) = s != 0;
       return ;
     }
       
@@ -959,13 +963,13 @@ void wxPropertySheet::UpdateAllViews( wxPropertyView *WXUNUSED(thisView) )
 // Add a property
 void wxPropertySheet::AddProperty(wxProperty *property)
 {
-  m_properties.Append(property->GetName().GetData(), property);
+  m_properties.Append((const char*) property->GetName(), property);
 }
 
 // Get property by name
 wxProperty *wxPropertySheet::GetProperty(wxString name)
 {
-  wxNode *node = m_properties.Find(name.GetData());
+  wxNode *node = m_properties.Find((const char*) name);
   if (!node)
     return NULL;
   else
@@ -1014,14 +1018,14 @@ wxPropertyValidatorRegistry::~wxPropertyValidatorRegistry(void)
   ClearRegistry();
 }
 
-void wxPropertyValidatorRegistry::RegisterValidator(wxString& typeName, wxPropertyValidator *validator)
+void wxPropertyValidatorRegistry::RegisterValidator(const wxString& typeName, wxPropertyValidator *validator)
 {
-  Put(typeName.GetData(), validator);
+  Put((const char*) typeName, validator);
 }
 
-wxPropertyValidator *wxPropertyValidatorRegistry::GetValidator(wxString& typeName)
+wxPropertyValidator *wxPropertyValidatorRegistry::GetValidator(const wxString& typeName)
 {
-  return (wxPropertyValidator *)Get(typeName.GetData());
+  return (wxPropertyValidator *)Get((const char*) typeName);
 }
 
 void wxPropertyValidatorRegistry::ClearRegistry(void)