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

Added separate SetFocusOnCanvas() function so that m_editorFocused will be more reliable updated

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55688 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jaakko Salli
2008-09-17 17:34:22 +00:00
parent 68545f7889
commit c29e714c37
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/propgrid/propgrid.h
View File

@@ -1819,6 +1819,12 @@ protected:
wxVariant* pValue = NULL, wxVariant* pValue = NULL,
unsigned int selFlags = 0 ); unsigned int selFlags = 0 );
void SetFocusOnCanvas()
{
m_canvas->SetFocusIgnoringChildren();
m_editorFocused = 0;
}
bool DoHideProperty( wxPGProperty* p, bool hide, int flags ); bool DoHideProperty( wxPGProperty* p, bool hide, int flags );
private: private:

15
src/propgrid/propgrid.cpp
View File

@@ -3594,8 +3594,7 @@ bool wxPropertyGrid::DoSelectProperty( wxPGProperty* p, unsigned int flags )
} }
else else
{ {
canvas->SetFocusIgnoringChildren(); SetFocusOnCanvas();
m_editorFocused = 0;
} }
} }
@@ -3813,8 +3812,8 @@ bool wxPropertyGrid::DoSelectProperty( wxPGProperty* p, unsigned int flags )
} }
else else
{ {
// wxGTK atleast seems to need this (wxMSW not) // Make sure focus is in grid canvas (important for wxGTK, at least)
canvas->SetFocusIgnoringChildren(); SetFocusOnCanvas();
} }
EditorsValueWasNotModified(); EditorsValueWasNotModified();
@@ -3836,8 +3835,8 @@ bool wxPropertyGrid::DoSelectProperty( wxPGProperty* p, unsigned int flags )
} }
else else
{ {
// Make sure focus is in grid // Make sure focus is in grid canvas
canvas->SetFocusIgnoringChildren(); SetFocusOnCanvas();
} }
ClearInternalFlag(wxPG_FL_IN_SELECT_PROPERTY); ClearInternalFlag(wxPG_FL_IN_SELECT_PROPERTY);
@@ -3906,7 +3905,7 @@ bool wxPropertyGrid::UnfocusEditor()
if ( !CommitChangesFromEditor(0) ) if ( !CommitChangesFromEditor(0) )
return false; return false;
m_canvas->SetFocusIgnoringChildren(); SetFocusOnCanvas();
DrawItem(m_selected); DrawItem(m_selected);
return true; return true;
@@ -4227,7 +4226,7 @@ bool wxPropertyGrid::HandleMouseClick( int x, unsigned int y, wxMouseEvent &even
// Need to set focus? // Need to set focus?
if ( !(m_iFlags & wxPG_FL_FOCUSED) ) if ( !(m_iFlags & wxPG_FL_FOCUSED) )
{ {
m_canvas->SetFocusIgnoringChildren(); SetFocusOnCanvas();
} }
wxPropertyGridPageState* state = m_pState; wxPropertyGridPageState* state = m_pState;