Set solid colour for whole control, not pages

[wxWidgets.git] / src / common / variant.cpp

diff --git a/src/common/variant.cpp b/src/common/variant.cpp
index f9682d8e9deaacfe620a544f3ab8b7c138e1f1fa..830859ec54fa8a46439921d6847290a250e73a7c 100644 (file)
--- a/src/common/variant.cpp
+++ b/src/common/variant.cpp
@@ -164,7 +164,7 @@ bool wxVariantDataList::Write(wxSTD ostream& str) const
 
 bool wxVariantDataList::Write(wxString& str) const
 {
-    str = wxT("");
+    str = wxEmptyString;
     wxList::compatibility_iterator node = m_value.GetFirst();
     while (node)
     {
@@ -1769,7 +1769,7 @@ wxString wxVariant::MakeString() const
         if (GetData()->Write(str))
             return str;
     }
-    return wxString(wxT(""));
+    return wxEmptyString;
 }
 
 // Accessors
@@ -2074,7 +2074,8 @@ bool wxVariant::Convert(wxDateTime* value) const
     }
     // Fallback to string conversion
     wxString val;
-    return Convert(&val) && (value->ParseDateTime(val) || value->ParseDate());
+    return Convert(&val) &&
+                (value->ParseDateTime(val) || value->ParseDate(val));
 }
 #endif // wxUSE_DATETIME