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/05_ImportExport/src/ColoredShapes.cpp
View File

@@ -85,7 +85,7 @@ void CColoredShapes::Serialize(CArchive & ar)
// Check
if (d->ErrorStatus() != Storage_VSOk)
{
::MessageBox(NULL, " Error while writing... ", " Error ",MB_OK) ;
::MessageBoxW (AfxGetApp()->m_pMainWnd->m_hWnd, L"Error while writing... ", L" Error ", MB_OK);
}
// Store the color in the archive

12
samples/mfc/standard/05_ImportExport/src/FSD_Archive.cxx
View File

@@ -68,7 +68,7 @@ Storage_Error FSD_Archive::IsGoodFileType(const TCollection_AsciiString&
return s;
}
Storage_Error FSD_Archive::Open(const TCollection_AsciiString& aName,
Storage_Error FSD_Archive::Open(const TCollection_AsciiString& theName,
const Storage_OpenMode
#ifdef WNT
aMode
@@ -76,20 +76,20 @@ Storage_Error FSD_Archive::Open(const TCollection_AsciiString& aName,
)
{
Storage_Error result = Storage_VSOk;
SetName(aName);
CString aName = theName.ToCString();
SetName (theName);
#ifdef WNT
if (OpenMode() == Storage_VSNone) {
if (aMode == Storage_VSRead) {
if (!((FSD_CFile*)myCFile)->Open(aName.ToCString(),CFile::modeRead))
if (!((FSD_CFile*)myCFile)->Open(aName, CFile::modeRead))
result = Storage_VSOpenError;
}
else if (aMode == Storage_VSWrite) {
if (!((FSD_CFile*)myCFile)->Open(aName.ToCString(),CFile::modeCreate | CFile::modeWrite))
if (!((FSD_CFile*)myCFile)->Open(aName, CFile::modeCreate | CFile::modeWrite))
result = Storage_VSOpenError;
}
else if (aMode == Storage_VSReadWrite) {
if (!((FSD_CFile*)myCFile)->Open(aName.ToCString(),CFile::modeReadWrite))
if (!((FSD_CFile*)myCFile)->Open(aName, CFile::modeReadWrite))
result = Storage_VSOpenError;
}
if (result == Storage_VSOk) {

6
samples/mfc/standard/05_ImportExport/src/ImportExportApp.cpp
View File

@@ -29,11 +29,11 @@ CImportExportApp::CImportExportApp() : OCC_App()
}
catch (Standard_Failure)
{
AfxMessageBox ("Fatal Error in units initialisation");
AfxMessageBox (L"Fatal Error in units initialisation");
}
SampleName = "ImportExport"; //for about dialog
SetSamplePath ("..\\..\\05_ImportExport");
SetSamplePath (L"..\\..\\05_ImportExport");
}
/////////////////////////////////////////////////////////////////////////////
@@ -98,7 +98,7 @@ CDocument* CImportExportApp::OpenDocumentFile(LPCTSTR lpszFileName)
CFile cf;
if (!cf.Open(lpszFileName,CFile::modeReadWrite)){
AfxMessageBox("File not found!");
AfxMessageBox (L"File not found!");
return NULL;
}
cf.Close();