Use standard wxVariant instead of wxPropertyGrid-specific WXVARIANT

There is no need to use WXVARIANT for data types directly supported by wxVariant.
This commit is contained in:
Artur Wieczorek
2019-06-15 20:19:34 +02:00
parent d404ff02a1
commit 98c1b057e8
4 changed files with 14 additions and 18 deletions

View File

@@ -2169,8 +2169,6 @@ bool wxMultiChoiceProperty::OnEvent( wxPropertyGrid* propgrid,
{
wxArrayInt arrInt = dlg.GetSelections();
wxVariant variant;
// Strings that were not in list of choices
wxArrayString value;
@@ -2192,9 +2190,7 @@ bool wxMultiChoiceProperty::OnEvent( wxPropertyGrid* propgrid,
value.push_back(extraStrings[n]);
}
variant = WXVARIANT(value);
SetValueInEvent(variant);
SetValueInEvent(wxVariant(value));
return true;
}
@@ -2211,7 +2207,7 @@ bool wxMultiChoiceProperty::StringToValue( wxVariant& variant, const wxString& t
arr.Add(token);
WX_PG_TOKENIZER2_END()
wxVariant v( WXVARIANT(arr) );
wxVariant v(arr);
variant = v;
return true;