From 46cbb21ecbe0b016592a2166e4c9e3cec8f49d88 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Thu, 17 Nov 2005 17:43:15 +0000 Subject: [PATCH] Fixed problem with choice editor in wxGrid whereby the editor lost focus when the combobox menu was shown. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36192 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/changes.txt | 5 +++++ src/generic/grid.cpp | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/docs/changes.txt b/docs/changes.txt index 2eb8dec213..92185677df 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -38,6 +38,11 @@ wxMSW: - Switching page of a hidden notebook doesn't lose focus (Jamie Gadd). - Removed wxImageList *GetImageList(int) const. +wxGTK: + +- Fixed problem with choice editor in wxGrid whereby the editor + lost focus when the combobox menu was shown. + wxWinCE: - Pressing build-in joystick on WinCE phones fires wxEVT_JOY_BUTTON_DOWN event. 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, -- 2.47.2