From 7505ccfd6d8b7e97f6c8b5e591936f2b91e33d18 Mon Sep 17 00:00:00 2001
From: JulianSmart <julian@anthemion.co.uk>
Date: Mon, 17 Oct 2016 12:39:36 +0100
Subject: [PATCH] Find focus for comboboxes

---
 src/propgrid/propgrid.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/propgrid/propgrid.cpp b/src/propgrid/propgrid.cpp
index 27ea4a621f..3bd2c6f5df 100644
--- a/src/propgrid/propgrid.cpp
+++ b/src/propgrid/propgrid.cpp
@@ -5969,7 +5969,9 @@ bool wxPropertyGrid::IsEditorFocused() const
     wxWindow* focus = wxWindow::FindFocus();
 
     if ( focus == m_wndEditor || focus == m_wndEditor2 ||
-         focus == GetEditorControl() )
+         focus == GetEditorControl() ||
+         // In case a combobox text control is focused
+         (focus && focus->GetParent() && (focus->GetParent() == m_wndEditor)) )
          return true;
 
     return false;