From d579b5760f81d2e58847e1c143f37055bd1afe6e Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 15 Sep 2019 00:42:19 +0200
Subject: [PATCH] Factor out InitListEvent() helper function

No real changes, this is just a refactoring in preparation for future
changes.
---
 src/qt/listctrl.cpp | 31 ++++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/src/qt/listctrl.cpp b/src/qt/listctrl.cpp
index 939c2deea8..abd47d01b2 100644
--- a/src/qt/listctrl.cpp
+++ b/src/qt/listctrl.cpp
@@ -60,6 +60,27 @@ wxListColumnFormat wxQtConvertAlignFlag(int align)
     return wxLIST_FORMAT_LEFT;
 }
 
+void InitListEvent(wxListEvent& event,
+                   wxListCtrl* listctrl,
+                   wxEventType eventType,
+                   const QModelIndex& index = QModelIndex())
+{
+    event.SetEventObject(listctrl);
+    event.SetEventType(eventType);
+    event.SetId(listctrl->GetId());
+
+    if ( index.isValid() )
+    {
+        event.m_itemIndex = index.row();
+        event.m_col = index.column();
+        event.m_item.SetId(event.m_itemIndex);
+        event.m_item.SetMask(wxLIST_MASK_TEXT |
+                             wxLIST_MASK_IMAGE |
+                             wxLIST_MASK_DATA);
+        listctrl->GetItem(event.m_item);
+    }
+}
+
 } // anonymous namespace
 
 class wxQtStyledItemDelegate : public QStyledItemDelegate
@@ -992,15 +1013,7 @@ void wxQtListTreeWidget::EmitListEvent(wxEventType typ,
         // prepare the event
         // -----------------
         wxListEvent event;
-        event.SetEventType(typ);
-        event.SetId(handler->GetId());
-        event.m_itemIndex = index.row();
-        event.m_col = index.column();
-        event.m_item.SetId(event.m_itemIndex);
-        event.m_item.SetMask(wxLIST_MASK_TEXT |
-                             wxLIST_MASK_IMAGE |
-                             wxLIST_MASK_DATA);
-        handler->GetItem(event.m_item);
+        InitListEvent(event, handler, typ, index);
         EmitEvent(event);
     }
 }