From ff0581a402045983d6352caa277ec670373551b6 Mon Sep 17 00:00:00 2001 From: kervala Date: Sun, 18 Dec 2016 13:59:02 +0100 Subject: [PATCH] Fixed: Unicode MFC use --- code/nel/tools/3d/plugin_max/nel_export/nel_export_view.cpp | 2 +- code/nel/tools/logic/logic_editor_dll/ConditionPage.cpp | 2 +- code/ryzom/tools/leveldesign/georges_dll/form_dialog.cpp | 2 +- code/ryzom/tools/leveldesign/georges_dll/type_dialog.cpp | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/nel/tools/3d/plugin_max/nel_export/nel_export_view.cpp b/code/nel/tools/3d/plugin_max/nel_export/nel_export_view.cpp index ba4fe5769..adfba5a98 100644 --- a/code/nel/tools/3d/plugin_max/nel_export/nel_export_view.cpp +++ b/code/nel/tools/3d/plugin_max/nel_export/nel_export_view.cpp @@ -106,7 +106,7 @@ void regsiterOVPath () //#elif defined (NL_RELEASE_DEBUG) // HMODULE hModule = GetModuleHandle("object_viewer_dll_rd.dll"); #else - HMODULE hModule = GetModuleHandle("object_viewer_dll_r.dll"); + HMODULE hModule = GetModuleHandle(_T("object_viewer_dll_r.dll")); #endif if (!hModule) { ::MessageBox(NULL, _T("'hModule' failed at '") __FUNCTION__ _T("' in file '") __FILE__ _T(" on line ") NL_MACRO_TO_STR(__LINE__), _T("NeL Export"), MB_OK | MB_ICONERROR); return; } TCHAR sModulePath[256]; diff --git a/code/nel/tools/logic/logic_editor_dll/ConditionPage.cpp b/code/nel/tools/logic/logic_editor_dll/ConditionPage.cpp index 60beeec25..64f0b985b 100644 --- a/code/nel/tools/logic/logic_editor_dll/ConditionPage.cpp +++ b/code/nel/tools/logic/logic_editor_dll/ConditionPage.cpp @@ -272,7 +272,7 @@ void CConditionPage::addCondition( CLogic_editorDoc *pDoc, CCondition * conditio CCondition *pCondition; if (pDoc->m_conditions.Lookup( condition->m_sName, (void*&)pCondition)) { - AfxMessageBox("A condition with this name already exist..."); + AfxMessageBox(_T("A condition with this name already exist...")); return; } diff --git a/code/ryzom/tools/leveldesign/georges_dll/form_dialog.cpp b/code/ryzom/tools/leveldesign/georges_dll/form_dialog.cpp index 3be1aeb08..2b8309ed2 100644 --- a/code/ryzom/tools/leveldesign/georges_dll/form_dialog.cpp +++ b/code/ryzom/tools/leveldesign/georges_dll/form_dialog.cpp @@ -1691,7 +1691,7 @@ void CFormMemCombo::getFromDocument (CForm &form) if (doc->getRootNode(getSlot ())->getValueByName (result, FormName, UFormElm::NoEval, NULL)) { Combo.UpdateData (); - Combo.SetWindowText (result.c_str()); + Combo.SetWindowText (utf8ToTStr(result)); Combo.UpdateData (FALSE); updateLabel (); } diff --git a/code/ryzom/tools/leveldesign/georges_dll/type_dialog.cpp b/code/ryzom/tools/leveldesign/georges_dll/type_dialog.cpp index f03347654..53698ea8f 100644 --- a/code/ryzom/tools/leveldesign/georges_dll/type_dialog.cpp +++ b/code/ryzom/tools/leveldesign/georges_dll/type_dialog.cpp @@ -517,9 +517,9 @@ void CTypeDialog::setPredefToDocument () // Add the label and value str = Predef.ListCtrl.GetItemText (predef, 0); - stringVector[predef][0] = (const char*)str; + stringVector[predef][0] = tStrToUtf8(str); str = Predef.ListCtrl.GetItemText (predef, 1); - stringVector[predef][1] = (const char*)str; + stringVector[predef][1] = tStrToUtf8(str); } doc->modify (new CActionStringVectorVector (IAction::TypePredef, stringVector, *doc,