#5527: Handle art provider (de-)registration in the LocalBitmapArtPro…

…vider class itself

radiant/uimanager/LocalBitmapArtProvider.h

@@ -14,15 +14,24 @@ namespace ui
  * bitmaps used in toolbars and other controls. The schema for these custom ArtIDs
  * is "darkradiant:filename.png" where filename.png is a file in DR's bitmap folder.
  */
-class LocalBitmapArtProvider :
+class LocalBitmapArtProvider final :
 	public wxArtProvider
 {
 public:
+    LocalBitmapArtProvider()
+    {
+        wxArtProvider::Push(this);
+    }
+
+    ~LocalBitmapArtProvider()
+    {
+        wxArtProvider::Remove(this);
+    }
+
 	wxBitmap CreateBitmap(const wxArtID& id, const wxArtClient& client, const wxSize& size)
 	{
-		std::string filename(id.begin(), id.end()); // convert wxString to std::string
-
-		const std::string& prefix = ArtIdPrefix();
+        auto filename = id.ToStdString();
+		const auto& prefix = ArtIdPrefix();
 
 		if (string::starts_with(filename, prefix))
 		{

radiant/uimanager/UIManager.cpp

@@ -35,8 +35,7 @@ void UIManager::clear()
 	_dialogManager.reset();
 
 	wxFileSystem::CleanUpHandlers();
-	wxArtProvider::Delete(_bitmapArtProvider);
-	_bitmapArtProvider = nullptr;
+	_bitmapArtProvider.reset();
 }
 
 const std::string& UIManager::ArtIdPrefix() const
@@ -68,8 +67,7 @@ void UIManager::initialiseModule(const IApplicationContext& ctx)
 {
 	rMessage() << getName() << "::initialiseModule called" << std::endl;
 
-	_bitmapArtProvider = new LocalBitmapArtProvider();
-	wxArtProvider::Push(_bitmapArtProvider);
+	_bitmapArtProvider.reset(new LocalBitmapArtProvider());
 
 	_dialogManager = std::make_shared<DialogManager>();
 

radiant/uimanager/UIManager.h

@@ -22,13 +22,9 @@ class UIManager :
     // called before the main window is ready.
 	DialogManagerPtr _dialogManager;
 
-	LocalBitmapArtProvider* _bitmapArtProvider;
+	std::unique_ptr<LocalBitmapArtProvider> _bitmapArtProvider;
 
 public:
-	UIManager() :
-		_bitmapArtProvider(nullptr)
-	{}
-
 	IGroupDialog& getGroupDialog() override;
 
 	IDialogManager& getDialogManager() override;