X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/35f8ae65726bbb0c56815da0695045588e1551ea..f27f9577caadb552c0c90c84130a52e0451196ec:/src/propgrid/propgrid.cpp?ds=sidebyside

diff --git a/src/propgrid/propgrid.cpp b/src/propgrid/propgrid.cpp
index 26a550223a..77a3209a50 100644
--- a/src/propgrid/propgrid.cpp
+++ b/src/propgrid/propgrid.cpp
@@ -2600,7 +2600,7 @@ void wxPropertyGrid::DrawItems( const wxPGProperty* p1, const wxPGProperty* p2 )
 
 void wxPropertyGrid::RefreshProperty( wxPGProperty* p )
 {
-    if ( m_pState->DoIsPropertySelected(p) )
+    if ( m_pState->DoIsPropertySelected(p) || p->IsChildSelected(true) )
     {
         // NB: We must copy the selection.
         wxArrayPGProperty selection = m_pState->m_selection;
@@ -6227,6 +6227,7 @@ void wxPropertyGridEvent::Init()
     m_column = 1;
     m_canVeto = false;
     m_wasVetoed = false;
+    m_pg = NULL;
 }
 
 // -----------------------------------------------------------------------