Disable implicit conversions from wxString to std::string

cemu-project · Sep 13, 2023 · 1472b87 · 1472b87
1 parent fc1dca5
commit 1472b87
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/src/gui/GameUpdateWindow.cpp b/src/gui/GameUpdateWindow.cpp
@@ -132,7 +132,7 @@ bool GameUpdateWindow::ParseUpdate(const fs::path& metaPath)
 	if (targetSpace.free <= m_required_size)
 	{
 		auto string = formatWxString(_("Not enough space available.\nRequired: {0} MB\nAvailable: {1} MB"), (m_required_size / 1024 / 1024), (targetSpace.free / 1024 / 1024));
-		throw std::runtime_error(string);
+		throw std::runtime_error(string.utf8_string());
 	}
 
 	return true;

diff --git a/src/gui/GraphicPacksWindow2.cpp b/src/gui/GraphicPacksWindow2.cpp
@@ -445,7 +445,7 @@ void GraphicPacksWindow2::OnTreeSelectionChanged(wxTreeEvent& event)
 				m_graphic_pack_name->SetLabel(wxHelper::FromUtf8(m_gp_name));
 
 				if (gp->GetDescription().empty())
-					m_gp_description = _("This graphic pack has no description");
+					m_gp_description = _("This graphic pack has no description").utf8_string();
 				else
 					m_gp_description = gp->GetDescription();
 

diff --git a/src/gui/wxgui.h b/src/gui/wxgui.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#define wxNO_UNSAFE_WXSTRING_CONV 1
+
 #include <wx/wxprec.h>
 #ifndef WX_PRECOMP
 #include <wx/wx.h>