X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4db6714b166a733177740b06cd21f31f4bb27896..a55d039a23c730975a8b5efedab6b4940fb4009b:/src/generic/grid.cpp?ds=inline

diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index c52334ed7c..99090322c0 100644
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -1488,7 +1488,13 @@ void wxGridCellChoiceEditor::BeginEdit(int row, int col, wxGrid* grid)
     Combo()->SetFocus();
 
     if (evtHandler)
+    {
+        // When dropping down the menu, a kill focus event
+        // happens after this point, so we can't reset the flag yet.
+#if !defined(__WXGTK20__)
         evtHandler->SetInSetFocus(false);
+#endif
+    }
 }
 
 bool wxGridCellChoiceEditor::EndEdit(int row, int col,