#6021: Introduce DeclarationTreeView based on ResourceTreeView.

codereader · Jul 24, 2022 · 17c9c07 · 17c9c07
1 parent 2086a1c
commit 17c9c07
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 4 deletions.
diff --git a/libs/wxutil/CMakeLists.txt b/libs/wxutil/CMakeLists.txt
@@ -1,5 +1,6 @@
 add_library(wxutil
             ConsoleView.cpp
+            dataview/DeclarationTreeView.cpp
             dataview/KeyValueTable.cpp
             dataview/ResourceTreeView.cpp
             dataview/ResourceTreeViewToolbar.cpp

diff --git a/libs/wxutil/dataview/DeclarationTreeView.cpp b/libs/wxutil/dataview/DeclarationTreeView.cpp
@@ -0,0 +1,14 @@
+#include "DeclarationTreeView.h"
+
+namespace wxutil
+{
+
+DeclarationTreeView::DeclarationTreeView(wxWindow* parent, const Columns& columns, long style) :
+    DeclarationTreeView(parent, TreeModel::Ptr(), columns, style)
+{}
+
+DeclarationTreeView::DeclarationTreeView(wxWindow* parent, const TreeModel::Ptr& model, const Columns& columns, long style) :
+    ResourceTreeView(parent, model, columns, style)
+{}
+
+}
diff --git a/libs/wxutil/dataview/DeclarationTreeView.h b/libs/wxutil/dataview/DeclarationTreeView.h
@@ -0,0 +1,16 @@
+#pragma once
+
+#include "ResourceTreeView.h"
+
+namespace wxutil
+{
+
+class DeclarationTreeView :
+    public ResourceTreeView
+{
+public:
+    DeclarationTreeView(wxWindow* parent, const Columns& columns, long style = wxDV_SINGLE);
+    DeclarationTreeView(wxWindow* parent, const TreeModel::Ptr& model, const Columns& columns, long style = wxDV_SINGLE);
+};
+
+}
diff --git a/radiant/ui/particles/ParticleSelector.cpp b/radiant/ui/particles/ParticleSelector.cpp
@@ -35,7 +35,7 @@ ParticleSelector::ParticleSelector(wxWindow* parent) :
 
 wxutil::ResourceTreeView* ParticleSelector::createTreeView(wxWindow* parent)
 {
-    _treeView = new wxutil::ResourceTreeView(parent, _columns, wxDV_NO_HEADER);
+    _treeView = new wxutil::DeclarationTreeView(parent, _columns, wxDV_NO_HEADER);
     _treeView->SetSize(300, -1);
 
     _treeView->AppendIconTextColumn(_("Particle"), _columns.iconAndName.getColumnIndex(),

diff --git a/radiant/ui/particles/ParticleSelector.h b/radiant/ui/particles/ParticleSelector.h
@@ -3,7 +3,7 @@
 #include <sigc++/trackable.h>
 #include <wx/panel.h>
 
-#include "wxutil/dataview/ResourceTreeView.h"
+#include "wxutil/dataview/DeclarationTreeView.h"
 #include "wxutil/preview/ParticlePreview.h"
 
 namespace ui
@@ -19,10 +19,10 @@ class ParticleSelector :
     public sigc::trackable
 {
 private:
-    wxutil::ResourceTreeView::Columns _columns;
+    wxutil::DeclarationTreeView::Columns _columns;
 
     // Tree view listing all the particles
-    wxutil::ResourceTreeView* _treeView;
+    wxutil::DeclarationTreeView* _treeView;
 
     // The preview widget
     wxutil::ParticlePreviewPtr _preview;

diff --git a/tools/msvc/wxutillib.vcxproj b/tools/msvc/wxutillib.vcxproj
@@ -136,6 +136,7 @@
     <ClInclude Include="..\..\libs\wxutil\ChoiceHelper.h" />
     <ClInclude Include="..\..\libs\wxutil\ConsoleView.h" />
     <ClInclude Include="..\..\libs\wxutil\ControlButton.h" />
+    <ClInclude Include="..\..\libs\wxutil\dataview\DeclarationTreeView.h" />
     <ClInclude Include="..\..\libs\wxutil\dataview\IResourceTreePopulator.h" />
     <ClInclude Include="..\..\libs\wxutil\dataview\KeyValueTable.h" />
     <ClInclude Include="..\..\libs\wxutil\dataview\ResourceTreeView.h" />
@@ -198,6 +199,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\libs\wxutil\ConsoleView.cpp" />
+    <ClCompile Include="..\..\libs\wxutil\dataview\DeclarationTreeView.cpp" />
     <ClCompile Include="..\..\libs\wxutil\dataview\KeyValueTable.cpp" />
     <ClCompile Include="..\..\libs\wxutil\dataview\ResourceTreeView.cpp" />
     <ClCompile Include="..\..\libs\wxutil\dataview\ResourceTreeViewToolbar.cpp" />

diff --git a/tools/msvc/wxutillib.vcxproj.filters b/tools/msvc/wxutillib.vcxproj.filters
@@ -152,6 +152,9 @@
     </ClInclude>
     <ClInclude Include="..\..\libs\wxutil\FormLayout.h" />
     <ClInclude Include="..\..\libs\wxutil\DeclFileInfo.h" />
+    <ClInclude Include="..\..\libs\wxutil\dataview\DeclarationTreeView.h">
+      <Filter>dataview</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\libs\wxutil\dialog\MessageBox.cpp">
@@ -231,5 +234,8 @@
     <ClCompile Include="..\..\libs\wxutil\menu\FilterPopupMenu.cpp">
       <Filter>menu</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\libs\wxutil\dataview\DeclarationTreeView.cpp">
+      <Filter>dataview</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>