Remove returns of wxEmptyString

2017-02-18 11:26:40 -08:00
parent 32535f5bf6
commit 6169ced23f
8 changed files with 47 additions and 37 deletions
--- a/src/common/variant.cpp
+++ b/src/common/variant.cpp
@@ -139,13 +139,10 @@ bool wxVariant::operator!= (const wxVariant& variant) const

 wxString wxVariant::MakeString() const
 {
+    wxString str;
    if (!IsNull())
-    {
-        wxString str;
-        if (GetData()->Write(str))
-            return str;
-    }
-    return wxEmptyString;
+        GetData()->Write(str);
+    return str;
 }

 void wxVariant::SetData(wxVariantData* data)