From: Jaakko Salli <jaakko.salli@dnainternet.net>
Date: Fri, 13 Aug 2010 20:12:03 +0000 (+0000)
Subject: Allow wxVariant::Convert(wxUniChar* value) to convert single-character string into... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/15ec7f782d2333d0b2bbf29988b0b2c95460440b

Allow wxVariant::Convert(wxUniChar* value) to convert single-character string into a character.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65297 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/common/variant.cpp b/src/common/variant.cpp
index 371630d322..207c3a4f30 100644
--- a/src/common/variant.cpp
+++ b/src/common/variant.cpp
@@ -2360,6 +2360,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;