AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Try to improve focus problem situation by using more SetFocusIgnoringChildren() instead of SetFocus()

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55686 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jaakko Salli 2008-09-17 15:36:32 +00:00
parent f4bc1aa27c
commit e213da24b8
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/propgrid/propgrid.cpp
View File

@ -3524,6 +3524,8 @@ void wxPropertyGrid::FreeEditors()
// Call with NULL to de-select property
bool wxPropertyGrid::DoSelectProperty( wxPGProperty* p, unsigned int flags )
{
wxPanel* canvas = GetPanel();
/*
if (p)
wxLogDebug(wxT("SelectProperty( %s (%s[%i]) )"),p->m_label.c_str(),
@ -3592,7 +3594,7 @@ bool wxPropertyGrid::DoSelectProperty( wxPGProperty* p, unsigned int flags )
}
else
{
wxScrolledWindow::SetFocus();
canvas->SetFocusIgnoringChildren();
m_editorFocused = 0;
}
}
@ -3698,7 +3700,7 @@ bool wxPropertyGrid::DoSelectProperty( wxPGProperty* p, unsigned int flags )
if ( m_wndEditor )
{
wxASSERT_MSG( m_wndEditor->GetParent() == m_canvas,
wxASSERT_MSG( m_wndEditor->GetParent() == canvas,
wxT("CreateControls must use result of wxPropertyGrid::GetPanel() as parent of controls.") );
// Set validator, if any
@ -3766,7 +3768,7 @@ bool wxPropertyGrid::DoSelectProperty( wxPGProperty* p, unsigned int flags )
if ( m_wndEditor2 )
{
wxASSERT_MSG( m_wndEditor2->GetParent() == m_canvas,
wxASSERT_MSG( m_wndEditor2->GetParent() == canvas,
wxT("CreateControls must use result of wxPropertyGrid::GetPanel() as parent of controls.") );
// Get proper id for wndSecondary
@ -3812,7 +3814,7 @@ bool wxPropertyGrid::DoSelectProperty( wxPGProperty* p, unsigned int flags )
else
{
// wxGTK atleast seems to need this (wxMSW not)
SetFocus();
canvas->SetFocusIgnoringChildren();
}
EditorsValueWasNotModified();
@ -3832,6 +3834,11 @@ bool wxPropertyGrid::DoSelectProperty( wxPGProperty* p, unsigned int flags )
DrawItems(p, p);
}
else
{
// Make sure focus is in grid
canvas->SetFocusIgnoringChildren();
}
ClearInternalFlag(wxPG_FL_IN_SELECT_PROPERTY);
}
@ -4220,7 +4227,7 @@ bool wxPropertyGrid::HandleMouseClick( int x, unsigned int y, wxMouseEvent &even
// Need to set focus?
if ( !(m_iFlags & wxPG_FL_FOCUSED) )
{
m_canvas->SetFocus();
m_canvas->SetFocusIgnoringChildren();
}
wxPropertyGridPageState* state = m_pState;