diff options
| author | Jose <jose@zeroc.com> | 2014-05-02 20:24:00 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2014-05-02 20:24:00 +0200 |
| commit | b48eab05676ec06380f895d8610f28b4b5831707 (patch) | |
| tree | aac05dea0302aca912ca19ddc25886ebca506ce7 /cpp/demo/IcePatch2/MFC/PatchClientDlg.cpp | |
| parent | ICE-4851 - Use wstrings for input and output data that contain non-ASCII char... (diff) | |
| download | ice-b48eab05676ec06380f895d8610f28b4b5831707.tar.bz2 ice-b48eab05676ec06380f895d8610f28b4b5831707.tar.xz ice-b48eab05676ec06380f895d8610f28b4b5831707.zip | |
Minor fixes to wstringToString usage in demos.
Diffstat (limited to 'cpp/demo/IcePatch2/MFC/PatchClientDlg.cpp')
| -rw-r--r-- | cpp/demo/IcePatch2/MFC/PatchClientDlg.cpp | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/cpp/demo/IcePatch2/MFC/PatchClientDlg.cpp b/cpp/demo/IcePatch2/MFC/PatchClientDlg.cpp index 9340f6a10b6..015cfb31458 100644 --- a/cpp/demo/IcePatch2/MFC/PatchClientDlg.cpp +++ b/cpp/demo/IcePatch2/MFC/PatchClientDlg.cpp @@ -148,7 +148,7 @@ CPatchDlg::checksumProgress(const string& path) // TODO: indicate busy progress CString file; - file.Format(L" %s", IceUtil::stringToWstring(getBasename(path)).c_str()); + file.Format(L" %s", IceUtil::nativeToWnative(IceUtil::getProcessStringConverter(), 0, getBasename(path)).c_str()); _file->SetWindowText(file); processMessages(); @@ -206,7 +206,7 @@ CPatchDlg::patchStart(const string& path, Ice::Long size, Ice::Long totalProgres } CString file; - file.Format(L" %s", IceUtil::stringToWstring(getBasename(path)).c_str()); + file.Format(L" %s", IceUtil::nativeToWnative(IceUtil::getProcessStringConverter(), 0, getBasename(path)).c_str()); _file->SetWindowText(file); return patchProgress(0, size, totalProgress, totalSize); @@ -294,13 +294,19 @@ CPatchDlg::OnInitDialog() // Set the patch directory and thorough flag from properties. // Ice::PropertiesPtr properties = _communicator->getProperties(); - CString path = IceUtil::stringToWstring(properties->getPropertyWithDefault("IcePatch2Client.Directory", "")).c_str(); + CString path = IceUtil::nativeToWnative( + IceUtil::getProcessStringConverter(), 0, + properties->getPropertyWithDefault("IcePatch2Client.Directory", "")).c_str(); _path->SetWindowText(path); - CString thorough = IceUtil::stringToWstring(properties->getPropertyWithDefault("IcePatch2Client.Thorough", "0")).c_str(); + CString thorough = IceUtil::nativeToWnative( + IceUtil::getProcessStringConverter(), 0, + properties->getPropertyWithDefault("IcePatch2Client.Thorough", "0")).c_str(); _thorough->SetCheck(thorough != "0"); - CString remove = IceUtil::stringToWstring(properties->getPropertyWithDefault("IcePatch2Client.Remove", "0")).c_str(); + CString remove = IceUtil::nativeToWnative( + IceUtil::getProcessStringConverter(), 0, + properties->getPropertyWithDefault("IcePatch2Client.Remove", "0")).c_str(); _remove->SetCheck(remove != "0"); // @@ -395,7 +401,8 @@ CPatchDlg::OnStartPatch() AfxMessageBox(CString(L"Please select a patch directory."), MB_OK|MB_ICONEXCLAMATION); return; } - properties->setProperty("IcePatch2Client.Directory", IceUtil::wstringToString(wstring(path))); + properties->setProperty("IcePatch2Client.Directory", + IceUtil::wnativeToNative(IceUtil::getProcessStringConverter(), 0, wstring(path))); // // Set the thorough patch flag. |