Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed problem with choice editor in wxGrid whereby the editor

Browse Source 
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
This commit is contained in:
Julian Smart
2005-11-17 17:43:15 +00:00
parent 1ac74d83a3
commit 46cbb21ecb
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
docs/changes.txt
View File

@@ -38,6 +38,11 @@ wxMSW:
- Switching page of a hidden notebook doesn't lose focus (Jamie Gadd). - Switching page of a hidden notebook doesn't lose focus (Jamie Gadd).
- Removed wxImageList *GetImageList(int) const. - 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: wxWinCE:
- Pressing build-in joystick on WinCE phones fires wxEVT_JOY_BUTTON_DOWN event. - Pressing build-in joystick on WinCE phones fires wxEVT_JOY_BUTTON_DOWN event.

6
src/generic/grid.cpp
View File

@@ -1488,7 +1488,13 @@ void wxGridCellChoiceEditor::BeginEdit(int row, int col, wxGrid* grid)
Combo()->SetFocus(); Combo()->SetFocus();
if (evtHandler) 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); evtHandler->SetInSetFocus(false);
#endif
}
} }
bool wxGridCellChoiceEditor::EndEdit(int row, int col, bool wxGridCellChoiceEditor::EndEdit(int row, int col,