From 1c4475481e80e4a54f46dbf084e2b1c424408abd Mon Sep 17 00:00:00 2001 From: codereader Date: Sat, 2 Jan 2021 04:00:57 +0100 Subject: [PATCH] #5127: Minor refactoring --- libs/wxutil/EntityClassChooser.cpp | 5 ++--- libs/wxutil/ResourceTreeView.cpp | 4 ---- radiant/ui/mediabrowser/MediaBrowserTreeView.cpp | 4 ++++ 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/libs/wxutil/EntityClassChooser.cpp b/libs/wxutil/EntityClassChooser.cpp index 288b22d80f..a0533217e3 100644 --- a/libs/wxutil/EntityClassChooser.cpp +++ b/libs/wxutil/EntityClassChooser.cpp @@ -343,7 +343,7 @@ int EntityClassChooser::ShowModal() void EntityClassChooser::setTreeViewModel() { - _treeView->AssociateModel(_treeStore.get()); + _treeView->setTreeModel(_treeStore); // Expand the first layer _treeView->ExpandTopLevelItems(); @@ -358,7 +358,6 @@ void EntityClassChooser::setTreeViewModel() void EntityClassChooser::setupTreeView() { - // Use the TreeModel's full string search function _treeStore = new TreeModel(_columns); TreeModel::Row row = _treeStore->AddItem(); @@ -367,7 +366,7 @@ void EntityClassChooser::setupTreeView() wxPanel* parent = findNamedObject(this, "EntityClassChooserLeftPane"); _treeView = new ResourceTreeView(parent, _treeStore, _columns); - _treeView->AddSearchColumn(_columns.leafName); + _treeView->AddSearchColumn(_columns.iconAndName); _treeView->Bind(wxEVT_DATAVIEW_SELECTION_CHANGED, &EntityClassChooser::onSelectionChanged, this); diff --git a/libs/wxutil/ResourceTreeView.cpp b/libs/wxutil/ResourceTreeView.cpp index a2f4c9b9db..927c510d5a 100644 --- a/libs/wxutil/ResourceTreeView.cpp +++ b/libs/wxutil/ResourceTreeView.cpp @@ -36,10 +36,6 @@ ResourceTreeView::ResourceTreeView(wxWindow* parent, const TreeModel::Ptr& model _treeStore.reset(new TreeModel(_columns)); } - // The wxWidgets algorithm sucks at sorting large flat lists of strings, - // so we do that ourselves - _treeStore->SetHasDefaultCompare(false); - AssociateModel(_treeStore.get()); Bind(wxEVT_DATAVIEW_ITEM_CONTEXT_MENU, &ResourceTreeView::_onContextMenu, this); diff --git a/radiant/ui/mediabrowser/MediaBrowserTreeView.cpp b/radiant/ui/mediabrowser/MediaBrowserTreeView.cpp index e603016d3c..8137ebc122 100644 --- a/radiant/ui/mediabrowser/MediaBrowserTreeView.cpp +++ b/radiant/ui/mediabrowser/MediaBrowserTreeView.cpp @@ -320,6 +320,10 @@ MediaBrowserTreeView::MediaBrowserTreeView(wxWindow* parent) : AddSearchColumn(_columns.iconAndName); + // The wxWidgets algorithm sucks at sorting large flat lists of strings, + // so we do that ourselves + getTreeModel()->SetHasDefaultCompare(false); + Bind(wxEVT_DATAVIEW_ITEM_ACTIVATED, &MediaBrowserTreeView::_onTreeViewItemActivated, this); Bind(wxutil::EV_TREEMODEL_POPULATION_FINISHED, &MediaBrowserTreeView::_onTreeStorePopulationFinished, this); Bind(wxEVT_PAINT, &MediaBrowserTreeView::_onExpose, this);