non-pch build fix

[wxWidgets.git] / src / propgrid / propgrid.cpp

diff --git a/src/propgrid/propgrid.cpp b/src/propgrid/propgrid.cpp
index 947380709ff47abba1e6c1a74b788142080b80ba..fac6436c3bf9a94aa028de1ba962f9b602a601a1 100644 (file)
--- 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;