From d860422c6d633742f997c41e78a553ad634673eb Mon Sep 17 00:00:00 2001
From: Nat Quayle Nelson <natquaylenelson@gmail.com>
Date: Wed, 28 Dec 2022 13:03:45 -0700
Subject: [PATCH] Update to TGUI 0.9.x

---
 src/game/boe.menu.cpp      | 2 +-
 src/game/boe.menu.hpp      | 4 ++--
 src/pcedit/pc.menu.hpp     | 4 ++--
 src/scenedit/scen.menu.hpp | 4 ++--
 src/tools/winutil.hpp      | 1 +
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/game/boe.menu.cpp b/src/game/boe.menu.cpp
index e4b5405d..52769557 100644
--- a/src/game/boe.menu.cpp
+++ b/src/game/boe.menu.cpp
@@ -235,7 +235,7 @@ void OpenBoEMenu::update_for_game_state(eGameMode overall_mode, bool party_in_me
 // Disconnect all spell menu items from signals and clear the menus
 void OpenBoEMenu::purge_spell_menus(tgui::MenuBar::Ptr& menubar) {
 	for(const auto& connection_id : this->spell_menus_connection_ids) {
-		if(!menubar->disconnect(connection_id))
+		if(!menubar->onMenuItemClick.disconnect(connection_id))
 			throw std::runtime_error { "BUG: attempted to disconnect menubar signal using invalid connection id" };
 	}
 
diff --git a/src/game/boe.menu.hpp b/src/game/boe.menu.hpp
index b3048930..0d5ac92a 100644
--- a/src/game/boe.menu.hpp
+++ b/src/game/boe.menu.hpp
@@ -26,11 +26,11 @@ public:
 
 private:
 
-	using MenuHierarchy = std::vector<sf::String>;
+	using MenuHierarchy = std::vector<tgui::String>;
 
 	tgui::Gui tgui;
 	cUniverse& univ;
-	const sf::String internal_menubar_widget_name { "openboe-menu" };
+	const tgui::String internal_menubar_widget_name { "openboe-menu" };
 	std::vector<unsigned int> spell_menus_connection_ids;
 
 	tgui::MenuBar::Ptr build_menubar() const;
diff --git a/src/pcedit/pc.menu.hpp b/src/pcedit/pc.menu.hpp
index a80089dc..ae25a46a 100644
--- a/src/pcedit/pc.menu.hpp
+++ b/src/pcedit/pc.menu.hpp
@@ -17,11 +17,11 @@ public:
 	
 private:
 	
-	using MenuHierarchy = std::vector<sf::String>;
+	using MenuHierarchy = std::vector<tgui::String>;
 	
 	tgui::Gui tgui;
 	sf::RenderWindow& mainPtr;
-	const sf::String internal_menubar_widget_name { "openboe-pcedit-menu" };
+	const tgui::String internal_menubar_widget_name { "openboe-pcedit-menu" };
 	
 	tgui::MenuBar::Ptr build_menubar() const;
 	void add_menu_placeholders(tgui::MenuBar::Ptr&) const;
diff --git a/src/scenedit/scen.menu.hpp b/src/scenedit/scen.menu.hpp
index 9ae07dcf..330bdc6e 100644
--- a/src/scenedit/scen.menu.hpp
+++ b/src/scenedit/scen.menu.hpp
@@ -22,10 +22,10 @@ public:
 	
 private:
 	
-	using MenuHierarchy = std::vector<sf::String>;
+	using MenuHierarchy = std::vector<tgui::String>;
 	
 	tgui::Gui tgui;
-	const sf::String internal_menubar_widget_name { "openboe-scenedit-menu" };
+	const tgui::String internal_menubar_widget_name { "openboe-scenedit-menu" };
 
 	tgui::MenuBar::Ptr build_menubar() const;
 	void add_menu_placeholders(tgui::MenuBar::Ptr&) const;
diff --git a/src/tools/winutil.hpp b/src/tools/winutil.hpp
index 9c6b7d56..8c7a005f 100644
--- a/src/tools/winutil.hpp
+++ b/src/tools/winutil.hpp
@@ -12,6 +12,7 @@
 #include <boost/filesystem/path.hpp>
 #include <SFML/Window.hpp>
 #include <SFML/Graphics/Image.hpp>
+#include <memory>
 
 char keyToChar(sf::Keyboard::Key key, bool isShift);