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

Ignore focus events within composite editor control in wxPropertyGrid

Browse Source 
Internal focused events of the subcontrols of the composite editor control should not be processed.

Closes #18555.
This commit is contained in:
Artur Wieczorek
2019-11-07 23:44:57 +01:00
parent ab86e28484
commit 652e6fbadb
1 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/propgrid/propgrid.cpp
View File

@@ -3557,8 +3557,24 @@ bool wxPropertyGrid::HandleCustomEditorEvent( wxEvent &event )
m_iFlags &= ~wxPG_FL_VALUE_CHANGE_IN_EVENT; m_iFlags &= ~wxPG_FL_VALUE_CHANGE_IN_EVENT;
// //
// Ignore focus changes within the composite editor control
if ( event.GetEventType() == wxEVT_SET_FOCUS || event.GetEventType() == wxEVT_KILL_FOCUS )
{
wxFocusEvent* fevt = wxDynamicCast(&event, wxFocusEvent);
wxWindow* win = fevt->GetWindow();
while ( win )
{
if ( win == wnd )
{
event.Skip();
return true;
}
win = win->GetParent();
}
}
// Filter out excess wxTextCtrl modified events // Filter out excess wxTextCtrl modified events
if ( event.GetEventType() == wxEVT_TEXT && wnd ) else if ( event.GetEventType() == wxEVT_TEXT && wnd )
{ {
if ( wxDynamicCast(wnd, wxTextCtrl) ) if ( wxDynamicCast(wnd, wxTextCtrl) )
{ {