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

Send events when toggling wxPropertyGrid nodes from keyboard.

Browse Source 
Closes #15899.

[This is the backport of r75665 from trunk.]

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@77950 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-10-03 01:52:24 +00:00
parent b0f780439c
commit fb79efd531
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changes.txt
View File

@@ -593,6 +593,7 @@ All (GUI):
- Return correct value from wxCommandEvent::GetString() for programmatically - Return correct value from wxCommandEvent::GetString() for programmatically
generated wxEVT_TEXT events from wxComboBox. generated wxEVT_TEXT events from wxComboBox.
- Accept "default" as font family value in XRC (pieleric). - Accept "default" as font family value in XRC (pieleric).
- Send events when toggling wxPropertyGrid nodes from keyboard (Armel Asselin).
wxGTK: wxGTK:

4
src/propgrid/propgrid.cpp
View File

@@ -5675,12 +5675,12 @@ void wxPropertyGrid::HandleKeyEvent( wxKeyEvent &event, bool fromChild )
{ {
if ( action == wxPG_ACTION_COLLAPSE_PROPERTY || secondAction == wxPG_ACTION_COLLAPSE_PROPERTY ) if ( action == wxPG_ACTION_COLLAPSE_PROPERTY || secondAction == wxPG_ACTION_COLLAPSE_PROPERTY )
{ {
if ( (m_windowStyle & wxPG_HIDE_MARGIN) || Collapse(p) ) if ( (m_windowStyle & wxPG_HIDE_MARGIN) || DoCollapse(p, true) )
wasHandled = true; wasHandled = true;
} }
else if ( action == wxPG_ACTION_EXPAND_PROPERTY || secondAction == wxPG_ACTION_EXPAND_PROPERTY ) else if ( action == wxPG_ACTION_EXPAND_PROPERTY || secondAction == wxPG_ACTION_EXPAND_PROPERTY )
{ {
if ( (m_windowStyle & wxPG_HIDE_MARGIN) || Expand(p) ) if ( (m_windowStyle & wxPG_HIDE_MARGIN) || DoExpand(p, true) )
wasHandled = true; wasHandled = true;
} }
} }