Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Fixed: Unicode MFC use

Browse source
This commit is contained in:
kervala 2016-12-18 13:59:02 +01:00
parent 33983dec8d
commit ff0581a402
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/nel/tools/3d/plugin_max/nel_export/nel_export_view.cpp
View file

@ -106,7 +106,7 @@ void regsiterOVPath ()
//#elif defined (NL_RELEASE_DEBUG) //#elif defined (NL_RELEASE_DEBUG)
// HMODULE hModule = GetModuleHandle("object_viewer_dll_rd.dll"); // HMODULE hModule = GetModuleHandle("object_viewer_dll_rd.dll");
#else #else
HMODULE hModule = GetModuleHandle("object_viewer_dll_r.dll"); HMODULE hModule = GetModuleHandle(_T("object_viewer_dll_r.dll"));
#endif #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; } 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]; TCHAR sModulePath[256];

2
code/nel/tools/logic/logic_editor_dll/ConditionPage.cpp
View file

@ -272,7 +272,7 @@ void CConditionPage::addCondition( CLogic_editorDoc *pDoc, CCondition * conditio
CCondition *pCondition; CCondition *pCondition;
if (pDoc->m_conditions.Lookup( condition->m_sName, (void*&)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; return;
} }

2
code/ryzom/tools/leveldesign/georges_dll/form_dialog.cpp
View file

@ -1691,7 +1691,7 @@ void CFormMemCombo::getFromDocument (CForm &form)
if (doc->getRootNode(getSlot ())->getValueByName (result, FormName, UFormElm::NoEval, NULL)) if (doc->getRootNode(getSlot ())->getValueByName (result, FormName, UFormElm::NoEval, NULL))
{ {
Combo.UpdateData (); Combo.UpdateData ();
Combo.SetWindowText (result.c_str()); Combo.SetWindowText (utf8ToTStr(result));
Combo.UpdateData (FALSE); Combo.UpdateData (FALSE);
updateLabel (); updateLabel ();
} }

4
code/ryzom/tools/leveldesign/georges_dll/type_dialog.cpp
View file

@ -517,9 +517,9 @@ void CTypeDialog::setPredefToDocument ()
// Add the label and value // Add the label and value
str = Predef.ListCtrl.GetItemText (predef, 0); str = Predef.ListCtrl.GetItemText (predef, 0);
stringVector[predef][0] = (const char*)str; stringVector[predef][0] = tStrToUtf8(str);
str = Predef.ListCtrl.GetItemText (predef, 1); 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, doc->modify (new CActionStringVectorVector (IAction::TypePredef, stringVector, *doc,