Changed: Unicode

--HG--
branch : develop
This commit is contained in:
kervala 2016-12-19 13:33:44 +01:00
parent 6978dc9bee
commit 89347cd6a0

View file

@ -954,8 +954,8 @@ BOOL CFormDialog::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
value -= (float)(lpnmud->iDelta) * increment; value -= (float)(lpnmud->iDelta) * increment;
// Print the result // Print the result
char result[512]; TCHAR result[512];
sprintf (result, "%g", value); _stprintf (result, _T("%g"), value);
// Set the windnow text // Set the windnow text
combo->Combo.SetWindowText (result); combo->Combo.SetWindowText (result);
@ -1723,13 +1723,13 @@ void CFormMemCombo::getFromDocument (CForm &form)
Combo.SetWindowText (label); Combo.SetWindowText (label);
if (arrayNode->getForm () == &form) if (arrayNode->getForm () == &form)
Label.SetWindowText ("Array size:"); Label.SetWindowText (_T("Array size:"));
else else
Label.SetWindowText ("Array size: (in parent form)"); Label.SetWindowText (_T("Array size: (in parent form)"));
} }
else else
{ {
Combo.SetWindowText ("0"); Combo.SetWindowText (_T("0"));
} }
Combo.UpdateData (FALSE); Combo.UpdateData (FALSE);
} }
@ -1751,11 +1751,11 @@ void CFormMemCombo::getFromDocument (CForm &form)
if (node) if (node)
{ {
CFormElmVirtualStruct *virtualNode = safe_cast<CFormElmVirtualStruct*> (node); CFormElmVirtualStruct *virtualNode = safe_cast<CFormElmVirtualStruct*> (node);
Combo.SetWindowText (virtualNode->DfnFilename.c_str()); Combo.SetWindowText (utf8ToTStr(virtualNode->DfnFilename));
} }
else else
{ {
Combo.SetWindowText (""); Combo.SetWindowText (_T(""));
} }
Combo.UpdateData (FALSE); Combo.UpdateData (FALSE);
} }