don't give an error when editing of the items label is cancelled (patch 1482176)

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

diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp
index 9652d6eea8b8443ade637b71300ad97becdb579d..1de7b93bdfbc27e2c9e1ac7327e7be9db00b02e3 100644 (file)
--- a/src/generic/dirctrlg.cpp
+++ b/src/generic/dirctrlg.cpp
@@ -700,6 +700,9 @@ void wxGenericDirCtrl::OnBeginEditItem(wxTreeEvent &event)
 
 void wxGenericDirCtrl::OnEndEditItem(wxTreeEvent &event)
 {
+    if (event.IsEditCancelled())
+        return;
+
     if ((event.GetLabel().empty()) ||
         (event.GetLabel() == _(".")) ||
         (event.GetLabel() == _("..")) ||