X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2FguiFileSelectMenu.cpp;h=e02407427f51907ae9e88ce3a001f572578cf9a0;hb=ad5ac39d8d1a8b8f6f0fe077e20bac914ddc624b;hp=93d43f7868ee348a9547d104860735540c90b6ed;hpb=967121a34bbc60e6b46c7ec470b151f668ef1fef;p=oweals%2Fminetest.git

diff --git a/src/guiFileSelectMenu.cpp b/src/guiFileSelectMenu.cpp
index 93d43f786..e02407427 100644
--- a/src/guiFileSelectMenu.cpp
+++ b/src/guiFileSelectMenu.cpp
@@ -26,18 +26,16 @@ GUIFileSelectMenu::GUIFileSelectMenu(gui::IGUIEnvironment* env,
 				std::string title, std::string formname) :
 GUIModalMenu(env, parent, id, menumgr)
 {
-	m_title = narrow_to_wide(title);
+	m_title = utf8_to_wide(title);
 	m_parent = parent;
 	m_formname = formname;
 	m_text_dst = 0;
 	m_accepted = false;
-	m_previous_locale = setlocale(LC_ALL,0);
 }
 
 GUIFileSelectMenu::~GUIFileSelectMenu()
 {
 	removeChildren();
-	setlocale(LC_ALL,m_previous_locale.c_str());
 }
 
 void GUIFileSelectMenu::removeChildren()
@@ -86,10 +84,10 @@ void GUIFileSelectMenu::drawMenu()
 
 void GUIFileSelectMenu::acceptInput() {
 	if ((m_text_dst != 0) && (this->m_formname != "")){
-		std::map<std::string, std::string> fields;
+		StringMap fields;
 
 		if (m_accepted)
-			fields[m_formname + "_accepted"] = wide_to_narrow(m_fileOpenDialog->getFileName());
+			fields[m_formname + "_accepted"] = wide_to_utf8(m_fileOpenDialog->getFileName());
 		else
 			fields[m_formname + "_canceled"] = m_formname;
 
@@ -101,12 +99,6 @@ bool GUIFileSelectMenu::OnEvent(const SEvent& event)
 {
 
 	if (event.EventType == irr::EET_GUI_EVENT) {
-
-		int callerId = event.GUIEvent.Caller->getID();
-		if (callerId >= 0) {
-			std::cout << "CallerId:" << callerId << std::endl;
-		}
-
 		switch (event.GUIEvent.EventType) {
 			case gui::EGET_ELEMENT_CLOSED:
 			case gui::EGET_FILE_CHOOSE_DIALOG_CANCELLED: