#5537: Add protected virtual method to override by DeclarationSelecto…

…r subclasses
codereader · Sep 16, 2022 · 5e6b7ae · 5e6b7ae
1 parent 038a1d9
commit 5e6b7ae
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/radiant/ui/common/DeclarationSelector.cpp b/radiant/ui/common/DeclarationSelector.cpp
@@ -54,6 +54,8 @@ void DeclarationSelector::PopulateTreeView(const wxutil::IResourceTreePopulator:
 
 void DeclarationSelector::onTreeViewSelectionChanged(wxDataViewEvent& ev)
 {
+    // Invoke the virtual method
+    onTreeViewSelectionChanged();
     ev.Skip();
 }
 

diff --git a/radiant/ui/common/DeclarationSelector.h b/radiant/ui/common/DeclarationSelector.h
@@ -43,6 +43,10 @@ class DeclarationSelector :
     wxutil::DeclarationTreeView* GetTreeView();
     void PopulateTreeView(const wxutil::IResourceTreePopulator::Ptr& populator);
 
+    // Event method invoked when the tree view selection has been changed
+    virtual void onTreeViewSelectionChanged()
+    {}
+
 private:
     void createTreeView();
     void onTreeViewSelectionChanged(wxDataViewEvent& ev);

diff --git a/radiant/ui/common/ShaderSelector.cpp b/radiant/ui/common/ShaderSelector.cpp
@@ -85,7 +85,6 @@ ShaderSelector::ShaderSelector(wxWindow* parent, const std::function<void()>& se
 	createPreview();
 
     PopulateTreeView(std::make_shared<ThreadedMaterialLoader>(Columns(), _textureFilter));
-    GetTreeView()->Bind(wxEVT_DATAVIEW_SELECTION_CHANGED, &ShaderSelector::_onSelChange, this);
 }
 
 const wxutil::DeclarationTreeView::Columns& ShaderSelector::Columns()
@@ -105,7 +104,7 @@ MaterialPtr ShaderSelector::getSelectedShader()
 	return GlobalMaterialManager().getMaterial(GetSelectedDeclName());
 }
 
-void ShaderSelector::_onSelChange(wxDataViewEvent& ev)
+void ShaderSelector::onTreeViewSelectionChanged()
 {
     _previewCombo->SetTexture(GetSelectedDeclName());
 

diff --git a/radiant/ui/common/ShaderSelector.h b/radiant/ui/common/ShaderSelector.h
@@ -1,12 +1,9 @@
 #pragma once
 
-#include <string>
 #include <memory>
 #include "DeclarationSelector.h"
 #include "wxutil/dataview/DeclarationTreeView.h"
 
-#include <wx/panel.h>
-
 #include "TexturePreviewCombo.h"
 
 // FORWARD DECLS
@@ -58,12 +55,12 @@ class ShaderSelector :
 	// Get the selected Material
 	MaterialPtr getSelectedShader();
 
+protected:
+    void onTreeViewSelectionChanged() override;
+
 private:
-	// Create GUI elements
 	void createPreview();
 
-	void _onSelChange(wxDataViewEvent& ev);
-
     const wxutil::DeclarationTreeView::Columns& Columns();
 };