Merge branch 'qt_tree_control' of https://github.com/GeoTeric/wxWidgets into qt_tree_control

2019-02-07 11:40:28 +00:00
parent 6dfc243b27 5aba98353c
commit d3033c861c
1 changed files with 4 additions and 0 deletions
--- a/src/qt/treectrl.cpp
+++ b/src/qt/treectrl.cpp
@@ -964,6 +964,10 @@ wxTextCtrl *wxTreeCtrl::EditLabel(const wxTreeItemId& item, wxClassInfo* WXUNUSE
 {
    wxCHECK_MSG(item.IsOk(), NULL, "invalid tree item");

+    wxTreeEvent event(wxEVT_TREE_BEGIN_LABEL_EDIT, this, item);
+    if ( HandleWindowEvent(event) && !event.IsAllowed() )
+        return NULL;
+
    QTreeWidgetItem *qTreeItem = wxQtConvertTreeItem(item);
    m_qtTreeWidget->openPersistentEditor(qTreeItem);
    return m_qtTreeWidget->GetEditControl();