mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-11-10 01:09:50 +00:00
Fixed: Unicode MFC use
--HG-- branch : develop
This commit is contained in:
parent
c4d8565185
commit
b52daf9519
4 changed files with 5 additions and 5 deletions
|
@ -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];
|
||||||
|
|
|
@ -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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -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 ();
|
||||||
}
|
}
|
||||||
|
|
|
@ -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,
|
||||||
|
|
Loading…
Reference in a new issue