From: Jaakko Salli <jaakko.salli@dnainternet.net>
Date: Thu, 25 Mar 2010 15:40:27 +0000 (+0000)
Subject: In wxPropertyGrid::HandleCustomEditorEvent(), ignore events coming from a label editor
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/ad2db6f8ea1089531cf49ab9960fac772e75927f

In wxPropertyGrid::HandleCustomEditorEvent(), ignore events coming from a label editor

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63755 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/propgrid/propgrid.cpp b/src/propgrid/propgrid.cpp
index 71253a2c5a..6e96206ff5 100644
--- a/src/propgrid/propgrid.cpp
+++ b/src/propgrid/propgrid.cpp
@@ -3418,6 +3418,15 @@ void wxPropertyGrid::HandleCustomEditorEvent( wxEvent &event )
     if ( !m_pState )
         return;
 
+    // Don't care about the event if it originated from the
+    // 'label editor'. In this function we only care about the
+    // property value editor.
+    if ( m_labelEditor && event.GetId() == m_labelEditor->GetId() )
+    {
+        event.Skip();
+        return;
+    }
+
     wxPGProperty* selected = GetSelection();
 
     // Somehow, event is handled after property has been deselected.