X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c294641fd54a4be9777053e149d847cbb90d529e..6c0e710f008370d8c0039b3aa859b8eb65d6de12:/include/wx/xtitypes.h diff --git a/include/wx/xtitypes.h b/include/wx/xtitypes.h index bbf9a69d03..0879897f53 100644 --- a/include/wx/xtitypes.h +++ b/include/wx/xtitypes.h @@ -88,7 +88,7 @@ private: wxEnumData s_enumData##e( s_enumDataMembers##e ); \ wxEnumData *wxGetEnumData(e) { return &s_enumData##e; } \ template<> void wxStringReadValue(const wxString& s, e &data ) \ - { data = (e) s_enumData##e.GetEnumMemberValue(s); } \ + { data = (e) s_enumData##e.GetEnumMemberValue(s.c_str()); } \ template<> void wxStringWriteValue(wxString &s, const e &data ) \ { s = s_enumData##e.GetEnumMemberName((int)data); } \ void FromLong##e( long data, wxAny& result ) \ @@ -202,7 +202,7 @@ void wxFlagsFromString(const wxString &s, e &data ) { flag = array[i]; int ivalue; - if ( edata->HasEnumMemberValue( flag, &ivalue ) ) + if ( edata->HasEnumMemberValue( flag.c_str(), &ivalue ) ) { data.m_data |= ivalue; }