Use WS_EX_CONTROLPARENT for wxStaticBox in wxMSW.

[wxWidgets.git] / src / common / treebase.cpp

diff --git a/src/common/treebase.cpp b/src/common/treebase.cpp
index 06e31ddbc3e3979dab634f4f170d855d1e3f29b0..f831b489adf30e4aa3c9d1e2bd49f4ce16ff0ecb 100644 (file)
--- a/src/common/treebase.cpp
+++ b/src/common/treebase.cpp
@@ -179,6 +179,8 @@ wxTreeCtrlBase::wxTreeCtrlBase()
 
     // quick DoGetBestSize calculation
     m_quickBestSize = true;
 
     // quick DoGetBestSize calculation
     m_quickBestSize = true;

+
+    Connect(wxEVT_CHAR_HOOK, wxKeyEventHandler(wxTreeCtrlBase::OnCharHook));

 }
 
 wxTreeCtrlBase::~wxTreeCtrlBase()
 }
 
 wxTreeCtrlBase::~wxTreeCtrlBase()


@@ -349,4 +351,26 @@ bool wxTreeCtrlBase::IsEmpty() const
     return !GetRootItem().IsOk();
 }
 
     return !GetRootItem().IsOk();
 }
 

+void wxTreeCtrlBase::OnCharHook(wxKeyEvent& event)
+{
+    if ( GetEditControl() )
+    {
+        bool discardChanges = false;
+        switch ( event.GetKeyCode() )
+        {
+            case WXK_ESCAPE:
+                discardChanges = true;
+                // fall through
+
+            case WXK_RETURN:
+                EndEditLabel(GetFocusedItem(), discardChanges);
+
+                // Do not call Skip() below.
+                return;
+        }
+    }
+
+    event.Skip();
+}
+

 #endif // wxUSE_TREECTRL
 #endif // wxUSE_TREECTRL