OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-14 13:30:48 +03:00
Code Activity

0027880: Samples - fix handling of Unicode paths within MFC import/export sample

Browse Source
This commit is contained in:
kgv
2016-09-19 11:46:27 +03:00
committed by bugmaster
parent b357dcc225
commit e620e2857f
8 changed files with 34 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
samples/mfc/standard/03_Viewer2d/src/Viewer2dDoc.cpp
View File

@@ -321,7 +321,7 @@ void CViewer2dDoc::OnBUTTONTestImage()
NULL,
NULL,
OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT,
SupportedImageFormats() + "| all files (*.*)|*.*;||",
SupportedImageFormats() + L"| all files (*.*)|*.*;||",
NULL);
CString anInitDir (((OCC_App*) AfxGetApp())->GetInitDataDir());
@@ -332,8 +332,7 @@ void CViewer2dDoc::OnBUTTONTestImage()
{
SetCursor(AfxGetApp()->LoadStandardCursor (IDC_WAIT));
CString aFilePath = anOpenImageDlg.GetPathName();
TCollection_ExtendedString aFileNameW ((Standard_ExtString )(const wchar_t* )aFilePath);
TCollection_AsciiString aFileName (aFileNameW, '?');
TCollection_AsciiString aFileName ((const wchar_t* )aFilePath);
//erase viewer
if(myAISContext->HasOpenedContext())
@@ -355,7 +354,7 @@ void CViewer2dDoc::OnBUTTONMultipleImage()
NULL,
NULL,
OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT,
SupportedImageFormats() + "| all files (*.*)|*.*;||",
SupportedImageFormats() + L"| all files (*.*)|*.*;||",
NULL);
CString anInitDir (((OCC_App*) AfxGetApp())->GetInitDataDir());
@@ -367,8 +366,7 @@ void CViewer2dDoc::OnBUTTONMultipleImage()
{
SetCursor(AfxGetApp()->LoadStandardCursor (IDC_WAIT));
CString aFilePath = anOpenImageDlg.GetPathName();
TCollection_ExtendedString aFileNameW ((Standard_ExtString )(const wchar_t* )aFilePath);
TCollection_AsciiString aFileName (aFileNameW, '?');
TCollection_AsciiString aFileName ((const wchar_t* )aFilePath);
//erase viewer
if(myAISContext->HasOpenedContext())