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

0024943: Port MFC samples to UNICODE for compatibility with VS2013

Browse Source 
Add vc12 project files for MFC samples.

CMake - add Unicode option for MFC samples

CMake - do not set MFC option globally

Update description of Cmake building procedure for MFC sample

Correction of cmake.md and automake.md

0024943: Port MFC sample to UNICODE for compatibility with VS2013
The formatting of developer guides about OCCT building with various build systems has been improved.

automake article clean up
This commit is contained in:
kgv
2014-07-31 13:52:43 +04:00
committed by bugmaster
parent 9d0fc01b3f
commit 576f8b111b
140 changed files with 7640 additions and 1202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
samples/mfc/standard/03_Viewer2d/src/Viewer2dApp.cpp
View File

@@ -22,7 +22,7 @@ static char THIS_FILE[] = __FILE__;
CViewer2dApp::CViewer2dApp() : OCC_App()
{
SampleName = "Viewer2d"; //for about dialog
SetSamplePath ("..\\..\\03_Viewer2d");
SetSamplePath (L"..\\..\\03_Viewer2d");
}
/////////////////////////////////////////////////////////////////////////////

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

@@ -233,7 +233,7 @@ void CViewer2dDoc::OnBUTTONTestFace()
NULL,
NULL,
OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT,
"BRep Files (*.brep)|*.brep; ||",
L"BRep Files (*.brep)|*.brep; ||",
NULL );
CString initdir(((OCC_App*) AfxGetApp())->GetInitDataDir());
@@ -244,17 +244,21 @@ void CViewer2dDoc::OnBUTTONTestFace()
if (dlg.DoModal() == IDOK)
{
SetCursor(AfxGetApp()->LoadStandardCursor(IDC_WAIT));
CString filename = dlg.GetPathName();
Standard_CString aFileName = (Standard_CString)(LPCTSTR)filename;
std::filebuf aFileBuf;
std::istream aStream (&aFileBuf);
if (!aFileBuf.open (dlg.GetPathName(), ios::in))
{
AfxMessageBox (L"The shape must be not a null Face");
return;
}
TopoDS_Shape aFaceShape;
BRep_Builder aBuilder;
//Standard_Boolean result = BRepTools::Read(aFaceShape,aFileName,aBuilder);
BRepTools::Read(aFaceShape,aFileName,aBuilder);
BRepTools::Read (aFaceShape, aStream, aBuilder);
if(aFaceShape.IsNull() || aFaceShape.ShapeType() != TopAbs_FACE)
{
AfxMessageBox("The shape must be not a null Face");
AfxMessageBox (L"The shape must be not a null Face");
return;
}
@@ -332,7 +336,8 @@ void CViewer2dDoc::OnBUTTONTestImage()
{
SetCursor(AfxGetApp()->LoadStandardCursor (IDC_WAIT));
CString aFilePath = anOpenImageDlg.GetPathName();
TCollection_AsciiString aFileName (aFilePath);
TCollection_ExtendedString aFileNameW ((Standard_ExtString )(const wchar_t* )aFilePath);
TCollection_AsciiString aFileName (aFileNameW, '?');
//erase viewer
if(myAISContext->HasOpenedContext())
@@ -366,7 +371,8 @@ void CViewer2dDoc::OnBUTTONMultipleImage()
{
SetCursor(AfxGetApp()->LoadStandardCursor (IDC_WAIT));
CString aFilePath = anOpenImageDlg.GetPathName();
TCollection_AsciiString aFileName (aFilePath);
TCollection_ExtendedString aFileNameW ((Standard_ExtString )(const wchar_t* )aFilePath);
TCollection_AsciiString aFileName (aFileNameW, '?');
//erase viewer
if(myAISContext->HasOpenedContext())