From 97f16261694d93e1c5c4245381702b294148f3a9 Mon Sep 17 00:00:00 2001 From: Jaakko Salli Date: Thu, 1 Oct 2009 16:06:58 +0000 Subject: [PATCH] Fixed bug: wxEditEnumProperty's initial string value could not be outside the list of choices. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62222 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/propgrid/propgrid.cpp | 5 ++++- src/propgrid/props.cpp | 4 +--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/samples/propgrid/propgrid.cpp b/samples/propgrid/propgrid.cpp index 74742446d1..98286772bb 100644 --- a/samples/propgrid/propgrid.cpp +++ b/samples/propgrid/propgrid.cpp @@ -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_); diff --git a/src/propgrid/props.cpp b/src/propgrid/props.cpp index 4bc4d1c086..4a5442bf9c 100644 --- a/src/propgrid/props.cpp +++ b/src/propgrid/props.cpp @@ -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; } -- 2.47.2