OSDN Git Service

ImgMergeFrm.cpp: Fix ansi build
authorsdottaka <sdottaka@sourceforge.net>
Wed, 24 Sep 2014 09:49:26 +0000 (18:49 +0900)
committersdottaka <sdottaka@sourceforge.net>
Wed, 24 Sep 2014 09:49:26 +0000 (18:49 +0900)
--HG--
branch : stable

Src/ImgMergeFrm.cpp

index c446a2f..e1e20ac 100644 (file)
@@ -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))
        {
-               String filename = ucr::toUTF16(strPath).c_str();
+               std::wstring filename = ucr::toUTF16(strPath).c_str();
                BOOL bApplyToAll = FALSE;
                if (m_pImgMergeWindow->SaveImageAs(pane, filename.c_str()))
                        return false;