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

Allow wxPG to take focus on the entire area even if wxPG is not a standalone control.

Browse Source 
By default, to prevent wxPG from stealing focus from other controls, focus is moved to the grid only if it was already in one of its child controls.
When newly introduced wxPG_EX_ALWAYS_ALLOW_FOCUS flag is set then wxPG can take focus on the entire grid area (on canvas) even if focus is moved from another control.
Default wxPG behavior remains unchanged because wxPG_EX_ALWAYS_ALLOW_FOCUS flag must be explicitly set with wxPropertyGrid::SetExtraStyle function.

Closes #16993.
This commit is contained in:
Artur Wieczorek
2015-05-21 18:51:08 +02:00
parent f583ba0ffb
commit 7394dd8e1f
3 changed files with 31 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/propgrid/propgrid.cpp
View File

@@ -4712,21 +4712,31 @@ void wxPropertyGrid::SetVirtualWidth( int width )
void wxPropertyGrid::SetFocusOnCanvas()
{
// To prevent wxPropertyGrid from stealing focus from other controls,
// only move focus to the grid if it was already in one if its child
// controls.
wxWindow* focus = wxWindow::FindFocus();
if ( focus )
// By default, to prevent wxPropertyGrid from stealing focus from
// other controls, only move focus to the grid if it was already
// in one of its child controls.
// If wxPG_EX_ALWAYS_ALLOW_FOCUS flag is set then wxPropertyGrid
// can take focus on the entire grid area (canvas) even if focus
// is moved from another control.
if ( HasExtraStyle(wxPG_EX_ALWAYS_ALLOW_FOCUS) )
{
wxWindow* parent = focus->GetParent();
while ( parent )
SetFocus();
}
else
{
wxWindow* focus = wxWindow::FindFocus();
if ( focus )
{
if ( parent == this )
wxWindow* parent = focus->GetParent();
while ( parent )
{
SetFocus();
break;
if ( parent == this )
{
SetFocus();
break;
}
parent = parent->GetParent();
}
parent = parent->GetParent();
}
}