X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/281448385a8d62a7efc64ca29e5803958e55eb69..74a8f67d96591cec101def2a7d47c64072aff7fd:/src/common/variant.cpp

diff --git a/src/common/variant.cpp b/src/common/variant.cpp
index 371630d322..5f7daabe9a 100644
--- a/src/common/variant.cpp
+++ b/src/common/variant.cpp
@@ -1977,8 +1977,6 @@ protected:
 // Convert to/from list of wxAnys
 //
 
-WX_DEFINE_LIST(wxAnyList)
-
 bool wxVariantDataList::GetAsAny(wxAny* any) const
 {
     wxAnyList dst;
@@ -2360,6 +2358,15 @@ bool wxVariant::Convert(wxUniChar* value) const
         *value = (char) (((wxVariantDataLong*)GetData())->GetValue());
     else if (type == wxT("bool"))
         *value = (char) (((wxVariantDataBool*)GetData())->GetValue());
+    else if (type == wxS("string"))
+    {
+        // Also accept strings of length 1
+        const wxString& str = (((wxVariantDataString*)GetData())->GetValue());
+        if ( str.length() == 1 )
+            *value = str[0];
+        else
+            return false;
+    }
     else
         return false;