From 69fe5785b621235dff4c177053d0ab027bbd8a0a Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 21 Jan 2014 18:39:14 +0000 Subject: [PATCH] Send events when toggling wxPropertyGrid nodes from keyboard. Closes #15899. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75665 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/changes.txt | 1 + src/propgrid/propgrid.cpp | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/changes.txt b/docs/changes.txt index 7b7928a71d..17f4575489 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -18,6 +18,7 @@ All (GUI): - XRC handler for wxAuiToolBar added (Kinaou Hervé). - Add wxHtmlWindow::SetDefaultHTMLCursor() (Jeff A. Marr). - Add default ctor and Create() to wxContextHelpButton (Hanmac). +- Send events when toggling wxPropertyGrid nodes from keyboard (Armel Asselin). wxGTK: diff --git a/src/propgrid/propgrid.cpp b/src/propgrid/propgrid.cpp index f6aeee9aa2..4a1009a90c 100644 --- a/src/propgrid/propgrid.cpp +++ b/src/propgrid/propgrid.cpp @@ -5659,12 +5659,12 @@ void wxPropertyGrid::HandleKeyEvent( wxKeyEvent &event, bool fromChild ) { 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; } 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; } }