OSDN Git Service
(root)
/
winmerge-jp
/
winmerge-jp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6de4566
)
ImgMergeFrm.cpp: Fix ansi build
author
sdottaka
<sdottaka@sourceforge.net>
Wed, 24 Sep 2014 09:49:26 +0000
(18:49 +0900)
committer
sdottaka
<sdottaka@sourceforge.net>
Wed, 24 Sep 2014 09:49:26 +0000
(18:49 +0900)
--HG--
branch : stable
Src/ImgMergeFrm.cpp
patch
|
blob
|
history
diff --git
a/Src/ImgMergeFrm.cpp
b/Src/ImgMergeFrm.cpp
index
c446a2f
..
e1e20ac
100644
(file)
--- a/
Src/ImgMergeFrm.cpp
+++ b/
Src/ImgMergeFrm.cpp
@@
-449,7
+449,7
@@
bool CImgMergeFrame::DoFileSaveAs(int pane)
id = IDS_SAVE_MIDDLE_AS;
if (SelectFile(AfxGetMainWnd()->GetSafeHwnd(), strPath, path.c_str(), id, NULL, FALSE))
{
-
S
tring filename = ucr::toUTF16(strPath).c_str();
+
std::ws
tring filename = ucr::toUTF16(strPath).c_str();
BOOL bApplyToAll = FALSE;
if (m_pImgMergeWindow->SaveImageAs(pane, filename.c_str()))
return false;