X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/73799292cab3e8fa4873a5aecd2d312ad2fbf5e5..ae901b234c4a0aa7c1777b3bd181dd7f8517ad21:/src/common/variant.cpp

diff --git a/src/common/variant.cpp b/src/common/variant.cpp
index c5de3a4ada..661a6190e5 100644
--- a/src/common/variant.cpp
+++ b/src/common/variant.cpp
@@ -908,13 +908,13 @@ wxVariant::wxVariant(const wxCStrData& val, const wxString& name)
     m_name = name;
 }
 
-wxVariant::wxVariant(const wxCharBuffer& val, const wxString& name)
+wxVariant::wxVariant(const wxScopedCharBuffer& val, const wxString& name)
 {
     m_data = new wxVariantDataString(wxString(val));
     m_name = name;
 }
 
-wxVariant::wxVariant(const wxWCharBuffer& val, const wxString& name)
+wxVariant::wxVariant(const wxScopedWCharBuffer& val, const wxString& name)
 {
     m_data = new wxVariantDataString(wxString(val));
     m_name = name;
@@ -1271,9 +1271,8 @@ bool wxVariantDataDateTime::Read(wxString& str)
         return true;
     }
 
-    if(! m_value.ParseDateTime(str.c_str()/*FIXME-UTF8*/))
-        return false;
-    return true;
+    wxString::const_iterator end;
+    return m_value.ParseDateTime(str, &end) && end == str.end();
 }
 
 // wxVariant