X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b296009869b608b12f415decd86c49bf5799a140..5eed855656b3996f4c0aa0a585a4820a2af6d628:/src/propgrid/propgrid.cpp

diff --git a/src/propgrid/propgrid.cpp b/src/propgrid/propgrid.cpp
index 947380709f..fac6436c3b 100644
--- a/src/propgrid/propgrid.cpp
+++ b/src/propgrid/propgrid.cpp
@@ -3906,8 +3906,7 @@ private:
         // Always skip
         event.Skip();
 
-        if ( m_propGrid->HandleCustomEditorEvent(event) )
-            return true;
+        m_propGrid->HandleCustomEditorEvent(event);
 
         //
         // NB: We should return true if the event was recognized as
@@ -5688,6 +5687,12 @@ void wxPropertyGrid::HandleKeyEvent( wxKeyEvent &event, bool fromChild )
 
         wxPGProperty* p = selected;
 
+        if ( action == wxPG_ACTION_EDIT && !editorFocused )
+        {
+            DoSelectProperty( p, wxPG_SEL_FOCUS );
+            wasHandled = true;
+        }
+
         // Travel and expand/collapse
         int selectDir = -2;