AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed bug: wxEditEnumProperty's initial string value could not be outside the list of choices.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62222 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jaakko Salli 2009-10-01 16:06:58 +00:00
parent 63bcc669d8
commit 97f1626169
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
samples/propgrid/propgrid.cpp
View File

@ -1637,7 +1637,10 @@ void FormMain::PopulateWithExamples ()
eech.Add(wxT("Choice 1"));
eech.Add(wxT("Choice 2"));
eech.Add(wxT("Choice 3"));
pg->Append( new wxEditEnumProperty(wxT("EditEnumProperty"), wxPG_LABEL, eech) ); // , wxT("Choice 2")
pg->Append( new wxEditEnumProperty("EditEnumProperty",
wxPG_LABEL,
eech,
"Choice not in the list") );
//wxString v_;
//wxTextValidator validator1(wxFILTER_NUMERIC,&v_);

4
src/propgrid/props.cpp
View File

@ -1034,9 +1034,7 @@ bool wxEnumProperty::ValueFromString_( wxVariant& value, const wxString& text, i
// If text not any of the choices, store as text instead
// (but only if we are wxEditEnumProperty)
if ( useIndex == -1 &&
(value.GetType() != wxPG_VARIANT_TYPE_STRING || (m_value.GetString() != text)) &&
isEdit )
if ( useIndex == -1 && isEdit )
{
asText = true;
}