#5127: Add option to prepend custom menu items without having to deri…

…ve from ResourceTreeView right away.

libs/wxutil/dataview/ResourceTreeView.cpp

@@ -134,6 +134,19 @@ void ResourceTreeView::SetTreeMode(ResourceTreeView::TreeMode mode)
 
 void ResourceTreeView::PopulateContextMenu(wxutil::PopupMenu& popupMenu)
 {
+    // Add the pre-registered items first (with an auto-separator)
+    if (popupMenu.GetMenuItemCount() > 0)
+    {
+        popupMenu.addSeparator();
+    }
+
+    for (const auto& customItem : _customMenuItems)
+    {
+        popupMenu.addItem(customItem);
+    }
+
+    _customMenuItems.clear();
+
     if (popupMenu.GetMenuItemCount() > 0)
     {
         popupMenu.addSeparator();
@@ -239,6 +252,11 @@ void ResourceTreeView::SetExpandTopLevelItemsAfterPopulation(bool expand)
     _expandTopLevelItemsAfterPopulation = expand;
 }
 
+void ResourceTreeView::AddCustomMenuItem(const ui::IMenuItemPtr& item)
+{
+    _customMenuItems.push_back(item);
+}
+
 void ResourceTreeView::_onTreeStorePopulationFinished(TreeModel::PopulationFinishedEvent& ev)
 {
     UnselectAll();

libs/wxutil/dataview/ResourceTreeView.h

@@ -70,6 +70,8 @@ class ResourceTreeView :
     bool _expandTopLevelItemsAfterPopulation;
     std::string _fullNameToSelectAfterPopulation;
 
+    std::vector<ui::IMenuItemPtr> _customMenuItems;
+
 public:
     ResourceTreeView(wxWindow* parent, const Columns& columns, long style = wxDV_SINGLE);
     ResourceTreeView(wxWindow* parent, const TreeModel::Ptr& model, const Columns& columns, long style = wxDV_SINGLE);
@@ -97,6 +99,11 @@ class ResourceTreeView :
 
     void SetExpandTopLevelItemsAfterPopulation(bool expand);
 
+    // Add a custom menu item to this control's popup menu (will be added at the top)
+    // Client code that derive from this class can use the protected PopulateContextMenu
+    // hook as an alternative to this method.
+    void AddCustomMenuItem(const ui::IMenuItemPtr& item);
+
 protected:
     virtual void PopulateContextMenu(wxutil::PopupMenu& popupMenu);