diff --git a/CMakeLists.txt b/CMakeLists.txt index 49add8fef6..c7aeeb1db6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,7 @@ cmake_minimum_required ( VERSION 2.6) +set (CMAKE_SUPPRESS_REGENERATION TRUE) + if (NOT BUILD_CONFIGURATION) set(BUILD_CONFIGURATION "Release" CACHE STRING "Build type of OCCT" FORCE) SET_PROPERTY(CACHE BUILD_CONFIGURATION PROPERTY STRINGS Release Debug RelWithDebInfo) @@ -630,27 +632,26 @@ IF(NOT "${UNSUBDIRS}" STREQUAL "") # add required subdirs FOREACH(UNSUBDIR ${UNSUBDIRS}) MESSAGE(STATUS "${UNSUBDIR}") - subdirs(${TK_ROOT_DIR}/${UNSUBDIR}) + ADD_SUBDIRECTORY (${TK_ROOT_DIR}/${UNSUBDIR}) ENDFOREACH() ENDIF() # samples do not support patch usage IF (BUILD_Samples) - SET (CMAKE_MFC_FLAG 2) SET (OCCT_ROOT ${CMAKE_SOURCE_DIR}) SET (MFC_STANDARD_SAMPLES_DIR ${OCCT_ROOT}/samples/mfc/standard) SET (COMMON_WINMAIN_FILE ${MFC_STANDARD_SAMPLES_DIR}/Common/Winmain.cpp) - subdirs(samples/mfc/standard/mfcsample) - subdirs(samples/mfc/standard/01_Geometry) - subdirs(samples/mfc/standard/02_Modeling) - subdirs(samples/mfc/standard/03_Viewer2d) - subdirs(samples/mfc/standard/04_Viewer3d) - subdirs(samples/mfc/standard/05_ImportExport) - subdirs(samples/mfc/standard/06_Ocaf) - subdirs(samples/mfc/standard/07_Triangulation) - subdirs(samples/mfc/standard/08_HLR) - subdirs(samples/mfc/standard/09_Animation) - subdirs(samples/mfc/standard/10_Convert) + ADD_SUBDIRECTORY (samples/mfc/standard/mfcsample) + ADD_SUBDIRECTORY (samples/mfc/standard/01_Geometry) + ADD_SUBDIRECTORY (samples/mfc/standard/02_Modeling) + ADD_SUBDIRECTORY (samples/mfc/standard/03_Viewer2d) + ADD_SUBDIRECTORY (samples/mfc/standard/04_Viewer3d) + ADD_SUBDIRECTORY (samples/mfc/standard/05_ImportExport) + ADD_SUBDIRECTORY (samples/mfc/standard/06_Ocaf) + ADD_SUBDIRECTORY (samples/mfc/standard/07_Triangulation) + ADD_SUBDIRECTORY (samples/mfc/standard/08_HLR) + ADD_SUBDIRECTORY (samples/mfc/standard/09_Animation) + ADD_SUBDIRECTORY (samples/mfc/standard/10_Convert) ENDIF() diff --git a/dox/dev_guides/building/automake.md b/dox/dev_guides/building/automake.md index d700b86bfe..61a64fddbf 100644 --- a/dox/dev_guides/building/automake.md +++ b/dox/dev_guides/building/automake.md @@ -1,71 +1,72 @@ Building with Automake {#occt_dev_guides__building_automake} ====================== -This file describes steps to build OCCT libraries from complete source -archive on Linux with GNU build system (Autotools). +This file describes steps to build OCCT libraries from a complete source +archive on Linux with **Autotools** GNU build system. -If you are building OCCT from bare sources (as in Git repository), or do some +If you build OCCT from bare sources (as in Git repository), or do some changes affecting CDL files, you need to use WOK to re-generate header files and build scripts / projects. See paragraph 1 \ref occt_dev_guides__building_wok for instructions. -Before building OCCT, you need to install required third-party libraries; see paragraph 1 of +Before building OCCT, you need to install the required third-party libraries; see paragraph 1 of \ref occt_dev_guides__building for instructions. -Note that during compilation by makefiles on some Linux OS on a station with +Note that during compilation by makefiles on Linux station with NVIDIA video card you may experience problems because the installation -procedure of NVIDIA video driver removes library libGL.so included in package -libMesaGL from directory /usr/X11R6/lib and places this library libGL.so in -directory /usr/lib. However, libtool expects to find the library in directory -/usr/X11R6/lib, which causes compilation crash (See /usr/X11R6/lib/libGLU.la). +procedure of NVIDIA video driver removes library *libGL.so* included in package +*libMesaGL* from directory /usr/X11R6/lib and places this library *libGL.so* in +directory /usr/lib. However, *libtool* expects to find the library in directory +/usr/X11R6/lib, which causes compilation crash (See /usr/X11R6/lib/libGLU.la ). -To prevent this, suggest making links: +To prevent this, it is suggested to make links: - ln -s /usr/lib/libGL.so /usr/X11R6/lib/libGL.so - ln -s /usr/lib/libGL.la /usr/X11R6/lib/libGL.la - 1.In OCCT root folder, launch build_configure script + ln -s /usr/lib/libGL.so /usr/X11R6/lib/libGL.so + ln -s /usr/lib/libGL.la /usr/X11R6/lib/libGL.la - This will generate files configure and Makefile.in for your system. - 2.Go to the directory where OCCT will be built, and run configure to generate - makefiles. + 1.In OCCT root folder, launch *build_configure* script to generate files *configure* and *Makefile.in* for your system. - $CASROOT/configure \ + 2.Go to the directory, where OCCT will be built, and run *configure* to generate makefiles. - Where \ is a set of options. + + $CASROOT/configure \ + + Where \ is a set of options. The following flags are mandatory: - * --with-tcl= defines location of tclConfig.sh - * --with-tk= defines location of tkConfig.sh - * --with-freetype= defines location of installed FreeType product - * --prefix= defines location for the installation of OCCT binaries + * --with-tcl= defines the location of *tclConfig.sh*; + * --with-tk= defines location of *tkConfig.sh*; + * --with-freetype= defines location of installed **FreeType** product + * --prefix= defines the location for installation of OCCT binaries Additional flags: - * --with-gl2ps= defines location of installed gl2ps product - * --with-freeimage= defines location of installed FreeImage product - * --with-tbb-include= defines location of tbb.h - * --with-tbb-library= defines location of libtbb.so - * --with-opencl-include= defines location of cl.h - * --with-opencl-library= defines location of libOpenCL.so - * --enable-debug= yes: includes debug information, no: does not include debug information - * --enable-production= yes: switches code optimization, no: switches off code optimization - * --disable-draw - allows OCCT building without Draw. + * --with-gl2ps= defines the location of installed **gl2ps** product; + * --with-freeimage= defines the location of installed **FreeImage** product; + * --with-tbb-include= defines the location of *tbb.h*; + * --with-tbb-library= defines the location of *libtbb.so*; + * --with-opencl-include= defines the location of *cl.h*; + * --with-opencl-library= defines the location of *libOpenCL.so*; + * --enable-debug= yes: includes debug information, no: does not include debug information; + * --enable-production= yes: switches code optimization, no: switches off code optimization; + * --disable-draw allows OCCT building without Draw. - If location of FreeImage, TBB, gl2ps or OpenCL is not specified, OCCT will be - built without these optional libraries. + If location of **FreeImage, TBB, gl2ps** or **OpenCL** is not specified, OCCT will be built without these optional libraries. - Attention: 64-bit platforms are detected automatically. + Attention: 64-bit platforms are detected automatically. - Example: + Example: + - > ./configure -prefix=/PRODUCTS/occt-6.5.5 --with-tcl=/PRODUCTS/tcltk-8.5.8/lib --with-tk=/PRODUCTS/tcltk-8.5.8/lib --with-freetype=/PRODUCTS/freetype-2.4.10 --with-gl2ps=/PRODUCTS/gl2ps-1.3.5 --with-freeimage=/PRODUCTS/freeimage-3.14.1 --with-tbb-include=/PRODUCTS/tbb30_018oss/include --with-tbb-library=/PRODUCTS/tbb30_018oss/lib/ia32/cc4.1.0_libc2.4_kernel2.6.16.21 --with-opencl-include=/PRODUCTS/opencl-icd-1.2.11.0/include --with-opencl-library=/PRODUCTS/opencl-icd-1.2.11.0/lib + \> ./configure -prefix=/PRODUCTS/occt-6.5.5 --with-tcl=/PRODUCTS/tcltk-8.5.8/lib --with-tk=/PRODUCTS/tcltk-8.5.8/lib --with-freetype=/PRODUCTS/freetype-2.4.10 --with-gl2ps=/PRODUCTS/gl2ps-1.3.5 --with-freeimage=/PRODUCTS/freeimage-3.14.1 --with-tbb-include=/PRODUCTS/tbb30_018oss/include --with-tbb-library=/PRODUCTS/tbb30_018oss/lib/ia32/cc4.1.0_libc2.4_kernel2.6.16.21 --with-opencl-include=/PRODUCTS/opencl-icd-1.2.11.0/include --with-opencl-library=/PRODUCTS/opencl-icd-1.2.11.0/lib - 3.If configure exits successfully, you can build OCCT with make command. - > make -j8 install + 3.If configure exits successfully, you can build OCCT with *make* command. -To start DRAW, launch + \> make -j8 install - > draw.sh + 4.To start *DRAW*, launch + + \> draw.sh diff --git a/dox/dev_guides/building/cmake/cmake.md b/dox/dev_guides/building/cmake/cmake.md index eecbae8237..1b315080cb 100644 --- a/dox/dev_guides/building/cmake/cmake.md +++ b/dox/dev_guides/building/cmake/cmake.md @@ -3,24 +3,23 @@ Building with CMake {#occt_dev_guides__building_cmake} @tableofcontents -This file describes steps to build OCCT libraries from complete source package -with CMake. CMake is free software that can create GNU Makefiles, KDevelop, -XCode, and Visual Studio project files. Version 2.6 or above of CMake is +This file describes the steps to build OCCT libraries from a complete source package +with **CMake**. CMake is free software that can create GNU Makefiles, KDevelop, +XCode, and Visual Studio project files. **CMake** version 2.6 or above is required. -If you are building OCCT from bare sources (as in Git repository), or do some +If you build OCCT from bare sources (as in Git repository) or make some changes affecting CDL files, you need to use WOK to re-generate header files and build scripts / projects. See \ref occt_dev_guides__building_wok for instructions. -Before building OCCT, you need to install required third-party libraries; see +Before building OCCT, you need to install the required third-party libraries; see the instructions for your platform in @ref occt_dev_guides__building. -## Decide on location of build and install directories. +## Define the location of build and install directories. -The build directory is the one where intermediate files will be created (projects / makefiles, objects, binaries). -Each configuration to be built should have its own build directory. +The build directory is where intermediate files (projects / makefiles, objects, binaries) will be created. Each built configuration should have its own build directory. -The install directory is the one where binaries will be installed after build, along with header files and resources required for OCCT use in applications. +The install directory is where binaries will be installed after build, along with header files and resources required for OCCT use in applications. It is possible to install several configurations of OCCT (differentiated by platform, bitness, compiler, and build type) into the same directory. It is recommended to separate build and install directories from OCCT source directory, for example: @@ -31,120 +30,123 @@ It is recommended to separate build and install directories from OCCT source dir ## CMake usage -Run CMake indicating path to OCCT sources ($CASROOT) and selected build directory. +Run CMake indicating the path to OCCT sources ($CASROOT) and selected build directory. -It is recommended to use GUI tools provided by CMake: cmake-gui on Windows and Mac, ccmake or cmake-gui on Linux. +It is recommended to use GUI tools provided by CMake: *cmake-gui* on Windows and Mac, *ccmake* or *cmake-gui* on Linux. ### Windows: -Specify the root folder of OCCT ($CASROOT, it contains CMakelists.txt file) by clicking Browse Source. +Specify the root folder of OCCT ($CASROOT, which contains *CMakelists.txt* file) by clicking **Browse Source**. @figure{/dev_guides/building/cmake/images/cmake_image001.png} -Specify location (build folder) for Cmake generated project files by clicking Browse Build. -Each configuration of the project should be built in its own directory. -When building multiple configurations it is recommended to compose name of build directories including system, bitness, compiler, and build type (e.g., d:/occt/build/win32-vc9-debug). +Specify the location (build folder) for Cmake generated project files by clicking **Browse Build**. -Configure opens the window with a drop-down list of generators supported by CMake project. Select the required generator (e.g., Visual Studio 2008) and click Finish. +Each configuration of the project should be built in its own directory. When building multiple configurations it is recommended to indicate in the name of build directories the system, bitness, compiler, and build type (e.g., d:/occt/build/win32-vc9-debug ). + +**Configure** opens the window with a drop-down list of generators supported by CMake project. Select the required generator (e.g., Visual Studio 2008) and click **Finish**. @figure{/dev_guides/building/cmake/images/cmake_image002.png} ### Linux (ccmake variant): -In the console, change to the build directory and call ccmake with the path to the source directory of the project: +In the console, change to the build directory and call *ccmake* with the path to the source directory of the project: > cd ~/occt/build/debug > ccmake ~/occt @figure{/dev_guides/building/cmake/images/cmake_image003.png} -Press "c" to configure. +Press *c* to configure. -Use of *cmake-gui* is the same as described above for Windows. +*cmake-gui* is used in the same way as described above for Windows. ### Mac OS: -Use cmake-gui (Applications -> CMake 2.8-10.app) to generate project files for the chosen build environment (e.g., XCode). +Use *cmake-gui* **Applications -> CMake 2.8-10.app** to generate project files for the chosen build environment (e.g., XCode). @figure{/dev_guides/building/cmake/images/cmake_image004.png} ## OCCT Configuration -The error message which appears at the end of configuration process, informs you about the required variables +The error message, which appears at the end of configuration process, informs you about the required variables, which need to be defined. This error will appear until all required variables are defined correctly. -Note: In cmake-gui there is "grouped" option, which groups variables with a common prefix. -### Selection of components to be built +Note: In *cmake-gui* there is "grouped" option, which groups variables with a common prefix. -The variables with "BUILD_" prefix allow specifying OCCT components and +### Selection of the components to be built + +The variables with BUILD_ prefix allow specifying OCCT components and configuration to be built: -* BUILD_CONFIGURATION - defines configuration to be built (Release by default). -* BUILD_ - specify whether corresponding OCCT module should be - built (all toolkits). Note that even if whole module is not +* *BUILD_CONFIGURATION* - defines configuration to be built (Release by default). +* BUILD_ - specifies whether the corresponding OCCT module should be + built (all toolkits). Note that even if the whole module is not selected for build, its toolkits used by other toolkits selected for build will be included automatically. -* BUILD_TOOLKITS - allows including additional toolkits from non-selected +* *BUILD_TOOLKITS* - allows including additional toolkits from non-selected modules (should be list of toolkit names separated by a space or a semicolon). -* BUILD_SAMPLES - specify whether OCCT MFC samples should be built. -* BUILD_PATCH_DIR - optionally specify additional folder containing patched OCCT source files. +* *BUILD_SAMPLES* - specifies whether OCCT MFC samples should be built. +* *BUILD_PATCH_DIR* - optionally specifies additional folder containing patched OCCT source files. The patch may contain arbitrary subset of OCCT source files (including CMake scripts, templates, etc.), organized in the same structure of folders as OCCT. - The projects generated by CMake will use files found in the patch folder instead of corresponding files of OCCT. + The projects generated by CMake will use files found in the patch folder instead of the corresponding files of OCCT. -Check variables with "USE_" prefix (USE_FREEIMAGE, USE_GL2PS, USE_TBB, and -USE_OPENCL) if you want to enable use of the corresponding optional 3rd-party +Check variables with USE_ prefix (USE_FREEIMAGE, USE_GL2PS, USE_TBB, and +USE_OPENCL) if you want to enable use of the corresponding optional 3rd-party library. -### 3rd-party configuration (The variables with 3RDPARTY_ prefix) +### 3rd-party configuration (The variables with 3RDPARTY_ prefix) If you have 3rd-party libraries in a non-default location -(e.g., on Windows, binaries downloaded from "http://www.opencascade.org/getocc/download/3rdparty/"), -specify 3RDPARTY_DIR variable that points to the folders of 3rdparty libraries (some or all). -At the next configuration step the 3rd-party libraries will be searched for in 3RDPARTY_DIR directory, and stored in 3RDPARTY_\_DIR variables. +(e.g., on Windows, binaries downloaded from http://www.opencascade.org/getocc/download/3rdparty/") +specify *3RDPARTY_DIR* variable that points to the folders of 3rd-party libraries (some or all). + +At the next configuration step the 3rd-party libraries will be searched for in *3RDPARTY_DIR* directory, and stored in *3RDPARTY_\_DIR* variables. + The procedure expects to find binary and header files of each 3rd-party library in its own sub-directory, separated by sub-directories *bin*, *lib*, and *include*. -Press "Configure" ("c" key for ccmake). +Press **Configure** (**c** key for ccmake). The result of the 3rdparty product search will be recorded in the corresponding variables: -* 3RDPARTY_\_DIR - path to the product directory (with directory name) (e.g., D:/3rdparty/Tcl-8.5.12.0-32) -* 3RDPARTY_\_LIBRARY - path to the .lib libraries (with the library name) (e.g., D:/3rdparty/Tcl-8.5.12.0-32/lib/tcl85.lib). - In non-windows case, this variable is the same as 3RDPARTY_\_DLL. -* 3RDPARTY_\_INCLUDE - path to the include directory that contains the required header file (with "include" name) (e.g., D:/3rdparty/Tcl-8.5.12.0-32/include including tcl.h) -* 3RDPARTY_\_DLL - path to the .dll/.so/.dylib library (with the library name) (e.g., D:/3rdparty/Tcl-8.5.12.0-32/bin/tcl85.dll) +* *3RDPARTY_\_DIR* - path to the product directory (with directory name) (e.g. D:/3rdparty/Tcl-8.5.12.0-32) +* *3RDPARTY_\_LIBRARY* - path to .lib libraries (with the library name) (e.g. D:/3rdparty/Tcl-8.5.12.0-32/lib/tcl85.lib). + In non-windows case, this variable is the same as *3RDPARTY_\_DLL*. +* *3RDPARTY_\_INCLUDE* - path to the include directory that contains the required header file (with "include" name) (e.g., D:/3rdparty/Tcl-8.5.12.0-32/include including tcl.h) +* *3RDPARTY_\_DLL* - path to .dll/.so/.dylib library (with the library name) (e.g., D:/3rdparty/Tcl-8.5.12.0-32/bin/tcl85.dll) The search process is as follows: -1. Common path: 3RDPARTY_DIR -2. Path to particular 3rd-party library: 3RDPARTY_\_DIR +1. Common path: *3RDPARTY_DIR* +2. Path to a particular 3rd-party library: *3RDPARTY_\_DIR* 3. Paths to headers and binaries: - 1. 3RDPARTY_\_INCLUDE - 2. 3RDPARTY_\_LIBRARY - 3. 3RDPARTY_\_DLL + 1. *3RDPARTY_\_INCLUDE* + 2. *3RDPARTY_\_LIBRARY* + 3. *3RDPARTY_\_DLL* -If a variable of any level is not defined (empty or \-NOTFOUND) +If a variable of any level is not defined (empty or \-NOTFOUND ) and the upper level variable is defined, the content of the non-defined variable will be searched for at the next configuration step. If search process in level 3 does not find the required files, it searches in default places also. -**Note**: the names of searched libraries and header files are hardcoded. -Freetype search process tries to find ft2build.h file in 3RDPARTY_FREETYPE INCLUDE dir -and after that adds "3RDPARTY_FREETYPE_INCLUDE /freetype2" path to common includes if it exists. +**Note**: the names of searched libraries and header files are hard-coded. +Freetype search process tries to find *ft2build.h* file in *3RDPARTY_FREETYPE INCLUDE* directory +and after that adds *3RDPARTY_FREETYPE_INCLUDE /freetype2* path to common includes if it exists. -Important: If BUILD_CONFIGURATION variable is changed - at the next configuration -3RDPARTY_ variables will be replaced by the search process result, except for the 3RDPARTY_DIR variable. +Important: If *BUILD_CONFIGURATION* variable is changed, at the next configuration +*3RDPARTY_ variables* will be replaced by the search process result, except for the *3RDPARTY_DIR* variable. -*Note*: CMake will produce an error after the configuration step until all required variables are defined correctly. -If the search result (include path, or library path, or dll path) does not meet your expectations - -you can change 3RDPARTY_\_DIR variable, clear (if they are not empty) -3RDPARTY_\_DLL, 3RDPARTY_\_INCLUDE_DIR and 3RDPARTY_\_LIBRARY variables +*Note* : CMake will produce an error after the configuration step until all required variables are defined correctly. +If the search result (include path, or library path, or dll path) does not meet your expectations, +you can change *3RDPARTY_\_DIR variable*, clear (if they are not empty) +*3RDPARTY_\_DLL, 3RDPARTY_\_INCLUDE_DIR* and 3RDPARTY_\_LIBRARY variables (or clear one of them) and run the configuration process again. -At this time the search will be performed in the new identified directory +At this time the search will be performed in the newly identified directory and the result will be recorded to empty variables (non-empty variables will not be replaced). -For example, (Linux case) 3RDPARTY_FREETYPE_DIR variable +For example, (Linux case) *3RDPARTY_FREETYPE_DIR* variable /PRODUCTS/maintenance/Mandriva2010/freetype-2.3.7 @@ -152,74 +154,81 @@ can be changed to /PRODUCTS/maintenance/Mandriva2010/freetype-2.4.10 -and the related variables: 3RDPARTY_FREETYPE_DLL, 3RDPARTY_FREETYPE_INCLUDE_DIR and 3RDPARTY_FREETYPE_LIBRARY will be cleared. +and the related variables *3RDPARTY_FREETYPE_DLL, 3RDPARTY_FREETYPE_INCLUDE_DIR* and *3RDPARTY_FREETYPE_LIBRARY* will be cleared. @figure{/dev_guides/building/cmake/images/cmake_image005.png} -During configuration process the cleaned variables will be filled with new found values. +During the configuration process the cleaned variables will be filled with new found values. ###The variables with INSTALL_ prefix: -Define in INSTALL_DIR variable the path where will be placed built OCCT files (libraries, executables and headers). -If INSTALL_\ variable is checked - 3rd-party products will be copied to the install directory. +Define in *INSTALL_DIR* variable the path, where the built OCCT files (libraries, executables and headers) will be placed. +If INSTALL_\ variable is checked, 3rd-party products will be copied to the install directory. -#### At the end of the configuration process "configuring done" message will be shown and the generation process can be started. +At the end of the configuration process "configuring done" message will be shown and the generation process can be started. ## OCCT Generation -This will create makefiles or project files for your build system. +This procedure will create makefiles or project files for your build system. ### Windows -Click Generate button and wait until the generation process is finished. -Then the project files will appear in the build folder (e.g., d:/occt/build/win32-vc9-release). +Click **Generate** button and wait until the generation process is finished. +Then the project files will appear in the build folder (e.g. d:/occt/build/win32-vc9-release ). ### Linux -When the configuration is complete, start the generation process by pressing "g". +When the configuration is complete, start the generation process by pressing **g**. @figure{/dev_guides/building/cmake/images/cmake_image006.png} ### Mac OS X -Click Generate button and wait until the generation process is finished. -Then the project files will appear in the build folder (e.g., /Developer/occt/build/XCode). +Click **Generate** button and wait until the generation process is finished. +Then the project files will appear in the build folder (e.g. /Developer/occt/build/XCode ). ## OCCT Building -The install folder contains bin, inc, lib and res folders and a script to run DRAWEXE (draw.bat or draw.sh). -"bin" contains executables, DLL (Windows) style shared libraries and pdb-files in OCCT debug version,. -"lib" contains the import parts of DLL libraries. -"inc" contains header files. -"res" contains all required source files for OCCT. +The install folder contains *bin, inc, lib* and *res* folders and a script to run *DRAWEXE* (*draw.bat* or *draw.sh*). +* **bin** contains executables, DLL (Windows) style shared libraries and pdb-files in OCCT debug version. +* **lib** contains the import parts of DLL libraries. +* **inc** contains header files. +* **res** contains all required source files for OCCT. ### Windows (Visual studio) -Go to the build folder, start the Visual Studio solution (OCCT.sln) and build it by clicking Build - Build Solution. -When the building process finished, build the INSTALL project -(by default the build solution process skips the building of the INSTALL project) to move the above files to INSTALL_DIR. -For this in the solution explorer right click on the INSTALL project and select Project Only - Build Only INSTALL. +Go to the build folder, start the Visual Studio solution *OCCT.sln* and build it by clicking **Build -> Build Solution**. + +When the building process is finished, build the *INSTALL* project (by default the build solution process skips the building of the INSTALL project) to move the above files to *INSTALL_DIR*. + +For this, right-click on the *INSTALL* project and select **Project Only -> Build Only** -> *INSTALL* in the solution explorer. ### Linux (make) -Change directory to binary dir and run make command + +Change directory to the directory with binaries and run *make* command > make -To copy all libraries, executables and chosen 3rd-party libraries run "make" command with "install" argument +To copy all libraries, executables and chosen 3rd-party libraries run *make* command with *install* argument > make install -This command will move the above files to INSTALL_DIR. +This command will move the above files to *INSTALL_DIR*. ### Mac OS X (XCode) -Go to the build folder, start the XCode solution (OCCT.xcodeproj) -and build it by clicking Build -> Build. -Please notice that XCode may have worst responsibility to user actions -due to sources processing at first start. +Go to the build folder, start XCode solution *OCCT.xcodeproj* and build it by clicking **Build -> Build**. +Please notice that XCode may lag because it processes sources at the first start. -When the building process finished, build the INSTALL project -(by default the build solution process skips the building of the INSTALL project) -to move the above files to INSTALL_DIR. -Notice that env.sh (configure PATH and DYLD_LIBRARY_PATH environment variables -as well as Draw Harness extra variables) and draw.sh (to launch DRAWEXE) will be created in target directory. +When the building process has finished, build the *INSTALL* project (by default the build solution process skips the building of *INSTALL* project) to move the above files to *INSTALL_DIR*. +Notice that *env.sh* (which configures *PATH* and *DYLD_LIBRARY_PATH* environment variables +as well as Draw Harness extra variables) and *draw.sh* (to launch *DRAWEXE* ) will be created in the target directory. + +### MFC samples + +On Windows you can also build binaries of MFC samples together with OCCT. For this, activate **BUILD_Samples** check-box in CMake configuration dialog. + +@figure{/dev_guides/building/cmake/images/cmake_image007.png} + +Please take into account that MFC sample binaries will be installed in the same folder as OCCT binaries during building of *INSTALL* project. +To run an MFC sample use *sample.bat* launcher. The command format is: sample.bat (e.g. sample.bat ImportExport). diff --git a/dox/dev_guides/building/cmake/images/cmake_image007.png b/dox/dev_guides/building/cmake/images/cmake_image007.png new file mode 100644 index 0000000000..1f95458f85 Binary files /dev/null and b/dox/dev_guides/building/cmake/images/cmake_image007.png differ diff --git a/dox/dev_guides/building/code_blocks.md b/dox/dev_guides/building/code_blocks.md index 9d6fd506be..be7e8ea2c9 100644 --- a/dox/dev_guides/building/code_blocks.md +++ b/dox/dev_guides/building/code_blocks.md @@ -1,64 +1,70 @@ Building with Code::Blocks on Mac OS X {#occt_dev_guides__building_code_blocks} ====================================== -This file describes steps to build OCCT libraries from complete source package -on Mac OS X with Code::Blocks. +This file describes steps to build OCCT libraries from a complete source package +on Mac OS X with **Code::Blocks**. -If you are building OCCT from bare sources (as in Git repository), or do some +If you build OCCT from bare sources (as in Git repository) or do some changes affecting CDL files, you need to use WOK to re-generate header files and build scripts / projects. See \ref occt_dev_guides__building_wok for instructions. -Before building OCCT, you need to install required third-party libraries; see +Before building OCCT, you need to install the required third-party libraries; see paragraph 1 of \ref occt_dev_guides__building for details. -1. Add paths to the mandatory 3rd-party products (Tcl/Tk and FreeType) in file - custom.sh located in \. For this: +1. Add paths to the mandatory 3rd-party products (**Tcl/Tk** and **FreeType**) in file + *custom.sh* located in \. For this: - 1.1. Add paths to the includes in variable "CSF_OPT_INC"; + 1.1. Add paths to the includes in variable *CSF_OPT_INC*; - 1.2. Add paths to the binary libraries in variable "CSF_OPT_LIB64"; + 1.2. Add paths to the binary libraries in variable *CSF_OPT_LIB64*; All paths should be separated by ":" symbol. -2. Add paths to the optional 3rd-party libraries (TBB, gl2ps and FreeImage) - in the aforementioned environment variables "CSF_OPT_INC" and - "CSF_OPT_LIB64" from file custom.sh. +2. Add paths to the optional 3rd-party libraries (**TBB, gl2ps** and **FreeImage**) + in the aforementioned environment variables *CSF_OPT_INC* and + *CSF_OPT_LIB64* from file *custom.sh*. If you want to build OCCT without the optional libraries perform the following steps: 2.1 Disable unnecessary library in custom.sh by setting the corresponding - variable HAVE_\ to "false". + variable HAVE_\ to *false*. - export HAVE_GL2PS=false +~~~~~ +export HAVE_GL2PS=false +~~~~~ - 2.2 Remove this library from Linker settings in Code::Blocks for each project - that uses it: right click on the required project, choose "Build options", - go to "Linker settings" tab in the opened window , select unnecessary - libraries and click "Delete" button. + 2.2 Remove this library from Linker settings in **Code::Blocks** for each project + that uses it: right click on the required project, choose **Build options**, + go to **Linker settings** tab in the opened window , select unnecessary + libraries and click **Delete** button. 3. Open Terminal application -4. Enter \: +4. Enter \: +~~~~~ cd \ +~~~~~ -5. To start Code::Blocks, run the command /codeblocks.sh +5. To start **Code::Blocks**, run the command /codeblocks.sh -6. To build all toolkits, click "Build->Build workspace" in the menu bar. +6. To build all toolkits, click **Build->Build workspace** in the menu bar. -To start DRAWEXE, which has been built with Code::Blocks on Mac OS X, perform +To start *DRAWEXE*, which has been built with **Code::Blocks** on Mac OS X, perform the following steps: -1. Open Terminal application +1.Open Terminal application -2. Enter \: +2.Enter \: +~~~~~ cd \ +~~~~~ -3. Run script - +3.Run the script +~~~~~ ./draw_cbp.sh cbp [d] - - Option "d" is used if OCCT has been built in Debug mode. +~~~~~ + Option *d* is used if OCCT has been built in **Debug** mode. diff --git a/dox/dev_guides/building/msvc.md b/dox/dev_guides/building/msvc.md index 2f9de9c63f..b11573126b 100644 --- a/dox/dev_guides/building/msvc.md +++ b/dox/dev_guides/building/msvc.md @@ -1,31 +1,31 @@ Building with MS Visual C++ {#occt_dev_guides__building_msvc} =========================== -This file describes steps to build OCCT libraries from complete source -archive on Windows with MS Visual C++. +This file describes steps to build OCCT libraries from a complete source +archive on Windows with MS Visual C++. -If you are building OCCT from bare sources (as in Git repository), or do some +If you build OCCT from bare sources (as in Git repository) or do some changes affecting CDL files, you need to use WOK to re-generate header files and build scripts / projects. See \ref occt_dev_guides__building_wok for instructions. -Before building OCCT, you need to install required third-party libraries; see +Before building OCCT, you need to install the required third-party libraries; see paragraph 1 of \ref occt_dev_guides__building for instructions. -1. Edit file custom.bat to define environment: +1. Edit file *custom.bat* to define the environment: - - VCVER - version of Visual Studio (vc8, vc9, vc10, vc11 or vc12), - and relevant VCVARS path - - ARCH - architecture (32 or 64), affects only PATH variable for execution - - HAVE_* - flags to enable or disable use of optional third-party products + - *VCVER* - version of Visual Studio (vc8, vc9, vc10, vc11 or vc12), + and relevant *VCVARS* path + - *ARCH* - architecture (32 or 64), affects only *PATH* variable for execution + - HAVE_* - flags to enable or disable use of optional third-party products - CSF_OPT_* - paths to search for includes and binaries of all used third-party products -2. Launch msvc.bat to start Visual Studio with all necessary environment +2. Launch *msvc.bat* to start Visual Studio with all necessary environment variables defined. - Note: the MSVC project files are located in folders adm\\msvc\\vc[9-12]. - Binaries are produced in win32 or win64 folders. + Note: the MSVC project files are located in folders adm\\msvc\\vc[9-12]. + Binaries are produced in *win32* or *win64* folders. 3. Build with Visual Studio -To start DRAW, launch draw.bat. +To start DRAW, launch *draw.bat*. diff --git a/dox/dev_guides/building/xcode.md b/dox/dev_guides/building/xcode.md index f60d1ffbfb..b7d3be6d29 100644 --- a/dox/dev_guides/building/xcode.md +++ b/dox/dev_guides/building/xcode.md @@ -1,71 +1,70 @@ Building with Xcode {#occt_dev_guides__building_xcode} =================== -This file describes steps to build OCCT libraries from complete source package -on Mac OS X with Xcode. +This file describes steps to build OCCT libraries from a complete source package +on Mac OS X with **Xcode**. -If you are building OCCT from bare sources (as in Git repository), or do some +If you build OCCT from bare sources (as in Git repository) or do some changes affecting CDL files, you need to use WOK to re-generate header files and build scripts / projects. See \ref occt_dev_guides__building_wok for instructions. -Before building OCCT, you need to install required third-party libraries; see +Before building OCCT, you need to install the required third-party libraries; see paragraph 1 of \ref occt_dev_guides__building for details. -1. Add paths to the mandatory 3rd-party products (Tcl/Tk and FreeType) - in file custom.sh located in \. For this: +1. Add paths to the mandatory 3rd-party products (**Tcl/Tk** and **FreeType**) + in file *custom.sh* located in \ . For this: - 1.1. Add paths to the includes in variable "CSF_OPT_INC"; + 1.1. Add paths to the includes in variable *CSF_OPT_INC*; - 1.2. Add paths to the binary libraries in variable "CSF_OPT_LIB64"; + 1.2. Add paths to the binary libraries in variable *CSF_OPT_LIB64*; All paths should be separated by ":" symbol. -2. Add paths to the optional 3rd-party libraries (TBB, gl2ps and FreeImage) - in the aforementioned environment variables "CSF_OPT_INC" and - "CSF_OPT_LIB64" from file custom.sh. +2. Add paths to the optional 3rd-party libraries (**TBB, gl2ps** and **FreeImage**) + in the aforementioned environment variables *CSF_OPT_INC* and *CSF_OPT_LIB64* from file *custom.sh*. - If you want to build OCCT without the optional libraries perform the - following steps: - - 2.1 Disable unnecessary library in custom.sh by setting the corresponding - variable HAVE_ to "false". + If you want to build OCCT without the optional libraries perform the following steps: + 2.1 Disable unnecessary library in *custom.sh* by setting the corresponding + variable HAVE_ to *false*. +~~~~~ export HAVE_GL2PS=false - +~~~~~ 2.2 Remove this library from Project navigator in Xcode for each project that uses it: choose the required project, right click on the unnecessary - library and select "Delete" button. + library and select **Delete** button. 3. Open Terminal application. -4. Enter \: - +4. Enter \: +~~~~~ cd \ +~~~~~ +5. To start **Xcode**, run command /xcode.sh -5. To start Xcode, run the command /xcode.sh +6. To build a certain toolkit, select it in **Scheme** drop-down list in Xcode + toolbar, press **Product** in the menu and click **Build** button. -6. To build a certain toolkit, select it in "Scheme" drop-down list in Xcode - toolbar, press "Product" in the menu and click "Build" button. - - To build the entire OCCT, create a new empty project (select "File -> - New -> Project -> "Empty project" in the menu. Input the project name, - e.g. "OCCT", click "Next" and "Create" buttons). Drag and drop the "OCCT" - folder in the created "OCCT" project in the Project navigator. Select - "File -> New -> Target -> Aggregate" in the menu. Enter the project name - (e.g. "OCCT") and click "Finish". The "Build Phases" tab will open. + To build the entire OCCT, create a new empty project (select **File -> + New -> Project -> "Empty project** in the menu. Input the project name, + e.g. *OCCT*, click **Next** and **Create** buttons). Drag and drop the *OCCT* + folder in the created *OCCT* project in the Project navigator. Select + **File -> New -> Target -> Aggregate** in the menu. Enter the project name + (e.g. OCCT) and click **Finish**. The **Build Phases** tab will open. Click "+" button to add the necessary toolkits to the target project. - It is possible to select all toolkits by pressing "Command+A" combination. + It is possible to select all toolkits by pressing **Command+A** combination. -To start DRAWEXE, which has been built with Xcode on Mac OS X, perform the following steps: +To start *DRAWEXE*, which has been built with Xcode on Mac OS X, perform the following steps: -1. Open Terminal application - -2. Enter \: +1.Open Terminal application +2.Enter \: +~~~~~ cd \ +~~~~~ -3. Run script - +3.Run the script +~~~~~ ./draw_cbp.sh xcd [d] - - Option "d" is used if OCCT has been built in Debug mode. +~~~~~ + Option *d* is used if OCCT has been built in **Debug** mode. diff --git a/samples/mfc/standard/01_Geometry/CMakeLists.txt b/samples/mfc/standard/01_Geometry/CMakeLists.txt index 8471c071a4..2e948ea160 100644 --- a/samples/mfc/standard/01_Geometry/CMakeLists.txt +++ b/samples/mfc/standard/01_Geometry/CMakeLists.txt @@ -2,7 +2,8 @@ cmake_minimum_required (VERSION 2.6) project (Geometry) -add_definitions(-DWINVER=0x0500) +add_definitions(-DWINVER=0x0501 -DUNICODE -D_UNICODE) +set (CMAKE_MFC_FLAG 2) set (Geometry_SRC_DIR ${MFC_STANDARD_SAMPLES_DIR}/01_Geometry/src) set (Geometry_HEADER_FILES ${Geometry_SRC_DIR}/ChildFrm.h diff --git a/samples/mfc/standard/01_Geometry/adm/win/vc10/Geometry.vcxproj b/samples/mfc/standard/01_Geometry/adm/win/vc10/Geometry.vcxproj index 44211a6209..7788b35a2d 100644 --- a/samples/mfc/standard/01_Geometry/adm/win/vc10/Geometry.vcxproj +++ b/samples/mfc/standard/01_Geometry/adm/win/vc10/Geometry.vcxproj @@ -27,22 +27,22 @@ Application Dynamic - MultiByte + Unicode Application Dynamic - MultiByte + Unicode Application Dynamic - MultiByte + Unicode Application Dynamic - MultiByte + Unicode diff --git a/samples/mfc/standard/01_Geometry/adm/win/vc11/Geometry.vcxproj b/samples/mfc/standard/01_Geometry/adm/win/vc11/Geometry.vcxproj index 3c7a23c49f..0291dc570c 100644 --- a/samples/mfc/standard/01_Geometry/adm/win/vc11/Geometry.vcxproj +++ b/samples/mfc/standard/01_Geometry/adm/win/vc11/Geometry.vcxproj @@ -27,25 +27,25 @@ Application Dynamic - MultiByte + Unicode v110 Application Dynamic - MultiByte + Unicode v110 Application Dynamic - MultiByte + Unicode v110 Application Dynamic - MultiByte + Unicode v110 @@ -97,7 +97,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) + NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -140,7 +140,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) + NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -182,7 +182,7 @@ Disabled ..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) + _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -226,7 +226,7 @@ Disabled ..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) + _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use diff --git a/samples/mfc/standard/01_Geometry/adm/win/vc12/Geometry.vcxproj b/samples/mfc/standard/01_Geometry/adm/win/vc12/Geometry.vcxproj new file mode 100644 index 0000000000..92173c3985 --- /dev/null +++ b/samples/mfc/standard/01_Geometry/adm/win/vc12/Geometry.vcxproj @@ -0,0 +1,618 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {31E8199C-C981-4B7F-9CC2-B8502565B581} + Geometry + MFCProj + + + + Application + Dynamic + Unicode + v120 + + + Application + Dynamic + Unicode + v120 + + + Application + Dynamic + Unicode + v120 + + + Application + Dynamic + Unicode + v120 + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + ../../../../win32\vc12\bin\ + .\win32\obj\ + false + ../../../../win64\vc12\bin\ + .\win64\obj\ + false + ../../../../win32\vc12\bind\ + .\win32\objd\ + true + ../../../../win64\vc12\bind\ + .\win64\objd\ + true + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\win32\obj/Geometry.tlb + + + + + MaxSpeed + OnlyExplicitInline + ..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + Use + stdafx.h + .\win32\obj/Geometry.pch + .\win32\obj/ + .\win32\obj/ + .\win32\obj/ + Level4 + true + Default + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies) + ../../../../win32\vc12\bin/Geometry.exe + true + ..\..\..\..\win32\vc12\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories) + $(IntDir)$(TargetFileName).intermediate.manifest + ../../../../win32\vc12\bin/Geometry.pdb + Windows + MachineX86 + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + X64 + .\win64\obj/Geometry.tlb + + + + + MaxSpeed + OnlyExplicitInline + ..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + Use + stdafx.h + .\win64\obj/Geometry.pch + .\win64\obj/ + .\win64\obj/ + .\win64\obj/ + Level4 + true + Default + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies) + ../../../../win64\vc12\bin/Geometry.exe + true + ..\..\..\..\win64\vc12\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories) + $(IntDir)$(TargetFileName).intermediate.manifest + ../../../../win64\vc12\bin/Geometry.pdb + Windows + MachineX64 + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\win32\objd/Geometry.tlb + + + + + Disabled + ..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + Use + stdafx.h + .\win32\objd/Geometry.pch + .\win32\objd/ + .\win32\objd/ + .\win32\objd/ + true + Level4 + true + EditAndContinue + Default + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies) + ../../../../win32\vc12\bind/Geometry.exe + true + ..\..\..\..\win32\vc12\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories) + $(IntDir)$(TargetFileName).intermediate.manifest + true + ../../../../win32\vc12\bind/Geometry.pdb + Windows + MachineX86 + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + X64 + .\win64\objd/Geometry.tlb + + + + + Disabled + ..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + Use + stdafx.h + .\win64\objd/Geometry.pch + .\win64\objd/ + .\win64\objd/ + .\win64\objd/ + true + Level4 + true + ProgramDatabase + Default + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies) + ../../../..\win64\vc12\bind/Geometry.exe + true + ..\..\..\..\win64\vc12\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories) + $(IntDir)$(TargetFileName).intermediate.manifest + true + ../../../../win64\vc12\bind/Geometry.pdb + Windows + MachineX64 + + + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + true + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + true + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + true + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + true + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + true + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + true + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + true + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + true + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + true + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + true + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + true + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + true + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + true + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + true + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + true + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + true + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Create + true + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Create + true + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + Create + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + Create + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + true + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + true + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + true + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + true + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + true + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + true + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + true + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + true + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + true + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + true + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + true + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + true + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + true + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + true + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + true + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + true + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + + + %(PreprocessorDefinitions) + res;%(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + res;%(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + res;%(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + res;%(AdditionalIncludeDirectories) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {2d6cbbe8-6965-4016-b503-0d715ae26691} + false + + + + + + \ No newline at end of file diff --git a/samples/mfc/standard/01_Geometry/adm/win/vc12/Geometry.vcxproj.filters b/samples/mfc/standard/01_Geometry/adm/win/vc12/Geometry.vcxproj.filters new file mode 100644 index 0000000000..812b3b1160 --- /dev/null +++ b/samples/mfc/standard/01_Geometry/adm/win/vc12/Geometry.vcxproj.filters @@ -0,0 +1,145 @@ + + + + + {1697fc5e-645f-497f-b0c8-368b443f127a} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + {de79fa58-5f9d-4222-b105-fe4f6d9091e5} + + + {189e159b-f494-4b64-93f1-90dbf154e82d} + h;hpp;hxx;hm;inl + + + {b576cf30-aabd-409d-be0a-47b5842f86a9} + ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files\ISession2d + + + Source Files\ISession2d + + + Source Files\ISession2d + + + Source Files\ISession2d + + + Source Files\ISession2d + + + Source Files\ISession2d + + + Source Files\ISession2d + + + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Resource Files + + + Resource Files + + + \ No newline at end of file diff --git a/samples/mfc/standard/01_Geometry/adm/win/vc8/Geometry.vcproj b/samples/mfc/standard/01_Geometry/adm/win/vc8/Geometry.vcproj index 9cec6e1520..12e712a256 100644 --- a/samples/mfc/standard/01_Geometry/adm/win/vc8/Geometry.vcproj +++ b/samples/mfc/standard/01_Geometry/adm/win/vc8/Geometry.vcproj @@ -26,7 +26,7 @@ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="2" ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" + CharacterSet="1" > Fit3DViews(Coef); @@ -91,7 +88,7 @@ void GeomSources::PostProcess(CGeometryDoc* aDoc, CString s; if (! s.LoadString( anID )) - AfxMessageBox("Error Loading String: "); + AfxMessageBox (L"Error Loading String: "); CString Title = s.Left( s.Find( '\n' )); @@ -234,7 +231,7 @@ Standard_Real result = A.DotCross(B,C); \n\ Message+= " result = "; Message+= Message2; - PostProcess(aDoc,ID_BUTTON_Test_1,TheDisplayType,Message.ToCString()); + PostProcess(aDoc,ID_BUTTON_Test_1,TheDisplayType,Message); } // Function name : GeomSources::gpTest2 @@ -257,7 +254,7 @@ gp_Pnt P1(1,2,3); \n\ AddSeparator(aDoc,Message); //-------------------------------------------------------------- DisplayPoint(aDoc,P1,"P1 (1,2,3)",false,0.5); - PostProcess(aDoc,ID_BUTTON_Test_2,TheDisplayType,Message.ToCString(),1.0); + PostProcess(aDoc,ID_BUTTON_Test_2,TheDisplayType,Message,1.0); } @@ -283,7 +280,7 @@ gp_Pnt P2(A); \n\ AddSeparator(aDoc,Message); //-------------------------------------------------------------- DisplayPoint(aDoc,P2,"P2 (1,2,3)",false,0.5); - PostProcess(aDoc,ID_BUTTON_Test_3,TheDisplayType,Message.ToCString(),1.0 /*0.02*/); + PostProcess(aDoc,ID_BUTTON_Test_3,TheDisplayType,Message,1.0 /*0.02*/); } @@ -327,7 +324,7 @@ Standard_Real TheZ = P3.Z(); \n\ Message4 = TheZ; Message += Message4; - PostProcess(aDoc,ID_BUTTON_Test_4,TheDisplayType,Message.ToCString(),1.0 /*0.02*/); + PostProcess(aDoc,ID_BUTTON_Test_4,TheDisplayType,Message,1.0 /*0.02*/); } @@ -377,7 +374,7 @@ PB.BaryCenter(alpha,P2,beta); \n\ Message += " , "; Message += Message4; Message += " ); "; - PostProcess(aDoc,ID_BUTTON_Test_5,TheDisplayType,Message.ToCString()); + PostProcess(aDoc,ID_BUTTON_Test_5,TheDisplayType,Message); } @@ -503,7 +500,7 @@ if (PE.IsSpace()) { /*... */ } \n\ else Message += "False\n"; - PostProcess(aDoc,ID_BUTTON_Test_6,TheDisplayType,Message.ToCString()); + PostProcess(aDoc,ID_BUTTON_Test_6,TheDisplayType,Message); } // Function name : GeomSources::gpTest7 @@ -564,7 +561,7 @@ C->D1(param,P,V); \n\ DisplayPoint(aDoc,P,"P",false,0.5); - PostProcess(aDoc,ID_BUTTON_Test_7,TheDisplayType,Message.ToCString()); + PostProcess(aDoc,ID_BUTTON_Test_7,TheDisplayType,Message); } // Function name : GeomSources::gpTest8 @@ -614,7 +611,7 @@ CLP.Tangent(D); \n\ Message += Message2; Message += " , "; Message += Message3; Message += " ); \n"; - PostProcess(aDoc,ID_BUTTON_Test_8,TheDisplayType,Message.ToCString()); + PostProcess(aDoc,ID_BUTTON_Test_8,TheDisplayType,Message); } // Function name : GeomSources::gpTest9 @@ -682,7 +679,7 @@ if (AP.IsDone()){C->D0(AP.Parameter(),P2);} \n\ Message += " P2 ( "; Message += Message4; Message += " , "; Message += Message5; Message += " ); \n"; - PostProcess(aDoc,ID_BUTTON_Test_9,TheDisplayType,Message.ToCString()); + PostProcess(aDoc,ID_BUTTON_Test_9,TheDisplayType,Message); } // Function name : GeomSources::gpTest10 @@ -774,7 +771,7 @@ Standard_Real Abscissa = UA.Abscissa(); \n\ Message += Message3; Message += " \n"; - PostProcess(aDoc,ID_BUTTON_Test_10,TheDisplayType,Message.ToCString()); + PostProcess(aDoc,ID_BUTTON_Test_10,TheDisplayType,Message); } // Function name : GeomSources::gpTest11 @@ -818,7 +815,7 @@ gp_Pnt P = SP->Value(u,v); \n\ Message += Message3; Message += " ); \n"; - PostProcess(aDoc,ID_BUTTON_Test_11,TheDisplayType,Message.ToCString()); + PostProcess(aDoc,ID_BUTTON_Test_11,TheDisplayType,Message); } // Function name : GeomSources::gpTest12 @@ -898,7 +895,7 @@ if(NbResults>0){ \n\ } } - PostProcess(aDoc,ID_BUTTON_Test_12,TheDisplayType,Message.ToCString()); + PostProcess(aDoc,ID_BUTTON_Test_12,TheDisplayType,Message); } // Function name : GeomSources::gpTest13 @@ -982,7 +979,7 @@ if(NbResults>0){ \n\ DisplayPoint(aDoc,Q,aString.ToCString(),false,0.5); } } - PostProcess(aDoc,ID_BUTTON_Test_13,TheDisplayType,Message.ToCString()); + PostProcess(aDoc,ID_BUTTON_Test_13,TheDisplayType,Message); } // Function name : GeomSources::gpTest14 @@ -1063,7 +1060,7 @@ if (ICQ.IsDone()){ \n\ } } - PostProcess(aDoc,ID_BUTTON_Test_14,TheDisplayType,Message.ToCString()); + PostProcess(aDoc,ID_BUTTON_Test_14,TheDisplayType,Message); } // Function name : GeomSources::gpTest15 @@ -1100,7 +1097,7 @@ P1Copy.Transform(TRSF); \n\ DisplayPoint(aDoc,P1,"P1",false,0.5); DisplayPoint(aDoc,P2,"P2",false,0.5); - PostProcess(aDoc,ID_BUTTON_Test_15,TheDisplayType,Message.ToCString()); + PostProcess(aDoc,ID_BUTTON_Test_15,TheDisplayType,Message); } // Function name : GeomSources::gpTest16 @@ -1157,7 +1154,7 @@ V1.IsOpposite(V2,Precision::Angular()); \n\ Message += "result = "; if (result) Message += "True \n"; else Message += "False \n"; - PostProcess(aDoc,ID_BUTTON_Test_16,TheDisplayType,Message.ToCString()); + PostProcess(aDoc,ID_BUTTON_Test_16,TheDisplayType,Message); } // Function name : GeomSources::gpTest17 @@ -1204,7 +1201,7 @@ Standard_Real ang = D1.Angle(D2); \n\ Message += Message3; Message += " degree \n"; - PostProcess(aDoc,ID_BUTTON_Test_17,TheDisplayType,Message.ToCString()); + PostProcess(aDoc,ID_BUTTON_Test_17,TheDisplayType,Message); } // Function name : GeomSources::gpTest18 @@ -1251,7 +1248,7 @@ gp_Parab2d Para(A,6); \n\ Message += " The entity A of type gp_Ax22d is not displayable \n "; Message += " The entity D of type gp_Dir2d is displayed as a vector \n ( mean with a length != 1 ) \n "; - PostProcess(aDoc,ID_BUTTON_Test_18,TheDisplayType,Message.ToCString()); + PostProcess(aDoc,ID_BUTTON_Test_18,TheDisplayType,Message); } // Function name : GeomSources::gpTest19 @@ -1345,7 +1342,7 @@ gp_Dir A2YDirection = A2.YDirection() ; \n\ else Message += "False = Left Handed \n"; - PostProcess(aDoc,ID_BUTTON_Test_19,TheDisplayType,Message.ToCString()); + PostProcess(aDoc,ID_BUTTON_Test_19,TheDisplayType,Message); } // Function name : GeomSources::gpTest20 @@ -1459,7 +1456,7 @@ Handle(Geom2d_BSplineCurve) SPL3 = anInterpolation2.Curve(); \n\ aDoc->GetISessionContext()->Display(aCurve, Standard_False); } else - MessageBox(0,"SPL1.IsNull()","CasCade Error",MB_ICONERROR); + MessageBoxW (AfxGetApp()->m_pMainWnd->m_hWnd, L"SPL1.IsNull()", L"CasCade Error", MB_ICONERROR); if (!SPL2.IsNull()) { @@ -1468,7 +1465,7 @@ Handle(Geom2d_BSplineCurve) SPL3 = anInterpolation2.Curve(); \n\ aDoc->GetISessionContext()->Display(aCurve2, Standard_False); } else - MessageBox(0,"SPL2.IsNull()","CasCade Error",MB_ICONERROR); + MessageBoxW (AfxGetApp()->m_pMainWnd->m_hWnd, L"SPL2.IsNull()", L"CasCade Error", MB_ICONERROR); if (!SPL3.IsNull()) { @@ -1477,13 +1474,13 @@ Handle(Geom2d_BSplineCurve) SPL3 = anInterpolation2.Curve(); \n\ aDoc->GetISessionContext()->Display(aCurve2, Standard_False); } else - MessageBox(0,"SPL3.IsNull()","CasCade Error",MB_ICONERROR); + MessageBoxW (AfxGetApp()->m_pMainWnd->m_hWnd, L"SPL3.IsNull()", L"CasCade Error", MB_ICONERROR); Message += " SPL1 is Red \n"; Message += " SPL2 is Blue \n"; Message += " SPL3 is Yellow \n"; - PostProcess(aDoc,ID_BUTTON_Test_20,TheDisplayType,Message.ToCString()); + PostProcess(aDoc,ID_BUTTON_Test_20,TheDisplayType,Message); } void GeomSources::gpTest21(CGeometryDoc* aDoc) @@ -1521,7 +1518,7 @@ Handle(Geom2d_BSplineCurve) C = B.Curve(); \n\ DisplayCurveAndCurvature(aDoc,C,6,Standard_False); - PostProcess(aDoc,ID_BUTTON_Test_21,TheDisplayType,Message.ToCString()); + PostProcess(aDoc,ID_BUTTON_Test_21,TheDisplayType,Message); } void GeomSources::gpTest22(CGeometryDoc* aDoc) @@ -1565,7 +1562,7 @@ Handle(Geom2d_BSplineCurve) C = MV.Curve(); \n\ DisplayPoint(aDoc,P1,"P1",false,0.5); DisplayPoint(aDoc,P2,"P2",false,0.5); - PostProcess(aDoc,ID_BUTTON_Test_22,TheDisplayType,Message.ToCString()); + PostProcess(aDoc,ID_BUTTON_Test_22,TheDisplayType,Message); } // Function name : GeomSources::gpTest23 @@ -1617,7 +1614,7 @@ Handle(Geom2d_BSplineCurve) SPL = \n\ Handle(ISession2D_Curve) aCurve2 = new ISession2D_Curve(SPL); aDoc->GetISessionContext()->Display(aCurve2, Standard_False); - PostProcess(aDoc,ID_BUTTON_Test_23,TheDisplayType,Message.ToCString()); + PostProcess(aDoc,ID_BUTTON_Test_23,TheDisplayType,Message); } // Function name : GeomSources::gpTest24 @@ -1720,7 +1717,7 @@ gp_Ax2d C2DCircleXAxis = C2DCircle->XAxis(); \n\ Handle(ISession_Direction) aC2DCircleXAxisDirection = new ISession_Direction(C2DCircleXAxis.Location(),C2DCircleXAxis.Direction(),5.2); aDoc->GetISessionContext()->Display(aC2DCircleXAxisDirection, Standard_False); - PostProcess(aDoc,ID_BUTTON_Test_24,TheDisplayType,Message.ToCString()); + PostProcess(aDoc,ID_BUTTON_Test_24,TheDisplayType,Message); } // Function name : GeomSources::gpTest25 @@ -1825,7 +1822,7 @@ for (Standard_Integer k = 1;k<=NbPoints;k++) \n\ Message += " )\n"; } - PostProcess(aDoc,ID_BUTTON_Test_25,TheDisplayType,Message.ToCString()); + PostProcess(aDoc,ID_BUTTON_Test_25,TheDisplayType,Message); } // Function name : GeomSources::gpTest26 @@ -1933,7 +1930,7 @@ for(int i=1;i <= NbExtrema; i++) { \n\ aDoc->GetISessionContext()->Display(aCurve, Standard_False); } else - MessageBox(0,"SPL1.IsNull()","CasCade Error",MB_ICONERROR); + MessageBoxW (AfxGetApp()->m_pMainWnd->m_hWnd, L"SPL1.IsNull()", L"CasCade Error", MB_ICONERROR); Handle(ISession2D_Curve) aCurve1 = new ISession2D_Curve(TC1); aCurve1->SetColorIndex(6); @@ -1971,7 +1968,7 @@ for(int i=1;i <= NbExtrema; i++) { \n\ Message+= SPL1shortestdistance; Message += "\n"; - PostProcess(aDoc,ID_BUTTON_Test_26,TheDisplayType,Message.ToCString()); + PostProcess(aDoc,ID_BUTTON_Test_26,TheDisplayType,Message); } // Function name : GeomSources::gpTest27 @@ -2044,7 +2041,7 @@ Standard_Boolean result2 = OC2->IsCN(2); \n\ else Message += " result2 = False \n"; - PostProcess(aDoc,ID_BUTTON_Test_27,TheDisplayType,Message.ToCString()); + PostProcess(aDoc,ID_BUTTON_Test_27,TheDisplayType,Message); } // Function name : GeomSources::gpTest28 @@ -2080,7 +2077,7 @@ gp_Lin2d L = gce_MakeLin2d(P1,P2); \n\ Handle(ISession2D_Curve) aCurve = new ISession2D_Curve(aLine); aDoc->GetISessionContext()->Display(aCurve, Standard_False); - PostProcess(aDoc,ID_BUTTON_Test_28,TheDisplayType,Message.ToCString()); + PostProcess(aDoc,ID_BUTTON_Test_28,TheDisplayType,Message); } // Function name : GeomSources::gpTest29 @@ -2130,7 +2127,7 @@ if (B.IsDone()) \n\ if (B.IsDone()) Message += " \n B Is Done "; else Message += " \n B Is not Done "; - PostProcess(aDoc,ID_BUTTON_Test_29,TheDisplayType,Message.ToCString()); + PostProcess(aDoc,ID_BUTTON_Test_29,TheDisplayType,Message); } // Function name : GeomSources::gpTest30 @@ -2213,7 +2210,7 @@ if (LT.IsDone()) \n\ TCollection_AsciiString Message2 (NbSol); Message += "NbSol = "; Message += Message2 ; Message += "\n"; - PostProcess(aDoc,ID_BUTTON_Test_30,TheDisplayType,Message.ToCString()); + PostProcess(aDoc,ID_BUTTON_Test_30,TheDisplayType,Message); } // Function name : GeomSources::gpTest31 @@ -2328,7 +2325,7 @@ if (TR.IsDone()) \n } Message += "C is Red \n"; Message += "L is Blue \n"; - PostProcess(aDoc,ID_BUTTON_Test_31,TheDisplayType,Message.ToCString()); + PostProcess(aDoc,ID_BUTTON_Test_31,TheDisplayType,Message); } // Function name : GeomSources::gpTest32 @@ -2370,7 +2367,7 @@ Handle(Geom2d_TrimmedCurve) arc = GCE2d_MakeArcOfEllipse(EE,0.0,PI/4); \n\ TCollection_AsciiString Message2 (M_PI); Message += " PI = ";Message+= Message2; - PostProcess(aDoc,ID_BUTTON_Test_32,TheDisplayType,Message.ToCString()); + PostProcess(aDoc,ID_BUTTON_Test_32,TheDisplayType,Message); } // Function name : GeomSources::gpTest33 @@ -2412,7 +2409,7 @@ void GeomSources::gpTest33(CGeometryDoc* aDoc) if (anInterpolation.IsDone()) SPL2 = anInterpolation.Curve(); else - MessageBox(0,"The Interpolation is Not done","CasCade Warning",MB_ICONWARNING); + MessageBoxW (AfxGetApp()->m_pMainWnd->m_hWnd, L"The Interpolation is Not done", L"CasCade Warning", MB_ICONWARNING); //============================================================== TCollection_AsciiString Message (" \ @@ -2482,7 +2479,7 @@ else aDoc->GetAISContext()->Display(aCurve2, Standard_False); } - PostProcess(aDoc,ID_BUTTON_Test_33,TheDisplayType,Message.ToCString()); + PostProcess(aDoc,ID_BUTTON_Test_33,TheDisplayType,Message); } // Function name : GeomSources::gpTest34 @@ -2577,7 +2574,7 @@ if (PE.IsSpace()) { /* ... */ } \n\ else Message += "False\n"; - PostProcess(aDoc,ID_BUTTON_Test_34,TheDisplayType,Message.ToCString()); + PostProcess(aDoc,ID_BUTTON_Test_34,TheDisplayType,Message); } // Function name : GeomSources::gpTest35 @@ -2696,7 +2693,7 @@ if(CS.IsDone()) \n\ Message += "NbSeg = "; Message += Message2 ; Message += "\n"; Message += "NbPoints = "; Message += Message3 ; Message += "\n"; - PostProcess(aDoc,ID_BUTTON_Test_35,TheDisplayType,Message.ToCString()); + PostProcess(aDoc,ID_BUTTON_Test_35,TheDisplayType,Message); } //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ @@ -2812,7 +2809,7 @@ Standard_Real value = matrix.Determinant(); Message += " aScaledEntityTypeName = ";Message+= Message8; Message += "\n"; Message += " aTranslatedEntityTypeName = ";Message+= Message9; Message += "\n"; - PostProcess(aDoc,ID_BUTTON_Test_36,TheDisplayType,Message.ToCString()); + PostProcess(aDoc,ID_BUTTON_Test_36,TheDisplayType,Message); } // Function name : GeomSources::gpTest37 @@ -2892,7 +2889,7 @@ if (PE.IsSpace()) { /* ... */ } \n\ Message += " PE.IsSpace() = "; if (PE.IsSpace() ) Message += "True \n"; else Message += "False\n"; - PostProcess(aDoc,ID_BUTTON_Test_37,TheDisplayType,Message.ToCString()); + PostProcess(aDoc,ID_BUTTON_Test_37,TheDisplayType,Message); } void GeomSources::gpTest38(CGeometryDoc* aDoc) @@ -2981,7 +2978,7 @@ Handle(Geom_BSplineSurface) aBSplineSurface3 = aGeomFill3.Surface(); Message += "aBSplineSurface2 is Salmon; ( GeomFill_CoonsStyle ) \n"; Message += "aBSplineSurface3 is Hot pink; ( GeomFill_CurvedStyle ) \n"; - PostProcess(aDoc,ID_BUTTON_Test_38,TheDisplayType,Message.ToCString()); + PostProcess(aDoc,ID_BUTTON_Test_38,TheDisplayType,Message); } void GeomSources::gpTest39(CGeometryDoc* aDoc) { @@ -3077,7 +3074,7 @@ Handle(Geom_BSplineSurface) aBSplineSurface = aConstrainedFilling.Surface(); Message += "aBSplineSurface is Yellow; \n"; - PostProcess(aDoc,ID_BUTTON_Test_39,TheDisplayType,Message.ToCString()); + PostProcess(aDoc,ID_BUTTON_Test_39,TheDisplayType,Message); } void GeomSources::gpTest40(CGeometryDoc* aDoc) @@ -3200,7 +3197,7 @@ if (!aSurface3.IsNull()) \n\ Message += " aSurfaceEntityTypeName2 = ";Message+= Message3; Message += "\n"; Message += " aSurfaceEntityTypeName3 = ";Message+= Message4; Message += "\n"; - PostProcess(aDoc,ID_BUTTON_Test_40,TheDisplayType,Message.ToCString()); + PostProcess(aDoc,ID_BUTTON_Test_40,TheDisplayType,Message); } void GeomSources::gpTest41(CGeometryDoc* aDoc) @@ -3274,7 +3271,7 @@ Handle(Geom_BSplineSurface) anotherBSplineSurface = \n\ Message += "aBSplineSurface is Yellow; \n"; Message += "anotherBSplineSurface is Hot Pink; \n"; - PostProcess(aDoc,ID_BUTTON_Test_41,TheDisplayType,Message.ToCString()); + PostProcess(aDoc,ID_BUTTON_Test_41,TheDisplayType,Message); } @@ -3419,7 +3416,7 @@ if (BB.IsDone()){ \n\ Message += "BZ4 is Brown; \n"; Message += "BSPLSURF is Hot Pink; \n"; - PostProcess(aDoc,ID_BUTTON_Test_42,TheDisplayType,Message.ToCString()); + PostProcess(aDoc,ID_BUTTON_Test_42,TheDisplayType,Message); } void GeomSources::gpTest43(CGeometryDoc* aDoc) @@ -3494,7 +3491,7 @@ Handle(Geom_OffsetSurface) GOS2 = new Geom_OffsetSurface(aGeomSurface, offset); Message += "aGeomSurface is Blue; \n"; Message += "GOS are Green; \n"; - PostProcess(aDoc,ID_BUTTON_Test_43,TheDisplayType,Message.ToCString()); + PostProcess(aDoc,ID_BUTTON_Test_43,TheDisplayType,Message); } void GeomSources::gpTest44(CGeometryDoc* aDoc) @@ -3572,7 +3569,7 @@ if (!SOLE.IsNull()) \n\ Message += " SOLEEntityTypeName = ";Message+= Message2; Message += "\n"; - PostProcess(aDoc,ID_BUTTON_Test_44,TheDisplayType,Message.ToCString()); + PostProcess(aDoc,ID_BUTTON_Test_44,TheDisplayType,Message); } void GeomSources::gpTest45(CGeometryDoc* aDoc) @@ -3626,7 +3623,7 @@ if (!SOR.IsNull()) \n\ TCollection_AsciiString Message2 (SOREntityTypeName); Message += " SOREntityTypeName = ";Message+= Message2; Message += "\n"; - PostProcess(aDoc,ID_BUTTON_Test_45,TheDisplayType,Message.ToCString()); + PostProcess(aDoc,ID_BUTTON_Test_45,TheDisplayType,Message); } void GeomSources::gpTest46(CGeometryDoc* aDoc) @@ -3715,7 +3712,7 @@ GeomLib::ExtendSurfByLength (aTranslatedGeomSurface, \n\ Message += "SPL1 is Red; \n"; Message += "SPL2 is Green; \n"; - PostProcess(aDoc,ID_BUTTON_Test_46,TheDisplayType,Message.ToCString()); + PostProcess(aDoc,ID_BUTTON_Test_46,TheDisplayType,Message); } void GeomSources::gpTest47(CGeometryDoc* aDoc) @@ -3831,7 +3828,7 @@ ESS.NearestPoints(P1,P2); \n\ DisplayPoint(aDoc,P1,Standard_CString("P1")); DisplayPoint(aDoc,P2,Standard_CString("P2")); - PostProcess(aDoc,ID_BUTTON_Test_47,TheDisplayType,Message.ToCString()); + PostProcess(aDoc,ID_BUTTON_Test_47,TheDisplayType,Message); } void GeomSources::gpTest48(CGeometryDoc* aDoc) @@ -3964,7 +3961,7 @@ aSPL2Box.Get( aSPL2Xmin, aSPL2Ymin, aSPL2Xmax,aSPL2Ymax); \n\ DisplayCurve(aDoc,GCE2d_MakeSegment(gp_Pnt2d(aSPL2Xmin,aSPL2Ymin),gp_Pnt2d(aSPL2Xmin,aSPL2Ymax)) ,4); // Xmin,Y DisplayCurve(aDoc,GCE2d_MakeSegment(gp_Pnt2d(aSPL2Xmax,aSPL2Ymin),gp_Pnt2d(aSPL2Xmax,aSPL2Ymax)) ,4); // Xmax,Y - PostProcess(aDoc,ID_BUTTON_Test_48,TheDisplayType,Message.ToCString()); + PostProcess(aDoc,ID_BUTTON_Test_48,TheDisplayType,Message); } @@ -4043,7 +4040,7 @@ aBox.Get( aXmin, aYmin,aZmin, aXmax,aYmax,aZmax); \n\ DisplayCurve(aDoc,GC_MakeSegment(gp_Pnt(aXmax,aYmax,aZmin), gp_Pnt(aXmax,aYmax,aZmax)) ,Quantity_NOC_RED); // Xmax,Ymax,Z - PostProcess(aDoc,ID_BUTTON_Test_49,TheDisplayType,Message.ToCString()); + PostProcess(aDoc,ID_BUTTON_Test_49,TheDisplayType,Message); } void GeomSources::gpTest50(CGeometryDoc* aDoc) @@ -4150,5 +4147,5 @@ aBox.Get( aXmin, aYmin,aZmin, aXmax,aYmax,aZmax); \n\ DisplayCurve(aDoc,GC_MakeSegment(gp_Pnt(aXmax,aYmax,aZmin), gp_Pnt(aXmax,aYmax,aZmax)) ,Quantity_NOC_RED); // Xmax,Ymax,Z - PostProcess(aDoc,ID_BUTTON_Test_50,TheDisplayType,Message.ToCString()); + PostProcess(aDoc,ID_BUTTON_Test_50,TheDisplayType,Message); } diff --git a/samples/mfc/standard/01_Geometry/src/GeomSources.h b/samples/mfc/standard/01_Geometry/src/GeomSources.h index cd32e2837b..d9237c26c1 100755 --- a/samples/mfc/standard/01_Geometry/src/GeomSources.h +++ b/samples/mfc/standard/01_Geometry/src/GeomSources.h @@ -77,7 +77,8 @@ private: a2DNo3D , // 0 1 0 a2D3D }; // 1 1 1 static void PreProcess (CGeometryDoc* aDoc,DisplayType aDisplayType); - static void PostProcess(CGeometryDoc* aDoc,UINT anID,DisplayType aDisplayType,const char* aString="",Quantity_Coefficient Coef = -1/*double zoom =-1*/); + static void PostProcess(CGeometryDoc* aDoc,UINT anID,DisplayType aDisplayType, + const TCollection_AsciiString& aString,Quantity_Coefficient Coef = -1); static void DisplayPoint(CGeometryDoc* aDoc, const gp_Pnt2d& aPoint, const char* aText, diff --git a/samples/mfc/standard/01_Geometry/src/GeometryApp.cpp b/samples/mfc/standard/01_Geometry/src/GeometryApp.cpp index a59c263e8b..70d75ceb3e 100755 --- a/samples/mfc/standard/01_Geometry/src/GeometryApp.cpp +++ b/samples/mfc/standard/01_Geometry/src/GeometryApp.cpp @@ -18,7 +18,7 @@ CGeometryApp::CGeometryApp() : OCC_App() { SampleName = "Geometry"; //for about dialog - SetSamplePath ("..\\..\\01_Geometry"); + SetSamplePath (L"..\\..\\01_Geometry"); } CGeometryApp::~CGeometryApp() diff --git a/samples/mfc/standard/01_Geometry/src/GeometryDoc.cpp b/samples/mfc/standard/01_Geometry/src/GeometryDoc.cpp index 0a70fb4aca..125ed6c1fc 100755 --- a/samples/mfc/standard/01_Geometry/src/GeometryDoc.cpp +++ b/samples/mfc/standard/01_Geometry/src/GeometryDoc.cpp @@ -1026,15 +1026,11 @@ void CGeometryDoc::OnCreateSol() { // TODO: Add your command handler code here // Creation d'un sol - CFileDialog dlg(TRUE, - NULL, - NULL, - OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT, - "Points Files (*.dat)|*.dat; |All Files (*.*)|*.*||", - NULL ); + CFileDialog dlg (TRUE, NULL, NULL, OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT, + L"Points Files (*.dat)|*.dat; |All Files (*.*)|*.*||", NULL); CString initdir(((OCC_App*) AfxGetApp())->GetInitDataDir()); - initdir += "\\Data\\SurfaceFromPoints"; + initdir += L"\\Data\\SurfaceFromPoints"; dlg.m_ofn.lpstrInitialDir = initdir; @@ -1045,8 +1041,9 @@ void CGeometryDoc::OnCreateSol() filebuf fic; istream in(&fic); - if (!fic.open((Standard_CString)(LPCTSTR)filename,ios::in)) - MessageBox(AfxGetApp()->m_pMainWnd->m_hWnd,"Error : Unable to open file","CasCade Error",MB_ICONERROR); + if (!fic.open (filename, ios::in)) + MessageBoxW (AfxGetApp()->m_pMainWnd->m_hWnd, L"Error : Unable to open file", L"CasCade Error", MB_ICONERROR); + TColgp_SequenceOfXYZ seqOfXYZ; gp_XYZ pntXYZ; Standard_Integer nbPnt=0; @@ -1079,13 +1076,13 @@ void CGeometryDoc::OnCreateSol() Handle(Geom_BSplineSurface) GeomSol = sol.Surface(); TopoDS_Face aface = BRepBuilderAPI_MakeFace(GeomSol, Precision::Confusion()); if (!BRepAlgo::IsValid(aface)) - MessageBox(AfxGetApp()->m_pMainWnd->m_hWnd,"Error : The plate surface is not valid!","CasCade Error",MB_ICONERROR); + MessageBoxW (AfxGetApp()->m_pMainWnd->m_hWnd, L"Error : The plate surface is not valid!", L"CasCade Error", MB_ICONERROR); Handle_AIS_Shape anAISShape=new AIS_Shape(aface); myAISContext->Display(anAISShape, Standard_False); Fit(); } else - MessageBox(AfxGetApp()->m_pMainWnd->m_hWnd,"Error : Computation has failed","CasCade Error",MB_ICONERROR); + MessageBoxW (AfxGetApp()->m_pMainWnd->m_hWnd, L"Error : Computation has failed", L"CasCade Error", MB_ICONERROR); } } @@ -1118,18 +1115,25 @@ static Standard_Boolean fixParam(Standard_Real& theParam) void CGeometryDoc::OnSimplify() { CString initfile(((OCC_App*) AfxGetApp())->GetInitDataDir()); - initfile += "\\..\\..\\Data\\"; - initfile += "shell1.brep"; + initfile += L"\\..\\..\\Data\\"; + initfile += L"shell1.brep"; - TCollection_AsciiString Path((Standard_CString)(LPCTSTR)initfile); + std::filebuf aFileBuf; + std::istream aStream (&aFileBuf); + if (!aFileBuf.open (initfile, ios::in)) + { + initfile += L" was not found. The sample can not be shown."; + myCResultDialog.SetText (initfile); + return; + } TopoDS_Shape aShape; BRep_Builder aBld; - Standard_Boolean isRead = BRepTools::Read (aShape, Path.ToCString(), aBld); - if (!isRead) + BRepTools::Read (aShape, aStream, aBld); + if (aShape.IsNull()) { - Path += " was not found. The sample can not be shown."; - myCResultDialog.SetText(Path.ToCString()); + initfile += L" is invalid file. The sample can not be shown."; + myCResultDialog.SetText(initfile); return; } myAISContext->SetDisplayMode(AIS_Shaded); diff --git a/samples/mfc/standard/02_Modeling/CMakeLists.txt b/samples/mfc/standard/02_Modeling/CMakeLists.txt index a054777166..10cbb6483b 100644 --- a/samples/mfc/standard/02_Modeling/CMakeLists.txt +++ b/samples/mfc/standard/02_Modeling/CMakeLists.txt @@ -2,7 +2,8 @@ cmake_minimum_required (VERSION 2.6) project (Modeling) -add_definitions(-DWINVER=0x0500) +add_definitions(-DWINVER=0x0501 -DUNICODE -D_UNICODE) +set (CMAKE_MFC_FLAG 2) set (Modeling_SRC_DIR ${MFC_STANDARD_SAMPLES_DIR}/02_Modeling/src) set (Modeling_HEADER_FILES ${Modeling_SRC_DIR}/ISession_Direction.h diff --git a/samples/mfc/standard/02_Modeling/adm/win/vc10/Modeling.vcxproj b/samples/mfc/standard/02_Modeling/adm/win/vc10/Modeling.vcxproj index 06c2279997..7a2be6156b 100644 --- a/samples/mfc/standard/02_Modeling/adm/win/vc10/Modeling.vcxproj +++ b/samples/mfc/standard/02_Modeling/adm/win/vc10/Modeling.vcxproj @@ -27,22 +27,22 @@ Application Dynamic - MultiByte + Unicode Application Dynamic - MultiByte + Unicode Application Dynamic - MultiByte + Unicode Application Dynamic - MultiByte + Unicode diff --git a/samples/mfc/standard/02_Modeling/adm/win/vc11/Modeling.vcxproj b/samples/mfc/standard/02_Modeling/adm/win/vc11/Modeling.vcxproj index 851e0cba64..feb759129a 100644 --- a/samples/mfc/standard/02_Modeling/adm/win/vc11/Modeling.vcxproj +++ b/samples/mfc/standard/02_Modeling/adm/win/vc11/Modeling.vcxproj @@ -27,25 +27,25 @@ Application Dynamic - MultiByte + Unicode v110 Application Dynamic - MultiByte + Unicode v110 Application Dynamic - MultiByte + Unicode v110 Application Dynamic - MultiByte + Unicode v110 @@ -96,7 +96,7 @@ Disabled ..\..\..\..\Common;.;..\..\..\src;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) + _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -138,7 +138,7 @@ Disabled ..\..\..\..\Common;.;..\..\..\src;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) + _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -181,7 +181,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\..\Common;.;..\..\..\src;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) + NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -223,7 +223,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\..\Common;.;..\..\..\src;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) + NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL true diff --git a/samples/mfc/standard/02_Modeling/adm/win/vc12/Modeling.vcxproj b/samples/mfc/standard/02_Modeling/adm/win/vc12/Modeling.vcxproj new file mode 100644 index 0000000000..54af8d1e27 --- /dev/null +++ b/samples/mfc/standard/02_Modeling/adm/win/vc12/Modeling.vcxproj @@ -0,0 +1,319 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {B10FC678-B9AF-4B05-B3DC-8F790C610CC3} + TopologyTransformations + MFCProj + + + + Application + Dynamic + Unicode + v120 + + + Application + Dynamic + Unicode + v120 + + + Application + Dynamic + Unicode + v120 + + + Application + Dynamic + Unicode + v120 + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + ../../../../win32\vc12\bind\ + .\win32\objd\ + true + ../../../../win64\vc12\bind\ + .\win64\objd\ + true + ../../../../win32\vc12\bin\ + .\win32\obj\ + false + ../../../../win64\vc12\bin\ + .\win64\obj\ + false + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\win32\objd/TopologyTransformations.tlb + + + + + Disabled + ..\..\..\..\Common;.;..\..\..\src;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + Use + stdafx.h + .\win32\objd/TopologyTransformations.pch + .\win32\objd/ + .\win32\objd/ + .\win32\objd/ + Level4 + true + EditAndContinue + Default + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) + ../../../../win32\vc12\bind/Modeling.exe + true + ..\..\..\..\win32\vc12\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories) + true + ../../../../win32\vc12\bind/Modeling.pdb + Windows + MachineX86 + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + X64 + .\win64\objd/TopologyTransformations.tlb + + + + + Disabled + ..\..\..\..\Common;.;..\..\..\src;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + Use + stdafx.h + .\win64\objd/TopologyTransformations.pch + .\win64\objd/ + .\win64\objd/ + .\win64\objd/ + Level4 + true + ProgramDatabase + Default + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) + ../../../../win64\vc12\bind/Modeling.exe + true + ..\..\..\..\win64\vc12\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories) + true + ../../../../win64\vc12\bind/Modeling.pdb + Windows + MachineX64 + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\win32\obj/TopologyTransformations.tlb + + + + + MaxSpeed + OnlyExplicitInline + ..\..\..\..\Common;.;..\..\..\src;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + Use + stdafx.h + .\win32\obj/TopologyTransformations.pch + .\win32\obj/ + .\win32\obj/ + .\win32\obj/ + Level4 + true + Default + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) + ../../../../win32\vc12\bin/Modeling.exe + true + ..\..\..\..\win32\vc12\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories) + ../../../../win32\vc12\bin/Modeling.pdb + Windows + MachineX86 + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + X64 + .\win64\obj/TopologyTransformations.tlb + + + + + MaxSpeed + OnlyExplicitInline + ..\..\..\..\Common;.;..\..\..\src;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + Use + stdafx.h + .\win64\obj/TopologyTransformations.pch + .\win64\obj/ + .\win64\obj/ + .\win64\obj/ + Level4 + true + Default + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) + ../../../../win64\vc12\bin/Modeling.exe + true + ..\..\..\..\win64\vc12\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories) + ../../../../win64\vc12\bin/Modeling.pdb + Windows + MachineX64 + + + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Create + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Create + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + Create + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + Create + + + + + + + + + + + + + + + + + + + + + {2d6cbbe8-6965-4016-b503-0d715ae26691} + false + + + + + + \ No newline at end of file diff --git a/samples/mfc/standard/02_Modeling/adm/win/vc12/Modeling.vcxproj.filters b/samples/mfc/standard/02_Modeling/adm/win/vc12/Modeling.vcxproj.filters new file mode 100644 index 0000000000..447ee1d310 --- /dev/null +++ b/samples/mfc/standard/02_Modeling/adm/win/vc12/Modeling.vcxproj.filters @@ -0,0 +1,67 @@ + + + + + {2f6dc6c3-bd86-4b9d-99ed-00caa1d19e9a} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + {e6868f3f-b442-46d7-a23c-531e056f4fb3} + h;hpp;hxx;hm;inl + + + {80146c9a-bf4e-4b6e-908c-e4c83f441747} + ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Resource Files + + + Resource Files + + + + + Resource Files + + + \ No newline at end of file diff --git a/samples/mfc/standard/02_Modeling/adm/win/vc8/Modeling.vcproj b/samples/mfc/standard/02_Modeling/adm/win/vc8/Modeling.vcproj index dc495fdc3d..6a10c1c6a5 100644 --- a/samples/mfc/standard/02_Modeling/adm/win/vc8/Modeling.vcproj +++ b/samples/mfc/standard/02_Modeling/adm/win/vc8/Modeling.vcproj @@ -26,7 +26,7 @@ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="2" ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" + CharacterSet="1" > Remove(aListIterator.Value()); } - TopoDS_Shape S = BRepPrimAPI_MakeWedge(60.,100.,80.,20.); + TopoDS_Shape S = BRepPrimAPI_MakeWedge (60.,100.,80.,20.).Shape(); Handle(AIS_Shape) ais1 = new AIS_Shape(S); myAISContext->SetColor(ais1,Quantity_NOC_GREEN,Standard_False); myAISContext->SetMaterial(ais1,Graphic3d_NOM_PLASTIC,Standard_False); @@ -145,7 +145,7 @@ void CModelingDoc::OnMirroraxis() for(aListIterator.Initialize(aList);aListIterator.More();aListIterator.Next()){ myAISContext->Remove(aListIterator.Value()); } - TopoDS_Shape S = BRepPrimAPI_MakeWedge(60.,100.,80.,20.); + TopoDS_Shape S = BRepPrimAPI_MakeWedge(60.,100.,80.,20.).Shape(); Handle(AIS_Shape) ais1 = new AIS_Shape(S); myAISContext->SetColor(ais1,Quantity_NOC_GREEN,Standard_False); myAISContext->SetMaterial(ais1,Graphic3d_NOM_PLASTIC,Standard_False); @@ -186,7 +186,7 @@ void CModelingDoc::OnRotate() for(aListIterator.Initialize(aList);aListIterator.More();aListIterator.Next()){ myAISContext->Remove(aListIterator.Value()); } - TopoDS_Shape S = BRepPrimAPI_MakeWedge(60.,100.,80.,20.); + TopoDS_Shape S = BRepPrimAPI_MakeWedge(60.,100.,80.,20.).Shape(); Handle(AIS_Shape) ais1 = new AIS_Shape(S); myAISContext->SetColor(ais1,Quantity_NOC_GREEN,Standard_False); myAISContext->SetMaterial(ais1,Graphic3d_NOM_PLASTIC,Standard_False); @@ -226,7 +226,7 @@ void CModelingDoc::OnScale() for(aListIterator.Initialize(aList);aListIterator.More();aListIterator.Next()){ myAISContext->Remove(aListIterator.Value()); } - TopoDS_Shape S = BRepPrimAPI_MakeWedge(60.,100.,80.,20.); + TopoDS_Shape S = BRepPrimAPI_MakeWedge(60.,100.,80.,20.).Shape(); Handle(AIS_Shape) ais1 = new AIS_Shape(S); myAISContext->SetColor(ais1,Quantity_NOC_GREEN,Standard_False); myAISContext->SetMaterial(ais1,Graphic3d_NOM_PLASTIC,Standard_False); @@ -270,7 +270,7 @@ void CModelingDoc::OnTranslation() for(aListIterator.Initialize(aList);aListIterator.More();aListIterator.Next()){ myAISContext->Remove(aListIterator.Value()); } - TopoDS_Shape S = BRepPrimAPI_MakeWedge(6.,10.,8.,2.); + TopoDS_Shape S = BRepPrimAPI_MakeWedge(6.,10.,8.,2.).Shape(); Handle(AIS_Shape) ais1 = new AIS_Shape(S); myAISContext->SetColor(ais1,Quantity_NOC_GREEN,Standard_False); myAISContext->SetMaterial(ais1,Graphic3d_NOM_PLASTIC,Standard_False); @@ -313,7 +313,7 @@ void CModelingDoc::OnDisplacement() for(aListIterator.Initialize(aList);aListIterator.More();aListIterator.Next()){ myAISContext->Remove(aListIterator.Value()); } - TopoDS_Shape S = BRepPrimAPI_MakeWedge(60.,100.,80.,20.); + TopoDS_Shape S = BRepPrimAPI_MakeWedge(60., 100., 80., 20.).Shape(); Handle(AIS_Shape) ais1 = new AIS_Shape(S); myAISContext->SetColor(ais1,Quantity_NOC_GREEN,Standard_False); myAISContext->SetMaterial(ais1,Graphic3d_NOM_PLASTIC,Standard_False); @@ -355,7 +355,7 @@ void CModelingDoc::OnDeform() for(aListIterator.Initialize(aList);aListIterator.More();aListIterator.Next()){ myAISContext->Remove(aListIterator.Value()); } - TopoDS_Shape S = BRepPrimAPI_MakeWedge(60.,100.,80.,20.); + TopoDS_Shape S = BRepPrimAPI_MakeWedge(60., 100., 80., 20.).Shape(); Handle(AIS_Shape) ais1 = new AIS_Shape(S); myAISContext->SetColor(ais1,Quantity_NOC_GREEN,Standard_False); myAISContext->SetMaterial(ais1,Graphic3d_NOM_PLASTIC,Standard_False); @@ -399,14 +399,14 @@ void CModelingDoc::OnBox() for(aListIterator.Initialize(aList);aListIterator.More();aListIterator.Next()){ myAISContext->Remove(aListIterator.Value()); } - TopoDS_Shape B1 = BRepPrimAPI_MakeBox (200.,150.,100.); + TopoDS_Shape B1 = BRepPrimAPI_MakeBox(200., 150., 100.).Shape(); Handle(AIS_Shape) aBox1 = new AIS_Shape(B1); myAISContext->SetMaterial(aBox1,Graphic3d_NOM_PLASTIC,Standard_False); myAISContext->SetColor(aBox1,Quantity_NOC_GREEN,Standard_False); myAISContext->Display(aBox1,Standard_False); TopoDS_Shape B2 = BRepPrimAPI_MakeBox (gp_Ax2(gp_Pnt(-200.,-80.,-70.), - gp_Dir(1.,2.,1.)), - 80.,90.,120.); + gp_Dir(1.,2.,1.)), + 80., 90., 120.).Shape(); Handle(AIS_Shape) aBox2 = new AIS_Shape(B2); myAISContext->SetMaterial(aBox2,Graphic3d_NOM_PLASTIC,Standard_False); myAISContext->SetColor(aBox2,Quantity_NOC_RED,Standard_False); @@ -431,14 +431,14 @@ void CModelingDoc::OnCylinder() myAISContext->Remove(aListIterator.Value()); } - TopoDS_Shape C1 = BRepPrimAPI_MakeCylinder (50.,200.); + TopoDS_Shape C1 = BRepPrimAPI_MakeCylinder(50., 200.).Shape(); Handle(AIS_Shape) aCyl1 = new AIS_Shape(C1); myAISContext->SetMaterial(aCyl1,Graphic3d_NOM_PLASTIC,Standard_False); myAISContext->SetColor(aCyl1,Quantity_NOC_RED,Standard_False); myAISContext->Display(aCyl1,Standard_False); TopoDS_Shape C2 = BRepPrimAPI_MakeCylinder (gp_Ax2(gp_Pnt(200.,200.,0.), - gp_Dir(0.,0.,1.)), - 40.,110.,210.*M_PI/180); + gp_Dir(0.,0.,1.)), + 40., 110., 210.*M_PI / 180).Shape(); Handle(AIS_Shape) aCyl2 = new AIS_Shape(C2); myAISContext->SetMaterial(aCyl2,Graphic3d_NOM_PLASTIC,Standard_False); myAISContext->SetColor(aCyl2,Quantity_NOC_MATRABLUE,Standard_False); @@ -464,14 +464,14 @@ void CModelingDoc::OnCone() for(aListIterator.Initialize(aList);aListIterator.More();aListIterator.Next()){ myAISContext->Remove(aListIterator.Value()); } - TopoDS_Shape C1 = BRepPrimAPI_MakeCone (50.,25.,200.); + TopoDS_Shape C1 = BRepPrimAPI_MakeCone(50., 25., 200.).Shape(); Handle(AIS_Shape) ais1 = new AIS_Shape(C1); myAISContext->SetMaterial(ais1,Graphic3d_NOM_PLASTIC,Standard_False); myAISContext->SetColor(ais1,Quantity_NOC_MATRABLUE,Standard_False); myAISContext->Display(ais1,Standard_False); TopoDS_Shape C2 = BRepPrimAPI_MakeCone(gp_Ax2(gp_Pnt(100.,100.,0.), - gp_Dir(0.,0.,1.)), - 60.,0.,150.,210.*M_PI/180); + gp_Dir(0.,0.,1.)), + 60., 0., 150., 210.*M_PI / 180).Shape(); Handle(AIS_Shape) ais2 = new AIS_Shape(C2); myAISContext->SetMaterial(ais2,Graphic3d_NOM_PLASTIC,Standard_False); myAISContext->SetColor(ais2,Quantity_NOC_GREEN,Standard_False); @@ -497,24 +497,24 @@ void CModelingDoc::OnSphere() myAISContext->Remove(aListIterator.Value()); } - TopoDS_Shape S1 = BRepPrimAPI_MakeSphere(gp_Pnt(-200.,-250.,0.),80.); + TopoDS_Shape S1 = BRepPrimAPI_MakeSphere(gp_Pnt(-200., -250., 0.), 80.).Shape(); Handle(AIS_Shape) ais1 = new AIS_Shape(S1); myAISContext->SetColor(ais1,Quantity_NOC_AZURE,Standard_False); myAISContext->SetMaterial(ais1,Graphic3d_NOM_PLASTIC,Standard_False); myAISContext->Display(ais1,Standard_False); - TopoDS_Shape S2 = BRepPrimAPI_MakeSphere(100.,120.*M_PI/180); + TopoDS_Shape S2 = BRepPrimAPI_MakeSphere(100., 120.*M_PI / 180).Shape(); Handle(AIS_Shape) ais2 = new AIS_Shape(S2); myAISContext->SetColor(ais2,Quantity_NOC_GREEN,Standard_False); myAISContext->SetMaterial(ais2,Graphic3d_NOM_PLASTIC,Standard_False); myAISContext->Display(ais2,Standard_False); TopoDS_Shape S3 = BRepPrimAPI_MakeSphere(gp_Pnt(200.,250.,0.),100., - -60.*M_PI/180, 60.*M_PI/180); + -60.*M_PI / 180, 60.*M_PI / 180).Shape(); Handle(AIS_Shape) ais3 = new AIS_Shape(S3); myAISContext->SetColor(ais3,Quantity_NOC_RED,Standard_False); myAISContext->SetMaterial(ais3,Graphic3d_NOM_PLASTIC,Standard_False); myAISContext->Display(ais3,Standard_False); TopoDS_Shape S4 = BRepPrimAPI_MakeSphere(gp_Pnt(0.,0.,-300.),150., - -45.*M_PI/180, 45.*M_PI/180, 45.*M_PI/180); + -45.*M_PI / 180, 45.*M_PI / 180, 45.*M_PI / 180).Shape(); Handle(AIS_Shape) ais4 = new AIS_Shape(S4); myAISContext->SetColor(ais4,Quantity_NOC_MATRABLUE,Standard_False); myAISContext->SetMaterial(ais4,Graphic3d_NOM_PLASTIC,Standard_False); @@ -542,19 +542,19 @@ void CModelingDoc::OnTorus() myAISContext->Remove(aListIterator.Value()); } - TopoDS_Shape S1 = BRepPrimAPI_MakeTorus(60.,20.); + TopoDS_Shape S1 = BRepPrimAPI_MakeTorus(60., 20.).Shape(); Handle(AIS_Shape) ais1 = new AIS_Shape(S1); myAISContext->SetColor(ais1,Quantity_NOC_AZURE,Standard_False); myAISContext->SetMaterial(ais1,Graphic3d_NOM_PLASTIC,Standard_False); myAISContext->Display(ais1,Standard_False); TopoDS_Shape S2 = BRepPrimAPI_MakeTorus(gp_Ax2(gp_Pnt(100.,100.,0.),gp_Dir(1.,1.,1.)), - 50.,20.,210.*M_PI/180); + 50., 20., 210.*M_PI / 180).Shape(); Handle(AIS_Shape) ais2 = new AIS_Shape(S2); myAISContext->SetColor(ais2,Quantity_NOC_GREEN,Standard_False); myAISContext->SetMaterial(ais2,Graphic3d_NOM_PLASTIC,Standard_False); myAISContext->Display(ais2,Standard_False); TopoDS_Shape S3 = BRepPrimAPI_MakeTorus(gp_Ax2(gp_Pnt(-200.,-150.,-100),gp_Dir(0.,1.,0.)), - 60.,20.,-45.*M_PI/180,45.*M_PI/180,90.*M_PI/180); + 60., 20., -45.*M_PI / 180, 45.*M_PI / 180, 90.*M_PI / 180).Shape(); Handle(AIS_Shape) ais3= new AIS_Shape(S3); myAISContext->SetColor(ais3,Quantity_NOC_CORAL,Standard_False); myAISContext->SetMaterial(ais3,Graphic3d_NOM_PLASTIC,Standard_False); @@ -581,13 +581,13 @@ void CModelingDoc::OnWedge() myAISContext->Remove(aListIterator.Value()); } - TopoDS_Shape S1 = BRepPrimAPI_MakeWedge(60.,100.,80.,20.); + TopoDS_Shape S1 = BRepPrimAPI_MakeWedge(60., 100., 80., 20.).Shape(); Handle(AIS_Shape) ais1 = new AIS_Shape(S1); myAISContext->SetColor(ais1,Quantity_NOC_AZURE,Standard_False); myAISContext->SetMaterial(ais1,Graphic3d_NOM_PLASTIC,Standard_False); myAISContext->Display(ais1,Standard_False); TopoDS_Shape S2 = BRepPrimAPI_MakeWedge(gp_Ax2(gp_Pnt(100.,100.,0.),gp_Dir(0.,0.,1.)), - 60.,50.,80.,25.,-10.,40.,70.); + 60., 50., 80., 25., -10., 40., 70.).Shape(); Handle(AIS_Shape) ais2 = new AIS_Shape(S2); myAISContext->SetColor(ais2,Quantity_NOC_CORAL2,Standard_False); myAISContext->SetMaterial(ais2,Graphic3d_NOM_PLASTIC,Standard_False); @@ -780,7 +780,7 @@ TopoDS_Face F = BRepBuilderAPI_MakeFace(gp_Pln(gp::XOY()),Wc); \n\ axe = gp_Ax1(gp_Pnt(290,290.,0.),gp_Dir(0.,1,0.)); \n\ TopoDS_Shape S4 = BRepPrimAPI_MakeRevol(F,axe, 90.*PI180); \n\ \n"); - PocessTextInDialog("Make a prism", Message); + PocessTextInDialog("Make a prism", Message); } void CModelingDoc::OnPipe() @@ -841,7 +841,7 @@ TopoDS_Wire Wc = BRepBuilderAPI_MakeWire(Ec);\n\ TopoDS_Face F = BRepBuilderAPI_MakeFace(gp_Pln(gp::ZOX()),Wc);\n\ TopoDS_Shape S = BRepBuilderAPI_MakePipe(W,F);\n\ \n"); - PocessTextInDialog("Make a pipe", Message); + PocessTextInDialog("Make a pipe", Message); } @@ -967,7 +967,7 @@ generatorb.AddWire(W4b);\n\ generatorb.Build();\n\ TopoDS_Shape S2 = generatorb.Shape();\n\ \n"); - PocessTextInDialog("Make a Thru sections", Message); + PocessTextInDialog("Make a Thru sections", Message); } @@ -1032,7 +1032,7 @@ void CModelingDoc::OnDraft() myAISContext->Remove(aListIterator.Value()); } - TopoDS_Shape S = BRepPrimAPI_MakeBox(200.,300.,150.); + TopoDS_Shape S = BRepPrimAPI_MakeBox(200., 300., 150.).Shape(); Handle(AIS_Shape) ais1 = new AIS_Shape(S); myAISContext->SetColor(ais1,Quantity_NOC_GREEN,Standard_False); myAISContext->SetMaterial(ais1,Graphic3d_NOM_PLASTIC,Standard_False); @@ -1069,7 +1069,7 @@ for (Ex.Init(S,TopAbs_FACE); Ex.More(); Ex.Next()) {\n\ adraft.Add(F, gp_Dir(0.,0.,1.), 15.*PI180, gp_Pln(gp::XOY()));\n\ }\n\ \n"); - PocessTextInDialog("Make a tapered shape", Message); + PocessTextInDialog("Make a tapered shape", Message); } @@ -1086,7 +1086,7 @@ void CModelingDoc::OnCut() myAISContext->Remove(aListIterator.Value()); } -TopoDS_Shape theBox = BRepPrimAPI_MakeBox(200,60,60); + TopoDS_Shape theBox = BRepPrimAPI_MakeBox(200, 60, 60).Shape(); Handle (AIS_Shape) ais1 = new AIS_Shape(theBox); myAISContext->SetDisplayMode(ais1,1,Standard_False); @@ -1098,7 +1098,7 @@ Fit(); Sleep(1000); -TopoDS_Shape theSphere = BRepPrimAPI_MakeSphere(gp_Pnt(100,20,20),80); +TopoDS_Shape theSphere = BRepPrimAPI_MakeSphere(gp_Pnt(100, 20, 20), 80).Shape(); Handle (AIS_Shape) ais2 = new AIS_Shape(theSphere); myAISContext->SetDisplayMode(ais2,1,Standard_False); myAISContext->SetColor(ais2,Quantity_NOC_YELLOW,Standard_False); @@ -1153,7 +1153,7 @@ void CModelingDoc::OnFuse() } gp_Pnt P(-5,5,-5); -TopoDS_Shape theBox1 = BRepPrimAPI_MakeBox(60,200,70); +TopoDS_Shape theBox1 = BRepPrimAPI_MakeBox(60, 200, 70).Shape(); Handle (AIS_Shape) ais1 = new AIS_Shape(theBox1); myAISContext->SetColor(ais1,Quantity_NOC_GREEN,Standard_False); myAISContext->SetMaterial(ais1,Graphic3d_NOM_PLASTIC,Standard_False); @@ -1162,7 +1162,7 @@ myAISContext->SetCurrentObject(ais1,Standard_False); Fit(); Sleep(1000); -TopoDS_Shape theBox2 = BRepPrimAPI_MakeBox(P,20,150,110); +TopoDS_Shape theBox2 = BRepPrimAPI_MakeBox(P, 20, 150, 110).Shape(); Handle (AIS_Shape) ais2 = new AIS_Shape(theBox2); myAISContext->SetColor(ais2,Quantity_NOC_YELLOW,Standard_False); myAISContext->SetMaterial(ais2,Graphic3d_NOM_PLASTIC,Standard_False); @@ -1205,7 +1205,7 @@ void CModelingDoc::OnCommon() } gp_Ax2 axe(gp_Pnt(10,10,10),gp_Dir(1,2,1)); -TopoDS_Shape theBox = BRepPrimAPI_MakeBox(axe,60,80,100); +TopoDS_Shape theBox = BRepPrimAPI_MakeBox(axe, 60, 80, 100).Shape(); Handle(AIS_Shape) aboxshape=new AIS_Shape(theBox); myAISContext->SetColor(aboxshape,Quantity_NOC_YELLOW,Standard_False); @@ -1217,7 +1217,7 @@ myAISContext->SetCurrentObject(aboxshape,Standard_False); Fit(); Sleep(500); -TopoDS_Shape theWedge = BRepPrimAPI_MakeWedge(60.,100.,80.,20.); +TopoDS_Shape theWedge = BRepPrimAPI_MakeWedge(60., 100., 80., 20.).Shape(); Handle(AIS_Shape) awedge = new AIS_Shape(theWedge); myAISContext->SetColor(awedge,Quantity_NOC_RED,Standard_False); @@ -1264,7 +1264,7 @@ void CModelingDoc::OnSection() myAISContext->Remove(aListIterator.Value()); } -TopoDS_Shape atorus = BRepPrimAPI_MakeTorus(120,20); + TopoDS_Shape atorus = BRepPrimAPI_MakeTorus(120, 20).Shape(); Handle(AIS_Shape) ashape=new AIS_Shape(atorus); myAISContext->SetColor(ashape,Quantity_NOC_RED,Standard_False); @@ -1278,7 +1278,7 @@ Standard_Real radius = 120; Standard_Integer i=-3; for(i;i<=3;i++) { - TopoDS_Shape asphere = BRepPrimAPI_MakeSphere(gp_Pnt(26*3*i,0,0),radius); + TopoDS_Shape asphere = BRepPrimAPI_MakeSphere(gp_Pnt(26 * 3 * i, 0, 0), radius).Shape(); Handle (AIS_Shape) theShape=new AIS_Shape (asphere); myAISContext->SetTransparency(theShape,0.1,Standard_False); @@ -1330,7 +1330,7 @@ void CModelingDoc::OnPsection() myAISContext->Remove(aListIterator.Value()); } -TopoDS_Shape theTorus = BRepPrimAPI_MakeTorus(35,8); +TopoDS_Shape theTorus = BRepPrimAPI_MakeTorus(35, 8).Shape(); Handle(AIS_Shape) atorus = new AIS_Shape(theTorus); myAISContext->SetColor(atorus,Quantity_NOC_YELLOW,Standard_False); myAISContext->SetMaterial(atorus,Graphic3d_NOM_PLASTIC,Standard_False); @@ -1381,7 +1381,7 @@ void CModelingDoc::OnBlend() myAISContext->Remove(aListIterator.Value()); } -TopoDS_Shape Box = BRepPrimAPI_MakeBox(gp_Pnt(-400,0,0),200,230,180); +TopoDS_Shape Box = BRepPrimAPI_MakeBox(gp_Pnt(-400,0,0),200,230,180).Shape(); Handle(AIS_Shape) ais1 = new AIS_Shape(Box); myAISContext->SetColor(ais1,Quantity_NOC_YELLOW,Standard_False); myAISContext->SetMaterial(ais1,Graphic3d_NOM_PLASTIC,Standard_False); @@ -1410,8 +1410,8 @@ Sleep(500); gp_Pnt P1(250,150,75); -TopoDS_Shape S1 = BRepPrimAPI_MakeBox(300,200,200); -TopoDS_Shape S2 = BRepPrimAPI_MakeBox(P1,120,180,70); +TopoDS_Shape S1 = BRepPrimAPI_MakeBox(300, 200, 200).Shape(); +TopoDS_Shape S2 = BRepPrimAPI_MakeBox(P1, 120, 180, 70).Shape(); TopoDS_Shape fusedShape = BRepAlgoAPI_Fuse(S1,S2); Handle(AIS_Shape) ais2 = new AIS_Shape(fusedShape); @@ -1498,7 +1498,7 @@ void CModelingDoc::OnEvolvedblend() myAISContext->Remove(aListIterator.Value()); } -TopoDS_Shape theBox = BRepPrimAPI_MakeBox(200,200,200); +TopoDS_Shape theBox = BRepPrimAPI_MakeBox(200, 200, 200).Shape(); Handle(AIS_Shape) ais1 = new AIS_Shape(theBox); myAISContext->SetColor(ais1,Quantity_NOC_BROWN,Standard_False); myAISContext->SetMaterial(ais1,Graphic3d_NOM_PLASTIC,Standard_False); @@ -1526,7 +1526,7 @@ if (Rake.IsDone() ){ } -TopoDS_Shape theCylinder = BRepPrimAPI_MakeCylinder(gp_Ax2(gp_Pnt(-300,0,0),gp_Dir(0,0,1)),100,200); +TopoDS_Shape theCylinder = BRepPrimAPI_MakeCylinder(gp_Ax2(gp_Pnt(-300, 0, 0), gp::DZ()), 100, 200).Shape(); Handle(AIS_Shape) ais3 = new AIS_Shape(theCylinder); myAISContext->SetColor(ais3,Quantity_NOC_GREEN,Standard_False); myAISContext->SetMaterial(ais3,Graphic3d_NOM_PLASTIC,Standard_False); @@ -1557,7 +1557,7 @@ if (fillet.IsDone() ){ } gp_Pnt P(350,0,0); -TopoDS_Shape theBox2 = BRepPrimAPI_MakeBox(P,200,200,200); +TopoDS_Shape theBox2 = BRepPrimAPI_MakeBox(P, 200, 200, 200).Shape(); Handle(AIS_Shape) ais2 = new AIS_Shape(theBox2); myAISContext->SetColor(ais2,Quantity_NOC_RED,Standard_False); myAISContext->SetMaterial(ais2,Graphic3d_NOM_PLASTIC,Standard_False); @@ -1693,7 +1693,7 @@ void CModelingDoc::OnChamf() myAISContext->Remove(aListIterator.Value()); } -TopoDS_Shape theBox = BRepPrimAPI_MakeBox(60,200,70); +TopoDS_Shape theBox = BRepPrimAPI_MakeBox(60,200,70).Shape(); Handle(AIS_Shape) ais1 = new AIS_Shape(theBox); myAISContext->SetColor(ais1,Quantity_NOC_YELLOW,Standard_False); myAISContext->SetMaterial(ais1,Graphic3d_NOM_PLASTIC,Standard_False); @@ -1751,7 +1751,7 @@ void CModelingDoc::OnPrismLocal() for(aListIterator.Initialize(aList);aListIterator.More();aListIterator.Next()){ myAISContext->Remove(aListIterator.Value()); } - TopoDS_Shape S = BRepPrimAPI_MakeBox(400.,250.,300.); + TopoDS_Shape S = BRepPrimAPI_MakeBox(400., 250., 300.).Shape(); Handle(AIS_Shape) ais1 = new AIS_Shape(S); myAISContext->SetColor(ais1,Quantity_NOC_GREEN,Standard_False); @@ -1924,7 +1924,7 @@ void CModelingDoc::OnDprismLocal() myAISContext->Remove(aListIterator.Value()); } - TopoDS_Shape S = BRepPrimAPI_MakeBox(400.,250.,300.); + TopoDS_Shape S = BRepPrimAPI_MakeBox(400., 250., 300.).Shape(); Handle(AIS_Shape) ais1 = new AIS_Shape(S); myAISContext->SetColor(ais1,Quantity_NOC_RED,Standard_False); @@ -2004,7 +2004,7 @@ void CModelingDoc::OnRevolLocal() for(aListIterator.Initialize(aList);aListIterator.More();aListIterator.Next()){ myAISContext->Remove(aListIterator.Value()); } - TopoDS_Shape S = BRepPrimAPI_MakeBox(400.,250.,300.); + TopoDS_Shape S = BRepPrimAPI_MakeBox(400., 250., 300.).Shape(); Handle(AIS_Shape) ais1 = new AIS_Shape(S); @@ -2092,7 +2092,7 @@ TopoDS_Face F2 = TopoDS::Face(Ex.Current());\n\ MKrev.Perform(F2);\n\ TopoDS_Shape res1 = MKrev.Shape();\n\ \n"); - PocessTextInDialog("Make a local revolution", Message); + PocessTextInDialog("Make a local revolution", Message); } void CModelingDoc::OnGlueLocal() @@ -2103,7 +2103,7 @@ void CModelingDoc::OnGlueLocal() for(aListIterator.Initialize(aList);aListIterator.More();aListIterator.Next()){ myAISContext->Remove(aListIterator.Value()); } - TopoDS_Shape S1 = BRepPrimAPI_MakeBox(gp_Pnt(-500.,-500.,0.),gp_Pnt(-100.,-250.,300.)); + TopoDS_Shape S1 = BRepPrimAPI_MakeBox(gp_Pnt(-500., -500., 0.), gp_Pnt(-100., -250., 300.)).Shape(); Handle(AIS_Shape) ais1 = new AIS_Shape(S1); myAISContext->SetColor(ais1,Quantity_NOC_ORANGE,Standard_False); @@ -2121,7 +2121,7 @@ void CModelingDoc::OnGlueLocal() Ex1.Next(); Ex1.Next(); TopoDS_Face F1 = TopoDS::Face(Ex1.Current()); - TopoDS_Shape S2 = BRepPrimAPI_MakeBox(gp_Pnt(-400.,-400.,300.),gp_Pnt(-200.,-300.,500.)); + TopoDS_Shape S2 = BRepPrimAPI_MakeBox(gp_Pnt(-400., -400., 300.), gp_Pnt(-200., -300., 500.)).Shape(); Handle(AIS_Shape) ais2 = new AIS_Shape(S2); myAISContext->SetColor(ais2,Quantity_NOC_AZURE,Standard_False); @@ -2150,7 +2150,7 @@ void CModelingDoc::OnGlueLocal() Fit(); Sleep(1000); - TopoDS_Shape S3 = BRepPrimAPI_MakeBox(500.,400.,300.); + TopoDS_Shape S3 = BRepPrimAPI_MakeBox(500., 400., 300.).Shape(); Handle(AIS_Shape) ais3 = new AIS_Shape(S3); myAISContext->SetColor(ais3,Quantity_NOC_ORANGE,Standard_False); @@ -2168,7 +2168,7 @@ void CModelingDoc::OnGlueLocal() Ex3.Next(); Ex3.Next(); TopoDS_Face F3 = TopoDS::Face(Ex3.Current()); - TopoDS_Shape S4 = BRepPrimAPI_MakeBox(gp_Pnt(0.,0.,300.),gp_Pnt(200.,200.,500.)); + TopoDS_Shape S4 = BRepPrimAPI_MakeBox(gp_Pnt(0., 0., 300.), gp_Pnt(200., 200., 500.)).Shape(); Handle(AIS_Shape) ais4 = new AIS_Shape(S4); myAISContext->SetColor(ais4,Quantity_NOC_AZURE,Standard_False); @@ -2251,7 +2251,7 @@ for (CommonEdges.InitIterator(); CommonEdges.More(); CommonEdges.Next()) \n\ glue2.Bind(CommonEdges.EdgeFrom(),CommonEdges.EdgeTo());\n\ TopoDS_Shape res2 = glue2.Shape();\n\ \n"); - PocessTextInDialog("Glue two solids", Message); + PocessTextInDialog("Glue two solids", Message); } @@ -2263,7 +2263,7 @@ void CModelingDoc::OnPipeLocal() for(aListIterator.Initialize(aList);aListIterator.More();aListIterator.Next()){ myAISContext->Remove(aListIterator.Value()); } - TopoDS_Shape S = BRepPrimAPI_MakeBox(400.,250.,300.); + TopoDS_Shape S = BRepPrimAPI_MakeBox(400., 250., 300.).Shape(); Handle(AIS_Shape) ais1 = new AIS_Shape(S); myAISContext->SetColor(ais1,Quantity_NOC_CORAL,Standard_False); @@ -2358,7 +2358,7 @@ BRepFeat_MakePipe MKPipe(S,FP,F1,W,1,Standard_True);\n\ MKPipe.Perform();\n\ TopoDS_Shape res1 = MKPipe.Shape();\n\ \n"); - PocessTextInDialog("Make a local pipe", Message); + PocessTextInDialog("Make a local pipe", Message); } @@ -2443,7 +2443,7 @@ BRepFeat_MakeLinearForm aform(S, W, aplane, gp_Dir(0.,10.,0.), gp_Dir(0.,0.,0.), aform.Perform(10.);\n\ TopoDS_Shape res = aform.Shape();\n\ \n"); - PocessTextInDialog("Make a rib", Message); + PocessTextInDialog("Make a rib", Message); } @@ -2456,7 +2456,7 @@ void CModelingDoc::OnSplitLocal() myAISContext->Remove(aListIterator.Value()); } - TopoDS_Shape S = BRepPrimAPI_MakeBox(gp_Pnt(-100,-60,-80),150,200,170); + TopoDS_Shape S = BRepPrimAPI_MakeBox(gp_Pnt(-100, -60, -80), 150, 200, 170).Shape(); Handle(AIS_Shape) ais1 = new AIS_Shape(S); myAISContext->SetColor(ais1,Quantity_NOC_RED,Standard_False); @@ -2543,7 +2543,7 @@ void CModelingDoc::OnThickLocal() myAISContext->Remove(aListIterator.Value()); } - TopoDS_Shape S1 = BRepPrimAPI_MakeBox(150,200,110); + TopoDS_Shape S1 = BRepPrimAPI_MakeBox(150, 200, 110).Shape(); Handle(AIS_Shape) abox1 = new AIS_Shape(S1); myAISContext->SetColor(abox1,Quantity_NOC_WHITE); @@ -2598,7 +2598,7 @@ void CModelingDoc::OnOffsetLocal() myAISContext->Remove(aListIterator.Value()); } - TopoDS_Shape S1 = BRepPrimAPI_MakeBox(150,200,110); + TopoDS_Shape S1 = BRepPrimAPI_MakeBox(150, 200, 110).Shape(); Handle(AIS_Shape) aisBox1 = new AIS_Shape(S1); myAISContext->SetColor(aisBox1,Quantity_NOC_BROWN,Standard_False); @@ -2617,7 +2617,7 @@ void CModelingDoc::OnOffsetLocal() Fit(); Sleep(500); - TopoDS_Shape S2 = BRepPrimAPI_MakeBox(gp_Pnt(500,0,0),220,140,180); + TopoDS_Shape S2 = BRepPrimAPI_MakeBox(gp_Pnt(500, 0, 0), 220, 140, 180).Shape(); Handle(AIS_Shape) aisBox2 = new AIS_Shape(S2); myAISContext->SetColor(aisBox2,Quantity_NOC_WHITE,Standard_False); @@ -3221,7 +3221,7 @@ BRepLib::BuildCurves3d(PinkFace); \n\ \n\ \n"); - PocessTextInDialog("Make face ", Message); +PocessTextInDialog("Make face ", Message); } void CModelingDoc::OnShell() @@ -3323,7 +3323,7 @@ TopoDS_Shell aShell = BRepBuilderAPI_MakeShell(BSpline); \n\ \n\ \n"); - PocessTextInDialog("Make shell", Message); + PocessTextInDialog("Make shell", Message); } @@ -3351,7 +3351,7 @@ void CModelingDoc::OnCompound() TopoDS_Face aFace = BRepBuilderAPI_MakeFace(sphere,0.1,0.7,0.2,0.9); builder.Add(Comp,aFace); - TopoDS_Shape aBox = BRepPrimAPI_MakeBox(gp_Pnt(-60,0,0),30,60,40); + TopoDS_Shape aBox = BRepPrimAPI_MakeBox(gp_Pnt(-60, 0, 0), 30, 60, 40).Shape(); builder.Add(Comp,aBox); Handle(AIS_Shape) white = new AIS_Shape(Comp); @@ -4161,7 +4161,7 @@ void CModelingDoc::OnExplorer() myAISContext->Remove(aListIterator.Value()); } - TopoDS_Shape aBox = BRepPrimAPI_MakeBox(100,100,100); + TopoDS_Shape aBox = BRepPrimAPI_MakeBox(100, 100, 100).Shape(); Standard_Integer j(8); Handle(AIS_Shape) theBox = new AIS_Shape(aBox); myAISContext->SetColor(theBox,Quantity_NOC_RED,Standard_False); @@ -4268,7 +4268,7 @@ void CModelingDoc::OnValid() myAISContext->Remove(aListIterator.Value()); } - TopoDS_Shape S = BRepPrimAPI_MakeBox(200.,300.,150.); + TopoDS_Shape S = BRepPrimAPI_MakeBox(200., 300., 150.).Shape(); Handle(AIS_Shape) ais1 = new AIS_Shape(S); myAISContext->SetColor(ais1,Quantity_NOC_GREEN,Standard_False); myAISContext->SetMaterial(ais1,Graphic3d_NOM_PLASTIC,Standard_False); @@ -4291,16 +4291,7 @@ else\n\ PocessTextInDialog("Check a shape", Message); Standard_Boolean theShapeIsValid = BRepAlgo::IsValid(S); - if ( theShapeIsValid ) - { - MessageBox(0,"The Shape Is Valid !! ","Checking Shape",MB_OK); - } - else - { - MessageBox(0,"The Shape Is NOT Valid !! ","Checking Shape",MB_OK); - } - - + MessageBoxW (AfxGetApp()->m_pMainWnd->m_hWnd, theShapeIsValid ? L"The Shape Is Valid !! " : L"The Shape Is NOT Valid !! ", L"Checking Shape", MB_OK); } @@ -4336,8 +4327,8 @@ void CModelingDoc::OnLinear() Standard_Real Length = System.Mass(); gp_Mat I = System.MatrixOfInertia(); - TCollection_AsciiString string("Length Of all the Edges ="); - TCollection_AsciiString string1(Length); + TCollection_ExtendedString string("Length Of all the Edges ="); + TCollection_ExtendedString string1(Length); string += string1; string += "\nCenterOfMass : \n X="; @@ -4379,8 +4370,8 @@ void CModelingDoc::OnLinear() string1 = I(3,3); string += string1; string += "\n" ; - Standard_CString CSTR = string.ToCString(); - TCollection_AsciiString Message ("\ + + TCollection_AsciiString Message ("\ \n\ TColgp_Array1OfPnt Points1(1,4);\n\ Points1.SetValue(1,gp_Pnt(0,0,0));\n\ @@ -4397,8 +4388,7 @@ Standard_Real Length = System.Mass();\n\ gp_Mat I = System.MatrixOfInertia();\n\ \n"); PocessTextInDialog("Linear Properties", Message); - MessageBox(0,CSTR,"Linear Properties",MB_OK); - + MessageBoxW (AfxGetApp()->m_pMainWnd->m_hWnd, (const wchar_t* )string.ToExtString(), L"Linear Properties", MB_OK); } void CModelingDoc::OnSurface() @@ -4459,8 +4449,8 @@ void CModelingDoc::OnSurface() Standard_Real Area = System.Mass(); gp_Mat I = System.MatrixOfInertia(); - TCollection_AsciiString string("Area Of the Face ="); - TCollection_AsciiString string1(Area); + TCollection_ExtendedString string("Area Of the Face ="); + TCollection_ExtendedString string1(Area); string += string1; string += "\nCenterOfMass : \n X="; @@ -4502,8 +4492,8 @@ void CModelingDoc::OnSurface() string1 = I(3,3); string += string1; string += "\n" ; - Standard_CString CSTR = string.ToCString(); - TCollection_AsciiString Message ("\ + + TCollection_AsciiString Message ("\ \n\ TopoDS_Shape S = BRepBuilderAPI_MakeFace(BSplineSurf).Face();\n\ GProp_GProps System;\n\ @@ -4512,8 +4502,8 @@ gp_Pnt G = System.CentreOfMass ();\n\ Standard_Real Area = System.Mass();\n\ gp_Mat I = System.MatrixOfInertia();\n\ \n"); - PocessTextInDialog("Surface Properties", Message); - MessageBox(0,CSTR,"Surface Properties",MB_OK); + PocessTextInDialog("Surface Properties", Message); + MessageBoxW (AfxGetApp()->m_pMainWnd->m_hWnd, (const wchar_t* )string.ToExtString(), L"Surface Properties", MB_OK); } @@ -4527,7 +4517,7 @@ void CModelingDoc::OnVolume() } - TopoDS_Shape S = BRepPrimAPI_MakeWedge(60.,100.,80.,20.); + TopoDS_Shape S = BRepPrimAPI_MakeWedge(60.,100.,80.,20.).Shape(); Handle(AIS_Shape) ais1 = new AIS_Shape(S); myAISContext->SetColor(ais1,Quantity_NOC_GREEN,Standard_False); myAISContext->SetMaterial(ais1,Graphic3d_NOM_PLASTIC,Standard_False); @@ -4541,8 +4531,8 @@ void CModelingDoc::OnVolume() Standard_Real Volume = System.Mass(); gp_Mat I = System.MatrixOfInertia(); - TCollection_AsciiString string("Volume Of all the Shape ="); -TCollection_AsciiString string1(Volume); + TCollection_ExtendedString string("Volume Of all the Shape ="); + TCollection_ExtendedString string1(Volume); string += string1; string += "\nCenterOfMass : \n X="; @@ -4584,7 +4574,7 @@ TCollection_AsciiString string1(Volume); string1 = I(3,3); string += string1; string += "\n" ; - Standard_CString CSTR = string.ToCString(); + TCollection_AsciiString Message ("\ \n\ TopoDS_Shape S = BRepBuilderAPI_MakeWedge(60.,100.,80.,20.);;\n\ @@ -4594,9 +4584,8 @@ gp_Pnt G = System.CentreOfMass ();\n\ Standard_Real Volume = System.Mass();\n\ gp_Mat I = System.MatrixOfInertia();\n\ \n"); - PocessTextInDialog("Volume Properties", Message); - MessageBox(0,CSTR,"Volume Properties",MB_OK); - + PocessTextInDialog("Volume Properties", Message); + MessageBoxW (AfxGetApp()->m_pMainWnd->m_hWnd, (const wchar_t* )string.ToExtString(), L"Volume Properties", MB_OK); } @@ -4615,14 +4604,14 @@ void CModelingDoc::OnButtonFill() AIS_ListOfInteractive LI; myAISContext->DisplayedObjects(LI); if(LI.IsEmpty()){ - if(OnFileImportBrep_WithInitDir("HoleFilling") == 1) + if(OnFileImportBrep_WithInitDir (L"HoleFilling") == 1) return; myAISContext->DisplayedObjects(LI); myAISContext->SetCurrentObject(LI.First()); OnButtonFill(); return; } - AfxMessageBox("Select a shape before!"); + AfxMessageBox (L"Select a shape before!"); } } @@ -4670,7 +4659,7 @@ void CModelingDoc::OnStopStop() GeomPlate_BuildPlateSurface abuildplate(NbPtsCur,Fronts,Tang,3); abuildplate.Perform(); if (!abuildplate.IsDone()){ // New in 2.0 - MessageBox(AfxGetApp()->m_pMainWnd->m_hWnd,"Error : Build plate not valid!","CasCade Error",MB_ICONERROR); + MessageBoxW (AfxGetApp()->m_pMainWnd->m_hWnd, L"Error : Build plate not valid!", L"CasCade Error", MB_ICONERROR); return; } Handle(GeomPlate_Surface) aplate = abuildplate.Surface(); @@ -4709,12 +4698,12 @@ void CModelingDoc::OnStopStop() catch(StdFail_NotDone) { - AfxMessageBox("Can't build wire!"); + AfxMessageBox (L"Can't build wire!"); return; } if (!(W.Closed())){ - AfxMessageBox("Wire is not closed!"); + AfxMessageBox (L"Wire is not closed!"); return; //Standard_Failure::Raise("Wire is not closed"); @@ -4729,7 +4718,7 @@ void CModelingDoc::OnStopStop() aface = MF1.Face(); } if (!BRepAlgo::IsValid(aface)) - MessageBox(AfxGetApp()->m_pMainWnd->m_hWnd,"Error : The plate face is not valid!","CasCade Error",MB_ICONERROR); + MessageBoxW (AfxGetApp()->m_pMainWnd->m_hWnd, L"Error : The plate face is not valid!", L"CasCade Error", MB_ICONERROR); myAISContext->CloseLocalContext(); myState = -1; Handle_AIS_Shape anAISShape = new AIS_Shape(aface); @@ -4750,7 +4739,7 @@ void CModelingDoc::OnFillwithtang() if(myAISContext->MoreCurrent()) aObject = myAISContext->Current(); ((OCC_MainFrame*)AfxGetMainWnd())->SetStatusMessage("Select a file with second face"); - if(OnFileImportBrep_WithInitDir("TangentSurface") == 1){ + if(OnFileImportBrep_WithInitDir (L"TangentSurface") == 1){ ((OCC_MainFrame*)AfxGetMainWnd())->SetStatusMessage(""); AIS_ListOfInteractive aList; myAISContext->DisplayedObjects(aList); @@ -4772,7 +4761,7 @@ void CModelingDoc::OnFillwithtang() catch(Standard_Failure){} if (F1.IsNull()) { - AfxMessageBox("Current object is not a face!\n\ + AfxMessageBox (L"Current object is not a face!\n\ Please, select a face to continue\nthe creation of a tangent surface."); return; } @@ -4787,7 +4776,7 @@ Please, select a face to continue\nthe creation of a tangent surface."); myAISContext->DisplayedObjects(LI); if(LI.IsEmpty()){ ((OCC_MainFrame*)AfxGetMainWnd())->SetStatusMessage("Select a file with first face"); - if(OnFileImportBrep_WithInitDir("TangentSurface") == 1){ + if(OnFileImportBrep_WithInitDir (L"TangentSurface") == 1){ ((OCC_MainFrame*)AfxGetMainWnd())->SetStatusMessage(""); AIS_ListOfInteractive aList; myAISContext->DisplayedObjects(aList); @@ -4806,7 +4795,7 @@ Please, select a face to continue\nthe creation of a tangent surface."); OnFillwithtang(); return; } - AfxMessageBox("Select a face before"); + AfxMessageBox (L"Select a face before"); } } @@ -4844,12 +4833,12 @@ void CModelingDoc::InputEvent(const Standard_Integer /*x*/, AIS_ListOfInteractive LI; myAISContext->DisplayedObjects(LI); if(LI.Extent() == 1){ - if(OnFileImportBrep_WithInitDir("TangentSurface") == 1) + if(OnFileImportBrep_WithInitDir (L"TangentSurface") == 1) return; } } else - AfxMessageBox("Select an edge on the face!"); + AfxMessageBox (L"Select an edge on the face!"); } else if (myState == SELECT_EDGE_PLATE_TGTES_2) { @@ -4863,7 +4852,7 @@ void CModelingDoc::InputEvent(const Standard_Integer /*x*/, ((OCC_MainFrame*)AfxGetMainWnd())->SetStatusMessage("Select an edge on the second face"); } else - AfxMessageBox("Select the second face!"); + AfxMessageBox (L"Select the second face!"); } else if (myState == SELECT_EDGE_PLATE_TGTES_3) { myAISContext->InitSelected(); @@ -4937,11 +4926,11 @@ void CModelingDoc::InputEvent(const Standard_Integer /*x*/, NULL, NULL, OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT, - "Points Files (*.pass)|*.pass; |All Files (*.*)|*.*||", - NULL ); + L"Points Files (*.pass)|*.pass; |All Files (*.*)|*.*||", + NULL); CString initdir(((OCC_App*) AfxGetApp())->GetInitDataDir()); - initdir += "\\Data\\TangentSurface"; + initdir += L"\\Data\\TangentSurface"; dlg.m_ofn.lpstrInitialDir = initdir; @@ -4952,8 +4941,8 @@ void CModelingDoc::InputEvent(const Standard_Integer /*x*/, CString filename = dlg.GetPathName(); filebuf fic; istream in(&fic); - if (!fic.open((Standard_CString)(LPCTSTR)filename,ios::in)) - MessageBox(0,"Error : Unable to open file","CasCade Error",MB_ICONERROR); + if (!fic.open(filename, ios::in)) + MessageBoxW (AfxGetApp()->m_pMainWnd->m_hWnd, L"Error : Unable to open file", L"CasCade Error", MB_ICONERROR); Standard_Real x,y,z; BRep_Builder B; TopoDS_Compound C; @@ -4980,7 +4969,7 @@ void CModelingDoc::InputEvent(const Standard_Integer /*x*/, Standard_Integer Order = 3; // constraints continuity + 2 aPlate.SolveTI(Order,1.); if (!aPlate.IsDone()){ - MessageBox(0,"Error : Build plate not valid!","CasCade Error",MB_ICONERROR); + MessageBoxW (AfxGetApp()->m_pMainWnd->m_hWnd, L"Error : Build plate not valid!", L"CasCade Error", MB_ICONERROR); return; } //Plate Surface creation @@ -5025,7 +5014,7 @@ void CModelingDoc::InputEvent(const Standard_Integer /*x*/, theFace = BRepBuilderAPI_MakeFace(theWire); BRepLib::BuildCurves3d(theFace); if (!BRepAlgo::IsValid(theFace)) - MessageBox(AfxGetApp()->m_pMainWnd->m_hWnd,"Error : The plate surface is not valid!!!","CasCade Error",MB_ICONERROR); + MessageBoxW (AfxGetApp()->m_pMainWnd->m_hWnd, L"Error : The plate surface is not valid!!!", L"CasCade Error", MB_ICONERROR); } Handle_AIS_Shape anAISShape=new AIS_Shape(theFace); @@ -5036,7 +5025,7 @@ void CModelingDoc::InputEvent(const Standard_Integer /*x*/, myState = -1; } else - AfxMessageBox("Select an edge on the second face!"); + AfxMessageBox (L"Select an edge on the second face!"); ((OCC_MainFrame*)AfxGetMainWnd())->SetStatusMessage(""); } diff --git a/samples/mfc/standard/03_Viewer2d/CMakeLists.txt b/samples/mfc/standard/03_Viewer2d/CMakeLists.txt index 9819c85e59..c271e83825 100644 --- a/samples/mfc/standard/03_Viewer2d/CMakeLists.txt +++ b/samples/mfc/standard/03_Viewer2d/CMakeLists.txt @@ -2,7 +2,8 @@ cmake_minimum_required (VERSION 2.6) project (Viewer2d) -add_definitions (-DWINVER=0x0500) +add_definitions (-DWINVER=0x0501 -DUNICODE -D_UNICODE) +set (CMAKE_MFC_FLAG 2) set (Viewer2d_SOURCE_DIR ${MFC_STANDARD_SAMPLES_DIR}/03_Viewer2d/src) set (Viewer2d_HEADER_FILES ${Viewer2d_SOURCE_DIR}/Viewer2dApp.h diff --git a/samples/mfc/standard/03_Viewer2d/adm/win/vc10/Viewer2d.vcxproj b/samples/mfc/standard/03_Viewer2d/adm/win/vc10/Viewer2d.vcxproj index e1465b5e1f..b375707b9e 100644 --- a/samples/mfc/standard/03_Viewer2d/adm/win/vc10/Viewer2d.vcxproj +++ b/samples/mfc/standard/03_Viewer2d/adm/win/vc10/Viewer2d.vcxproj @@ -27,22 +27,22 @@ Application Dynamic - MultiByte + Unicode Application Dynamic - MultiByte + Unicode Application Dynamic - MultiByte + Unicode Application Dynamic - MultiByte + Unicode diff --git a/samples/mfc/standard/03_Viewer2d/adm/win/vc11/Viewer2d.vcxproj b/samples/mfc/standard/03_Viewer2d/adm/win/vc11/Viewer2d.vcxproj index 1553f60f7a..429c8e449a 100644 --- a/samples/mfc/standard/03_Viewer2d/adm/win/vc11/Viewer2d.vcxproj +++ b/samples/mfc/standard/03_Viewer2d/adm/win/vc11/Viewer2d.vcxproj @@ -27,25 +27,25 @@ Application Dynamic - MultiByte + Unicode v110 Application Dynamic - MultiByte + Unicode v110 Application Dynamic - MultiByte + Unicode v110 Application Dynamic - MultiByte + Unicode v110 @@ -97,7 +97,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) + NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -139,7 +139,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) + NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -180,7 +180,7 @@ Disabled ..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) + _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -222,7 +222,7 @@ Disabled ..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) + _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use diff --git a/samples/mfc/standard/03_Viewer2d/adm/win/vc12/Viewer2d.vcxproj b/samples/mfc/standard/03_Viewer2d/adm/win/vc12/Viewer2d.vcxproj new file mode 100644 index 0000000000..be1d15dee4 --- /dev/null +++ b/samples/mfc/standard/03_Viewer2d/adm/win/vc12/Viewer2d.vcxproj @@ -0,0 +1,354 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {6B905DC2-4E72-4EDA-99C2-7473634690FE} + Viewer2d + MFCProj + + + + Application + Dynamic + Unicode + v120 + + + Application + Dynamic + Unicode + v120 + + + Application + Dynamic + Unicode + v120 + + + Application + Dynamic + Unicode + v120 + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + ../../../../win32\vc12\bin\ + .\win32\obj\ + false + ../../../../win64\vc12\bin\ + .\win64\obj\ + false + ../../../../win32\vc12\bind\ + .\win32\objd\ + true + ../../../../win64\vc12\bind\ + .\win64\objd\ + true + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\win32\obj/Viewer2d.tlb + + + + + MaxSpeed + OnlyExplicitInline + ..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + Use + stdafx.h + .\win32\obj/Viewer2d.pch + .\win32\obj/ + .\win32\obj/ + .\win32\obj/ + Level4 + true + Default + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + ../../../../win32\vc12\bin/Viewer2d.exe + true + ..\..\..\..\win32\vc12\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories) + ../../../../win32\vc12\bin/Viewer2d.pdb + Windows + MachineX86 + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + X64 + .\win64\obj/Viewer2d.tlb + + + + + MaxSpeed + OnlyExplicitInline + ..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + Use + stdafx.h + .\win64\obj/Viewer2d.pch + .\win64\obj/ + .\win64\obj/ + .\win64\obj/ + Level4 + true + Default + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + ../../../../win64\vc12\bin/Viewer2d.exe + true + ..\..\..\..\win64\vc12\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories) + ../../../../win64\vc12\bin/Viewer2d.pdb + Windows + MachineX64 + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\win32\objd/Viewer2d.tlb + + + + + Disabled + ..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + Use + stdafx.h + .\win32\objd/Viewer2d.pch + .\win32\objd/ + .\win32\objd/ + .\win32\objd/ + Level4 + true + EditAndContinue + Default + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + ../../../../win32\vc12\bind/Viewer2d.exe + true + ..\..\..\..\win32\vc12\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories) + true + ../../../../win32\vc12\bind/Viewer2d.pdb + Windows + MachineX86 + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + X64 + .\win64\objd/Viewer2d.tlb + + + + + Disabled + ..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + Use + stdafx.h + .\win64\objd/Viewer2d.pch + .\win64\objd/ + .\win64\objd/ + .\win64\objd/ + Level4 + true + ProgramDatabase + Default + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + ../../../../win64\vc12\bind/Viewer2d.exe + true + ..\..\..\..\win64\vc12\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories) + true + ../../../../win64\vc12\bind/Viewer2d.pdb + Windows + MachineX64 + + + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Create + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Create + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + Create + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + Create + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + + + %(PreprocessorDefinitions) + res;%(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + res;%(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + res;%(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + res;%(AdditionalIncludeDirectories) + + + + + + + + + + + + + + {2d6cbbe8-6965-4016-b503-0d715ae26691} + false + + + + + + \ No newline at end of file diff --git a/samples/mfc/standard/03_Viewer2d/adm/win/vc12/Viewer2d.vcxproj.filters b/samples/mfc/standard/03_Viewer2d/adm/win/vc12/Viewer2d.vcxproj.filters new file mode 100644 index 0000000000..77f8789975 --- /dev/null +++ b/samples/mfc/standard/03_Viewer2d/adm/win/vc12/Viewer2d.vcxproj.filters @@ -0,0 +1,55 @@ + + + + + {a5fbdc06-d5d7-4c8a-b829-e986d5c86642} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + {c7319851-4cde-42ce-b4aa-8b7ddd5f0c21} + h;hpp;hxx;hm;inl + + + {ffedd656-2b68-4a6e-8df3-973a1a5b136e} + ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Resource Files + + + \ No newline at end of file diff --git a/samples/mfc/standard/03_Viewer2d/adm/win/vc8/Viewer2d.vcproj b/samples/mfc/standard/03_Viewer2d/adm/win/vc8/Viewer2d.vcproj index c3e8bd8375..b6b4bebdb7 100644 --- a/samples/mfc/standard/03_Viewer2d/adm/win/vc8/Viewer2d.vcproj +++ b/samples/mfc/standard/03_Viewer2d/adm/win/vc8/Viewer2d.vcproj @@ -26,7 +26,7 @@ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="2" ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" + CharacterSet="1" > 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()) diff --git a/samples/mfc/standard/04_Viewer3d/CMakeLists.txt b/samples/mfc/standard/04_Viewer3d/CMakeLists.txt index 7b87f98ebe..42e4df4986 100644 --- a/samples/mfc/standard/04_Viewer3d/CMakeLists.txt +++ b/samples/mfc/standard/04_Viewer3d/CMakeLists.txt @@ -2,7 +2,8 @@ cmake_minimum_required (VERSION 2.6) project (Viewer3d) -add_definitions (-DWINVER=0x0500) +add_definitions (-DWINVER=0x0501 -DUNICODE -D_UNICODE) +set (CMAKE_MFC_FLAG 2) set (Viewer3d_SRC_DIR ${MFC_STANDARD_SAMPLES_DIR}/04_Viewer3d/src) set (Viewer3d_HEADER_FILES ${Viewer3d_SRC_DIR}/BoxRadius.h diff --git a/samples/mfc/standard/04_Viewer3d/adm/win/vc10/Viewer3d.vcxproj b/samples/mfc/standard/04_Viewer3d/adm/win/vc10/Viewer3d.vcxproj index fe0e4b35cd..4920197d5f 100644 --- a/samples/mfc/standard/04_Viewer3d/adm/win/vc10/Viewer3d.vcxproj +++ b/samples/mfc/standard/04_Viewer3d/adm/win/vc10/Viewer3d.vcxproj @@ -27,22 +27,22 @@ Application Dynamic - MultiByte + Unicode Application Dynamic - MultiByte + Unicode Application Dynamic - MultiByte + Unicode Application Dynamic - MultiByte + Unicode diff --git a/samples/mfc/standard/04_Viewer3d/adm/win/vc11/Viewer3d.vcxproj b/samples/mfc/standard/04_Viewer3d/adm/win/vc11/Viewer3d.vcxproj index de2328b3d1..9b7d9049ec 100644 --- a/samples/mfc/standard/04_Viewer3d/adm/win/vc11/Viewer3d.vcxproj +++ b/samples/mfc/standard/04_Viewer3d/adm/win/vc11/Viewer3d.vcxproj @@ -27,25 +27,25 @@ Application Dynamic - MultiByte + Unicode v110 Application Dynamic - MultiByte + Unicode v110 Application Dynamic - MultiByte + Unicode v110 Application Dynamic - MultiByte + Unicode v110 @@ -97,7 +97,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) + NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -139,7 +139,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) + NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -180,7 +180,7 @@ Disabled ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) + _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -223,7 +223,7 @@ Disabled ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) + _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use diff --git a/samples/mfc/standard/04_Viewer3d/adm/win/vc12/Viewer3d.vcxproj b/samples/mfc/standard/04_Viewer3d/adm/win/vc12/Viewer3d.vcxproj new file mode 100644 index 0000000000..8d2203de99 --- /dev/null +++ b/samples/mfc/standard/04_Viewer3d/adm/win/vc12/Viewer3d.vcxproj @@ -0,0 +1,530 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {949DFBDF-9007-4C88-8925-43209C36A5D6} + Viewer3d + MFCProj + + + + Application + Dynamic + Unicode + v120 + + + Application + Dynamic + Unicode + v120 + + + Application + Dynamic + Unicode + v120 + + + Application + Dynamic + Unicode + v120 + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + ../../../../win32\vc12\bin\ + .\win32\obj\ + false + ../../../../win64\vc12\bin\ + .\win64\obj\ + false + ../../../../win32\vc12\bind\ + .\win32\objd\ + true + ../../../../win64\vc12\bind\ + .\win64\objd\ + true + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\win32\obj/Viewer3d.tlb + + + + + MaxSpeed + OnlyExplicitInline + ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + Use + stdafx.h + .\win32\obj/Viewer3d.pch + .\win32\obj/ + .\win32\obj/ + .\win32\obj/ + Level4 + true + Default + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + ../../../../win32\vc12\bin/Viewer3d.exe + true + ..\..\..\..\win32\vc12\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories) + ../../../../win32\vc12\bin/Viewer3d.pdb + Windows + MachineX86 + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + X64 + .\win64\obj/Viewer3d.tlb + + + + + MaxSpeed + OnlyExplicitInline + ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + Use + stdafx.h + .\win64\obj/Viewer3d.pch + .\win64\obj/ + .\win64\obj/ + .\win64\obj/ + Level4 + true + Default + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + ../../../../win64\vc12\bin/Viewer3d.exe + true + ..\..\..\..\win64\vc12\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories) + ../../../../win64\vc12\bin/Viewer3d.pdb + Windows + MachineX64 + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\win32\objd/Viewer3d.tlb + + + + + Disabled + ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + Use + stdafx.h + .\win32\objd/Viewer3d.pch + .\win32\objd/ + .\win32\objd/ + .\win32\objd/ + true + Level4 + true + EditAndContinue + Default + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + ../../../../win32\vc12\bind/Viewer3d.exe + true + ..\..\..\..\win32\vc12\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories) + true + ../../../../win32\vc12\bind/Viewer3d.pdb + Windows + MachineX86 + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + X64 + .\win64\objd/Viewer3d.tlb + + + + + Disabled + ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + Use + stdafx.h + .\win64\objd/Viewer3d.pch + .\win64\objd/ + .\win64\objd/ + .\win64\objd/ + true + Level4 + true + ProgramDatabase + Default + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + ../../../../win64\vc12\bind/Viewer3d.exe + true + ..\..\..\..\win64\vc12\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories) + true + ../../../../win64\vc12\bind/Viewer3d.pdb + Windows + MachineX64 + + + + + + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + true + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + true + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + + Disabled + ..\res;%(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + true + Disabled + ..\res;%(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + true + MaxSpeed + ..\res;%(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + ..\res;%(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + Disabled + ..\res;%(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + true + Disabled + ..\res;%(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + true + MaxSpeed + ..\res;%(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + ..\res;%(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + true + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + true + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Create + true + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Create + true + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + Create + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + Create + + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + true + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + true + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + true + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + true + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + true + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + true + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + true + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + true + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + true + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + true + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + true + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + true + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + true + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + true + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + + + %(PreprocessorDefinitions) + src;%(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + src;%(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + src;%(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + src;%(AdditionalIncludeDirectories) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {2d6cbbe8-6965-4016-b503-0d715ae26691} + false + + + + + + \ No newline at end of file diff --git a/samples/mfc/standard/04_Viewer3d/adm/win/vc12/Viewer3d.vcxproj.filters b/samples/mfc/standard/04_Viewer3d/adm/win/vc12/Viewer3d.vcxproj.filters new file mode 100644 index 0000000000..c75f9d4ead --- /dev/null +++ b/samples/mfc/standard/04_Viewer3d/adm/win/vc12/Viewer3d.vcxproj.filters @@ -0,0 +1,145 @@ + + + + + {60965501-d2d2-46fa-bdc9-62d45562945b} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + {76f67c93-789a-4fb7-a6ca-db367749f593} + h;hpp;hxx;hm;inl + + + {e16ddbde-8cef-4e45-9ba2-e1b79da373a5} + ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Header Files + + + Resource Files + + + Resource Files + + + Resource Files + + + \ No newline at end of file diff --git a/samples/mfc/standard/04_Viewer3d/adm/win/vc8/Viewer3d.vcproj b/samples/mfc/standard/04_Viewer3d/adm/win/vc8/Viewer3d.vcproj index e81d5a9018..8d9435d746 100644 --- a/samples/mfc/standard/04_Viewer3d/adm/win/vc8/Viewer3d.vcproj +++ b/samples/mfc/standard/04_Viewer3d/adm/win/vc8/Viewer3d.vcproj @@ -26,7 +26,7 @@ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="2" ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" + CharacterSet="1" > GetDialogText(); - if (strcmp(aTextInDialog, Message.ToCString())) + if (aTextInDialog != Message.ToCString()) myDoc -> UpdateResultMessageDlg("Set offsets", Message); aAISContext->UpdateCurrentViewer(); } diff --git a/samples/mfc/standard/04_Viewer3d/src/TexturesExt_Presentation.cpp b/samples/mfc/standard/04_Viewer3d/src/TexturesExt_Presentation.cpp index 59e57a6126..5a1def4cb7 100755 --- a/samples/mfc/standard/04_Viewer3d/src/TexturesExt_Presentation.cpp +++ b/samples/mfc/standard/04_Viewer3d/src/TexturesExt_Presentation.cpp @@ -58,8 +58,8 @@ TexturesExt_Presentation::TexturesExt_Presentation() void TexturesExt_Presentation::DoSample() { - ((CViewer3dApp*) AfxGetApp())->SetSampleName("Viewer3d"); - ((CViewer3dApp*) AfxGetApp())->SetSamplePath ("..\\..\\04_Viewer3d"); + ((CViewer3dApp*) AfxGetApp())->SetSampleName (L"Viewer3d"); + ((CViewer3dApp*) AfxGetApp())->SetSamplePath (L"..\\..\\04_Viewer3d"); getAISContext()->EraseAll(); if (myIndex >=0 && myIndex < myNbSamples) { @@ -152,7 +152,8 @@ Handle_AIS_TexturedShape TexturesExt_Presentation::Texturize(const TopoDS_Shape& initfile += aTFileName.ToCString(); } - aTShape->SetTextureFileName((Standard_CString)(LPCTSTR)initfile); + TCollection_ExtendedString aFileName ((Standard_ExtString )(const wchar_t* )initfile); + aTShape->SetTextureFileName (TCollection_AsciiString (aFileName, '?')); // do other initialization of AIS_TexturedShape aTShape->SetTextureMapOn(); @@ -178,18 +179,21 @@ Standard_Boolean TexturesExt_Presentation::loadShape(TopoDS_Shape& aShape, initfile += "\\Data\\"; initfile += aFileName.ToCString(); - TCollection_AsciiString Path((Standard_CString)(LPCTSTR)initfile); - + std::filebuf aFileBuf; + std::istream aStream (&aFileBuf); + if (!aFileBuf.open (initfile, ios::in)) + { + initfile += L" was not found. The sample can not be shown."; + getDocument()->UpdateResultMessageDlg ("Textured Shape", initfile); + return Standard_False; + } BRep_Builder aBld; - //Standard_Boolean isRead = BRepTools::Read (aShape, aPath.ToCString(), aBld); - //if (!isRead) - // isRead = BRepTools::Read (aShape, bPath.ToCString(), aBld); - Standard_Boolean isRead = BRepTools::Read (aShape, Path.ToCString(), aBld); - if (!isRead) + BRepTools::Read (aShape, aStream, aBld); + if (aShape.IsNull()) { - Path += " was not found. The sample can not be shown."; - getDocument()->UpdateResultMessageDlg("Textured Shape", Path.ToCString()); + initfile += " is invalid. The sample can not be shown."; + getDocument()->UpdateResultMessageDlg ("Textured Shape", initfile); return Standard_False; } diff --git a/samples/mfc/standard/04_Viewer3d/src/TrihedronDlg.cpp b/samples/mfc/standard/04_Viewer3d/src/TrihedronDlg.cpp index 505341c277..db12fde046 100755 --- a/samples/mfc/standard/04_Viewer3d/src/TrihedronDlg.cpp +++ b/samples/mfc/standard/04_Viewer3d/src/TrihedronDlg.cpp @@ -134,26 +134,26 @@ BOOL CTrihedronDlg::OnInitDialog() UpdateData(TRUE); // Initializing the ComboBox : Position - m_ComboTrihedronPosList.InsertString(-1,"Center"); - m_ComboTrihedronPosList.InsertString(-1,"Left Lower"); - m_ComboTrihedronPosList.InsertString(-1,"Left Upper"); - m_ComboTrihedronPosList.InsertString(-1,"Right Lower"); - m_ComboTrihedronPosList.InsertString(-1,"Right Upper"); + m_ComboTrihedronPosList.InsertString(-1, L"Center"); + m_ComboTrihedronPosList.InsertString(-1, L"Left Lower"); + m_ComboTrihedronPosList.InsertString(-1, L"Left Upper"); + m_ComboTrihedronPosList.InsertString(-1, L"Right Lower"); + m_ComboTrihedronPosList.InsertString(-1, L"Right Upper"); // Initializing the ComboBox : Color /* - m_ComboTrihedronColorList.InsertString(-1,"BLACK"); - m_ComboTrihedronColorList.InsertString(-1,"MATRABLUE"); - m_ComboTrihedronColorList.InsertString(-1,"MATRAGRAY"); - m_ComboTrihedronColorList.InsertString(-1,"ALICE BLUE"); - m_ComboTrihedronColorList.InsertString(-1,"WHITE"); - m_ComboTrihedronColorList.InsertString(-1,"BISQUE"); + m_ComboTrihedronColorList.InsertString(-1, L"BLACK"); + m_ComboTrihedronColorList.InsertString(-1, L"MATRABLUE"); + m_ComboTrihedronColorList.InsertString(-1, L"MATRAGRAY"); + m_ComboTrihedronColorList.InsertString(-1, L"ALICE BLUE"); + m_ComboTrihedronColorList.InsertString(-1, L"WHITE"); + m_ComboTrihedronColorList.InsertString(-1, L"BISQUE"); */ - m_ComboTrihedronColorList.InsertString(-1,"Black"); - m_ComboTrihedronColorList.InsertString(-1,"Blue"); - m_ComboTrihedronColorList.InsertString(-1,"Gray"); - m_ComboTrihedronColorList.InsertString(-1,"White"); - //m_ComboTrihedronColorList.InsertString(-1,"Bisque"); + m_ComboTrihedronColorList.InsertString(-1, L"Black"); + m_ComboTrihedronColorList.InsertString(-1, L"Blue"); + m_ComboTrihedronColorList.InsertString(-1, L"Gray"); + m_ComboTrihedronColorList.InsertString(-1, L"White"); + //m_ComboTrihedronColorList.InsertString(-1, L"Bisque"); diff --git a/samples/mfc/standard/04_Viewer3d/src/Viewer3dApp.cpp b/samples/mfc/standard/04_Viewer3d/src/Viewer3dApp.cpp index a8c4cb6300..36834f8b2d 100755 --- a/samples/mfc/standard/04_Viewer3d/src/Viewer3dApp.cpp +++ b/samples/mfc/standard/04_Viewer3d/src/Viewer3dApp.cpp @@ -29,7 +29,7 @@ END_MESSAGE_MAP() CViewer3dApp::CViewer3dApp() : OCC_App() { SampleName = "Viewer3d"; //for about dialog - SetSamplePath ("..\\..\\03_Viewer3d"); + SetSamplePath (L"..\\..\\03_Viewer3d"); } ///////////////////////////////////////////////////////////////////////////// diff --git a/samples/mfc/standard/04_Viewer3d/src/Viewer3dDoc.cpp b/samples/mfc/standard/04_Viewer3d/src/Viewer3dDoc.cpp index 6aa782fd44..52698d2529 100755 --- a/samples/mfc/standard/04_Viewer3d/src/Viewer3dDoc.cpp +++ b/samples/mfc/standard/04_Viewer3d/src/Viewer3dDoc.cpp @@ -131,12 +131,17 @@ void CViewer3dDoc::Dump(CDumpContext& dc) const ///////////////////////////////////////////////////////////////////////////// // CViewer3dDoc commands -void CViewer3dDoc::UpdateResultMessageDlg(CString Title, TCollection_AsciiString aMessage) +void CViewer3dDoc::UpdateResultMessageDlg (CString theTitle, const TCollection_AsciiString& theMessage) { - CString text(aMessage.ToCString()); - myCResultDialog.SetText(text); + CString aText (theMessage.ToCString()); + myCResultDialog.SetText (aText); + myCResultDialog.SetTitle(theTitle); +} - myCResultDialog.SetTitle(Title); +void CViewer3dDoc::UpdateResultMessageDlg(CString theTitle, CString theMessage) +{ + myCResultDialog.SetText (theMessage); + myCResultDialog.SetTitle(theTitle); } void CViewer3dDoc::OnBox() @@ -580,7 +585,7 @@ void CViewer3dDoc::InputEvent(const Standard_Integer /*x*/, " Methods SetPlanarFaceColor and SetCylindricalFaceColor are also \n" " defined in the User_Cylinder class. \n" " \n"); - SetTitle("Change face color"); + SetTitle (L"Change face color"); } } @@ -718,7 +723,7 @@ void CViewer3dDoc::OnFaces() " \n" " myAISContext->ActivateStandardMode(TopAbs_FACE); \n" " \n"); - SetTitle("Standard mode: TopAbs_FACE"); + SetTitle (L"Standard mode: TopAbs_FACE"); } //Set edges selection mode @@ -733,7 +738,7 @@ void CViewer3dDoc::OnEdges() " \n" " myAISContext->ActivateStandardMode(TopAbs_EDGE); \n" " \n"); - SetTitle("Standard mode: TopAbs_EDGE"); + SetTitle (L"Standard mode: TopAbs_EDGE"); } // Set vertices selection mode @@ -748,7 +753,7 @@ void CViewer3dDoc::OnVertices() " \n" " myAISContext->ActivateStandardMode(TopAbs_VERTEX); \n" " \n"); - SetTitle("Standard mode: TopAbs_VERTEX"); + SetTitle (L"Standard mode: TopAbs_VERTEX"); } //Neutral selection mode @@ -759,7 +764,7 @@ void CViewer3dDoc::OnNeutral() myCResultDialog.SetTitle("Standard mode: Neutral"); myCResultDialog.SetText(" myAISContext->CloseAllContexts(); \n" " \n"); - SetTitle("Standard mode: Neutral"); + SetTitle (L"Standard mode: Neutral"); } // Change the color of faces on a user cylinder @@ -778,8 +783,8 @@ void CViewer3dDoc::OnFillet3d() { if (!myAISContext->HasOpenedContext()) { - AfxMessageBox("It is necessary to activate the edges selection mode\n" - "and select edges on an object before \nrunning this function"); + AfxMessageBox (L"It is necessary to activate the edges selection mode\n" + L"and select edges on an object before \nrunning this function"); return; } @@ -790,8 +795,8 @@ void CViewer3dDoc::OnFillet3d() if (S.IsNull()) { - AfxMessageBox("It is necessary to activate the edges selection mode\n" - "and select edges on an object before \nrunning this function"); + AfxMessageBox (L"It is necessary to activate the edges selection mode\n" + L"and select edges on an object before \nrunning this function"); return; } @@ -804,8 +809,8 @@ void CViewer3dDoc::OnFillet3d() TopoDS_Shape aSelShape = myAISContext->SelectedShape(); if (aSelShape.ShapeType() != TopAbs_EDGE) { - AfxMessageBox("It is necessary to activate the edges selection mode\n\ - and select edges on an object before \nrunning this function"); + AfxMessageBox (L"It is necessary to activate the edges selection mode\n" + L"and select edges on an object before \nrunning this function"); return; } } @@ -831,7 +836,7 @@ void CViewer3dDoc::OnFillet3d() } catch (Standard_Failure) { - AfxMessageBox("Error During Fillet computation"); + AfxMessageBox (L"Error During Fillet computation"); return; } @@ -854,7 +859,7 @@ void CViewer3dDoc::OnFillet3d() " \n" " myAISContext->Redisplay(S); \n" " \n"); - SetTitle("Make a fillet"); + SetTitle (L"Make a fillet"); } // Create and display a circle with standard tools @@ -877,7 +882,7 @@ void CViewer3dDoc::OnCircle() " \n" " myAISContext->Display(anAISCirc); \n" " \n"); - SetTitle("Create a circle"); + SetTitle (L"Create a circle"); } void CViewer3dDoc::OnLine() @@ -897,7 +902,7 @@ void CViewer3dDoc::OnLine() " \n" " myAISContext->Display(anAISLine); \n" " \n"); - SetTitle("Create a line"); + SetTitle (L"Create a line"); } void CViewer3dDoc::OnNbisos() @@ -917,7 +922,7 @@ void CViewer3dDoc::OnNbisos() " \n" " myAISContext->DefaultDrawer()->VIsoAspect()->SetNumber(dlg.m_isov); \n" " \n"); - SetTitle("Iso Aspect"); + SetTitle (L"Iso Aspect"); } } @@ -981,8 +986,7 @@ void CViewer3dDoc::DoSample() { Standard_SStream aSStream; aSStream << "An exception was caught: " << Standard_Failure::Caught() << ends; - Standard_CString aMsg = aSStream.str().c_str(); - // aSStream.rdbuf()->freeze(0); // allow deletion of dynamic array + CString aMsg = aSStream.str().c_str(); AfxMessageBox (aMsg); } } diff --git a/samples/mfc/standard/04_Viewer3d/src/Viewer3dDoc.h b/samples/mfc/standard/04_Viewer3d/src/Viewer3dDoc.h index 7ae1d25da9..76ad0e31c2 100755 --- a/samples/mfc/standard/04_Viewer3d/src/Viewer3dDoc.h +++ b/samples/mfc/standard/04_Viewer3d/src/Viewer3dDoc.h @@ -44,7 +44,8 @@ public: static void Fit(); virtual ~CViewer3dDoc(); - void UpdateResultMessageDlg(CString Title, TCollection_AsciiString aMessage); + void UpdateResultMessageDlg (CString theTitle, const TCollection_AsciiString& theMessage); + void UpdateResultMessageDlg (CString theTitle, CString theMessage); virtual BOOL OnNewDocument(); virtual void Popup (const Standard_Integer x , const Standard_Integer y , diff --git a/samples/mfc/standard/04_Viewer3d/src/Viewer3dView.cpp b/samples/mfc/standard/04_Viewer3d/src/Viewer3dView.cpp index 2930111c6c..548862ec2f 100755 --- a/samples/mfc/standard/04_Viewer3d/src/Viewer3dView.cpp +++ b/samples/mfc/standard/04_Viewer3d/src/Viewer3dView.cpp @@ -892,10 +892,9 @@ void CViewer3dView::OnDirectionalLight() // Checking if the Active lights limit number is not reached if( NbActiveLights>=myGraphicDriver->InquireLightLimit() ) { - char tmpStr[128]; - sprintf_s(tmpStr, "You have reach the limit number of active lights (%d).\n Clear lights to create new ones.", - myGraphicDriver->InquireLightLimit()); - MessageBox(tmpStr,"Light creation", MB_OK); + CString aMsg; + aMsg.Format (L"You have reach the limit number of active lights (%d).\n Clear lights to create new ones.", myGraphicDriver->InquireLightLimit()); + MessageBox (aMsg, L"Light creation", MB_OK); return; } @@ -921,10 +920,9 @@ void CViewer3dView::OnSpotLight() // Checking if the Active lights limit number is not reached if( NbActiveLights>=myGraphicDriver->InquireLightLimit() ) { - char tmpStr[128]; - sprintf_s(tmpStr, "You have reach the limit number of active lights (%d).\n Clear lights to create new ones.", - myGraphicDriver->InquireLightLimit()); - MessageBox(tmpStr,"Light creation", MB_OK); + CString aMsg; + aMsg.Format(L"You have reach the limit number of active lights (%d).\n Clear lights to create new ones.", myGraphicDriver->InquireLightLimit()); + MessageBox (aMsg, L"Light creation", MB_OK); return; } @@ -949,10 +947,9 @@ void CViewer3dView::OnPositionalLight() // Checking if the Active lights limit number is not reached if( NbActiveLights>=myGraphicDriver->InquireLightLimit() ) { - char tmpStr[128]; - sprintf_s(tmpStr, "You have reach the limit number of active lights (%d).\n Clear lights to create new ones.", - myGraphicDriver->InquireLightLimit()); - MessageBox(tmpStr,"Light creation", MB_OK); + CString aMsg; + aMsg.Format(L"You have reach the limit number of active lights (%d).\n Clear lights to create new ones.", myGraphicDriver->InquireLightLimit()); + MessageBox(aMsg, L"Light creation", MB_OK); return; } @@ -980,10 +977,9 @@ void CViewer3dView::OnAmbientLight() // Checking if the Active lights limit number is not reached if( NbActiveLights>=myGraphicDriver->InquireLightLimit() ) { - char tmpStr[128]; - sprintf_s(tmpStr, "You have reach the limit number of active lights (%d).\n Clear lights to create new ones.", - myGraphicDriver->InquireLightLimit()); - MessageBox(tmpStr,"Light creation", MB_OK); + CString aMsg; + aMsg.Format(L"You have reach the limit number of active lights (%d).\n Clear lights to create new ones.", myGraphicDriver->InquireLightLimit()); + MessageBox(aMsg, L"Light creation", MB_OK); return; } diff --git a/samples/mfc/standard/04_Viewer3d/src/ZClippingDlg.cpp b/samples/mfc/standard/04_Viewer3d/src/ZClippingDlg.cpp index e24d3e9277..273a3c3684 100755 --- a/samples/mfc/standard/04_Viewer3d/src/ZClippingDlg.cpp +++ b/samples/mfc/standard/04_Viewer3d/src/ZClippingDlg.cpp @@ -46,10 +46,10 @@ BOOL ZClippingDlg::OnInitDialog() CDialog::OnInitDialog(); // Initializing the ComboBox - m_ZClippingTypeList.InsertString(-1,"OFF"); - m_ZClippingTypeList.InsertString(-1,"BACK"); - m_ZClippingTypeList.InsertString(-1,"FRONT"); - m_ZClippingTypeList.InsertString(-1,"SLICE"); + m_ZClippingTypeList.InsertString(-1, L"OFF"); + m_ZClippingTypeList.InsertString(-1, L"BACK"); + m_ZClippingTypeList.InsertString(-1, L"FRONT"); + m_ZClippingTypeList.InsertString(-1, L"SLICE"); // Getting the type of ZClipping and select it in the ComboBox Quantity_Length Depth, Width; diff --git a/samples/mfc/standard/05_ImportExport/CMakeLists.txt b/samples/mfc/standard/05_ImportExport/CMakeLists.txt index 915f1b8e6e..7e9e8ac027 100644 --- a/samples/mfc/standard/05_ImportExport/CMakeLists.txt +++ b/samples/mfc/standard/05_ImportExport/CMakeLists.txt @@ -2,7 +2,8 @@ cmake_minimum_required (VERSION 2.6) project (ImportExport) -add_definitions (-DWINVER=0x0500) +add_definitions (-DWINVER=0x0501 -DUNICODE -D_UNICODE) +set (CMAKE_MFC_FLAG 2) set (ImportExport_SRC_DIR ${MFC_STANDARD_SAMPLES_DIR}/05_ImportExport/src) set (ImportExport_HEADER_FILES ${ImportExport_SRC_DIR}/ColoredShapes.h diff --git a/samples/mfc/standard/05_ImportExport/adm/win/vc10/ImportExport.vcxproj b/samples/mfc/standard/05_ImportExport/adm/win/vc10/ImportExport.vcxproj index 5d16c9ec84..21651e7829 100644 --- a/samples/mfc/standard/05_ImportExport/adm/win/vc10/ImportExport.vcxproj +++ b/samples/mfc/standard/05_ImportExport/adm/win/vc10/ImportExport.vcxproj @@ -27,22 +27,22 @@ Application Dynamic - MultiByte + Unicode Application Dynamic - MultiByte + Unicode Application Dynamic - MultiByte + Unicode Application Dynamic - MultiByte + Unicode diff --git a/samples/mfc/standard/05_ImportExport/adm/win/vc11/ImportExport.vcxproj b/samples/mfc/standard/05_ImportExport/adm/win/vc11/ImportExport.vcxproj index 8c8a077a72..15356f57d6 100644 --- a/samples/mfc/standard/05_ImportExport/adm/win/vc11/ImportExport.vcxproj +++ b/samples/mfc/standard/05_ImportExport/adm/win/vc11/ImportExport.vcxproj @@ -27,25 +27,25 @@ Application Dynamic - MultiByte + Unicode v110 Application Dynamic - MultiByte + Unicode v110 Application Dynamic - MultiByte + Unicode v110 Application Dynamic - MultiByte + Unicode v110 @@ -97,7 +97,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) + NDEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -139,7 +139,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - NDEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) + NDEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -180,7 +180,7 @@ Disabled ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) + _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -222,7 +222,7 @@ Disabled ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) + _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use diff --git a/samples/mfc/standard/05_ImportExport/adm/win/vc12/ImportExport.vcxproj b/samples/mfc/standard/05_ImportExport/adm/win/vc12/ImportExport.vcxproj new file mode 100644 index 0000000000..d1970df377 --- /dev/null +++ b/samples/mfc/standard/05_ImportExport/adm/win/vc12/ImportExport.vcxproj @@ -0,0 +1,358 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {1C9A05AE-AF5A-4ACE-9A72-83436D77504C} + ImportExport + MFCProj + + + + Application + Dynamic + Unicode + v120 + + + Application + Dynamic + Unicode + v120 + + + Application + Dynamic + Unicode + v120 + + + Application + Dynamic + Unicode + v120 + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + ../../../../win32\vc12\bin\ + .\win32\obj\ + false + ../../../../win64\vc12\bin\ + .\win64\objd\ + false + ../../../../win32\vc12\bind\ + .\win32\objd\ + true + ../../../../win64\vc12\bind\ + .\win64\objd\ + true + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\win32\obj/ImportExport.tlb + + + + + MaxSpeed + OnlyExplicitInline + ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + Use + stdafx.h + .\win32\obj/ImportExport.pch + .\win32\obj/ + .\win32\obj/ + .\win32\obj/ + Level4 + true + Default + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + ../../../../win32\vc12\bin/ImportExport.exe + true + ..\..\..\..\win32\vc12\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories) + ../../../../win32\vc12\bin/ImportExport.pdb + Windows + MachineX86 + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + X64 + .\win64\obj/ImportExport.tlb + + + + + MaxSpeed + OnlyExplicitInline + ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + NDEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + Use + stdafx.h + .\win64\obj/ImportExport.pch + .\win64\obj/ + .\win64\obj/ + .\win64\obj/ + Level4 + true + Default + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + ../../../../win64\vc12\bin/ImportExport.exe + true + ..\..\..\..\win64\vc12\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories) + ../../../../win64\vc12\bin/ImportExport.pdb + Windows + MachineX64 + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\win32\objd/ImportExport.tlb + + + + + Disabled + ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + Use + stdafx.h + .\win32\objd/ImportExport.pch + .\win32\objd/ + .\win32\objd/ + .\win32\objd/ + Level4 + true + EditAndContinue + Default + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + ../../../../win32\vc12\bind/ImportExport.exe + true + ..\..\..\..\win32\vc12\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories) + true + ../../../../win32\vc12\bind/ImportExport.pdb + Windows + MachineX86 + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + X64 + .\win64\objd/ImportExport.tlb + + + + + Disabled + ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + Use + stdafx.h + .\win64\objd/ImportExport.pch + .\win64\objd/ + .\win64\objd/ + .\win64\objd/ + Level4 + true + ProgramDatabase + Default + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + ../../../../win64\vc12\bind/ImportExport.exe + true + ..\..\..\..\win64\vc12\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories) + true + ../../../../win64\vc12\bind/ImportExport.pdb + Windows + MachineX64 + + + + + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Create + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Create + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + Create + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + Create + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + + + %(PreprocessorDefinitions) + res;%(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + res;%(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + res;%(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + res;%(AdditionalIncludeDirectories) + + + + + + + + + + + + + + + + {2d6cbbe8-6965-4016-b503-0d715ae26691} + false + + + + + + \ No newline at end of file diff --git a/samples/mfc/standard/05_ImportExport/adm/win/vc12/ImportExport.vcxproj.filters b/samples/mfc/standard/05_ImportExport/adm/win/vc12/ImportExport.vcxproj.filters new file mode 100644 index 0000000000..9046b4b70b --- /dev/null +++ b/samples/mfc/standard/05_ImportExport/adm/win/vc12/ImportExport.vcxproj.filters @@ -0,0 +1,66 @@ + + + + + {6fe93ff4-3fc7-4248-af1c-9d15b9b1904d} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + {0387f39d-921d-4c19-9e7d-d397e90e235a} + h;hpp;hxx;hm;inl + + + {116ea642-b0c0-4973-bfbc-4814645fe955} + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Resource Files + + + \ No newline at end of file diff --git a/samples/mfc/standard/05_ImportExport/adm/win/vc8/ImportExport.vcproj b/samples/mfc/standard/05_ImportExport/adm/win/vc8/ImportExport.vcproj index 1e5dcfb546..88001cd65c 100644 --- a/samples/mfc/standard/05_ImportExport/adm/win/vc8/ImportExport.vcproj +++ b/samples/mfc/standard/05_ImportExport/adm/win/vc8/ImportExport.vcproj @@ -26,7 +26,7 @@ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="2" ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" + CharacterSet="1" > 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 diff --git a/samples/mfc/standard/05_ImportExport/src/FSD_Archive.cxx b/samples/mfc/standard/05_ImportExport/src/FSD_Archive.cxx index ad46ee3732..16b919da0b 100755 --- a/samples/mfc/standard/05_ImportExport/src/FSD_Archive.cxx +++ b/samples/mfc/standard/05_ImportExport/src/FSD_Archive.cxx @@ -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) { diff --git a/samples/mfc/standard/05_ImportExport/src/ImportExportApp.cpp b/samples/mfc/standard/05_ImportExport/src/ImportExportApp.cpp index 63f77cf488..44e3cf703f 100755 --- a/samples/mfc/standard/05_ImportExport/src/ImportExportApp.cpp +++ b/samples/mfc/standard/05_ImportExport/src/ImportExportApp.cpp @@ -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(); diff --git a/samples/mfc/standard/06_Ocaf/CMakeLists.txt b/samples/mfc/standard/06_Ocaf/CMakeLists.txt index e0d27fc001..c19a8c818c 100644 --- a/samples/mfc/standard/06_Ocaf/CMakeLists.txt +++ b/samples/mfc/standard/06_Ocaf/CMakeLists.txt @@ -2,7 +2,8 @@ cmake_minimum_required (VERSION 2.6) project (Ocaf) -add_definitions (-DWINVER=0x0500) +add_definitions (-DWINVER=0x0501 -DUNICODE -D_UNICODE) +set (CMAKE_MFC_FLAG 2) set (Ocaf_SRC_DIR ${MFC_STANDARD_SAMPLES_DIR}/06_Ocaf/src) set (Ocaf_HEADER_FILES ${Ocaf_SRC_DIR}/NewBoxDlg.h diff --git a/samples/mfc/standard/06_Ocaf/adm/win/vc10/Ocaf.vcxproj b/samples/mfc/standard/06_Ocaf/adm/win/vc10/Ocaf.vcxproj index cb9f2ecbe1..a30f3bbda6 100644 --- a/samples/mfc/standard/06_Ocaf/adm/win/vc10/Ocaf.vcxproj +++ b/samples/mfc/standard/06_Ocaf/adm/win/vc10/Ocaf.vcxproj @@ -27,22 +27,22 @@ Application Dynamic - MultiByte + Unicode Application Dynamic - MultiByte + Unicode Application Dynamic - MultiByte + Unicode Application Dynamic - MultiByte + Unicode diff --git a/samples/mfc/standard/06_Ocaf/adm/win/vc11/Ocaf.vcxproj b/samples/mfc/standard/06_Ocaf/adm/win/vc11/Ocaf.vcxproj index 52ba30379c..2b381afdef 100644 --- a/samples/mfc/standard/06_Ocaf/adm/win/vc11/Ocaf.vcxproj +++ b/samples/mfc/standard/06_Ocaf/adm/win/vc11/Ocaf.vcxproj @@ -27,25 +27,25 @@ Application Dynamic - MultiByte + Unicode v110 Application Dynamic - MultiByte + Unicode v110 Application Dynamic - MultiByte + Unicode v110 Application Dynamic - MultiByte + Unicode v110 @@ -97,7 +97,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CSF_OPT_INC);$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) + NDEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -139,7 +139,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CSF_OPT_INC);$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories) - NDEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) + NDEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -180,7 +180,7 @@ Disabled ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CSF_OPT_INC);$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) + _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -222,7 +222,7 @@ Disabled ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CSF_OPT_INC);$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) + _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use diff --git a/samples/mfc/standard/06_Ocaf/adm/win/vc12/Ocaf.vcxproj b/samples/mfc/standard/06_Ocaf/adm/win/vc12/Ocaf.vcxproj new file mode 100644 index 0000000000..8b54b39432 --- /dev/null +++ b/samples/mfc/standard/06_Ocaf/adm/win/vc12/Ocaf.vcxproj @@ -0,0 +1,493 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {B3C10EF6-42C7-4DB8-A49C-7E38255D5B1B} + Ocaf + MFCProj + + + + Application + Dynamic + Unicode + v120 + + + Application + Dynamic + Unicode + v120 + + + Application + Dynamic + Unicode + v120 + + + Application + Dynamic + Unicode + v120 + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + ../../../../win32\vc12\bin\ + .\win32\obj\ + false + ../../../../win64\vc12\bin\ + .\win64\obj\ + false + ../../../../win32\vc12\bind\ + .\win32\objd\ + true + ../../../../win64\vc12\bind\ + .\win64\objd\ + true + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\win32\obj/Ocaf.tlb + + + + + MaxSpeed + OnlyExplicitInline + ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CSF_OPT_INC);$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + Use + stdafx.h + .\win32\obj/Ocaf.pch + .\win32\obj/ + .\win32\obj/ + .\win32\obj/ + Level4 + true + Default + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;TKBO.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + ../../../../win32\vc12\bin/Ocaf.exe + true + ..\..\..\..\win32\vc12\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories) + ../../../../win32\vc12\bin/Ocaf.pdb + Windows + MachineX86 + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + X64 + .\win64\obj/Ocaf.tlb + + + + + MaxSpeed + OnlyExplicitInline + ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CSF_OPT_INC);$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories) + NDEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + Use + stdafx.h + .\win64\obj/Ocaf.pch + .\win64\obj/ + .\win64\obj/ + .\win64\obj/ + Level4 + true + Default + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;TKBO.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + ../../../../win64\vc12\bin/Ocaf.exe + true + ..\..\..\..\win64\vc12\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories) + ../../../../win64\vc12\bin/Ocaf.pdb + Windows + MachineX64 + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\win32\objd/Ocaf.tlb + + + + + Disabled + ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CSF_OPT_INC);$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + Use + stdafx.h + .\win32\objd/Ocaf.pch + .\win32\objd/ + .\win32\objd/ + .\win32\objd/ + Level4 + true + EditAndContinue + Default + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;TKBO.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + ../../../../win32\vc12\bind/Ocaf.exe + true + ..\..\..\..\win32\vc12\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories) + true + ../../../../win32\vc12\bind/Ocaf.pdb + Windows + MachineX86 + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + X64 + .\win64\objd/Ocaf.tlb + + + + + Disabled + ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CSF_OPT_INC);$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories) + _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + Use + stdafx.h + .\win64\objd/Ocaf.pch + .\win64\objd/ + .\win64\objd/ + .\win64\objd/ + Level4 + true + ProgramDatabase + Default + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;TKBO.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + ../../../../win64\vc12\bind/Ocaf.exe + true + ..\..\..\..\win64\vc12\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories) + true + ../../../../win64\vc12\bind/Ocaf.pdb + Windows + MachineX64 + + + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Create + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Create + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + Create + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + Create + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + + + %(PreprocessorDefinitions) + res;%(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + res;%(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + res;%(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + res;%(AdditionalIncludeDirectories) + + + + + + + + + + + + + + + + + + + + + + + + + {2d6cbbe8-6965-4016-b503-0d715ae26691} + false + + + + + + \ No newline at end of file diff --git a/samples/mfc/standard/06_Ocaf/adm/win/vc12/Ocaf.vcxproj.filters b/samples/mfc/standard/06_Ocaf/adm/win/vc12/Ocaf.vcxproj.filters new file mode 100644 index 0000000000..1d3ba64324 --- /dev/null +++ b/samples/mfc/standard/06_Ocaf/adm/win/vc12/Ocaf.vcxproj.filters @@ -0,0 +1,112 @@ + + + + + {3c30d6ca-d9bc-459f-99b6-9cc644fb9093} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + {84ea6fae-dd93-4f6d-b50f-ed88ccc5ce98} + h;hpp;hxx;hm;inl + + + {185b7bc3-efac-469b-960c-918d0e30bc03} + ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + \ No newline at end of file diff --git a/samples/mfc/standard/06_Ocaf/adm/win/vc8/Ocaf.vcproj b/samples/mfc/standard/06_Ocaf/adm/win/vc8/Ocaf.vcproj index bbfb14036d..b42f7e96e4 100644 --- a/samples/mfc/standard/06_Ocaf/adm/win/vc8/Ocaf.vcproj +++ b/samples/mfc/standard/06_Ocaf/adm/win/vc8/Ocaf.vcproj @@ -26,7 +26,7 @@ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="2" ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" + CharacterSet="1" > NewCommand(); TOcaf_Commands TSC(D->Main()); - TCollection_AsciiString Name((Standard_CString)(LPCTSTR)Dlg.m_Name); - // Create a new box using the CNewBoxDlg Dialog parameters as attributes - TDF_Label L=TSC.CreateBox(Dlg.m_x, Dlg.m_y, Dlg.m_z, Dlg.m_w, Dlg.m_l, Dlg.m_h, TCollection_ExtendedString(Name)); + TDF_Label L = TSC.CreateBox (Dlg.m_x, Dlg.m_y, Dlg.m_z, Dlg.m_w, Dlg.m_l, Dlg.m_h, + TCollection_ExtendedString ((Standard_ExtString )(const wchar_t* )Dlg.m_Name)); // Get the TPrsStd_AISPresentation of the new box TNaming_NamedShape Handle(TPrsStd_AISPresentation) prs= TPrsStd_AISPresentation::Set(L, TNaming_NamedShape::GetID()); @@ -269,10 +268,9 @@ void COcafDoc::OnCreatecyl() D->NewCommand(); TOcaf_Commands TSC(D->Main()); - TCollection_AsciiString Name((Standard_CString)(LPCTSTR)Dlg.m_Name); - // Create a new box using the CNewCylDlg Dialog parameters as attributes - TDF_Label L=TSC.CreateCyl(Dlg.m_x, Dlg.m_y, Dlg.m_z, Dlg.m_r, Dlg.m_h, TCollection_ExtendedString(Name)); + TDF_Label L = TSC.CreateCyl (Dlg.m_x, Dlg.m_y, Dlg.m_z, Dlg.m_r, Dlg.m_h, + TCollection_ExtendedString ((Standard_ExtString )(const wchar_t* )Dlg.m_Name)); // Get the TPrsStd_AISPresentation of the new cylinder TNaming_NamedShape Handle(TPrsStd_AISPresentation) prs= TPrsStd_AISPresentation::Set(L, TNaming_NamedShape::GetID()); @@ -331,7 +329,7 @@ void COcafDoc::OnModify() Handle(TFunction_Function) TFF; if ( !LabObject.FindAttribute(TFunction_Function::GetID(),TFF) ) { - MessageBox(0,"Object cannot be modify.", "Modification", MB_ICONEXCLAMATION); + MessageBoxW (AfxGetApp()->m_pMainWnd->m_hWnd, L"Object cannot be modify.", L"Modification", MB_ICONEXCLAMATION); return; } // Get the Standard_GUID of the TFunction_FunctionDriver of the selected object TFunction_Function attribute @@ -388,11 +386,10 @@ Handle(TFunction_Function) TFF; \n\ // Open a new command (for undo) D->NewCommand(); - TCollection_AsciiString Name((Standard_CString)(LPCTSTR)Dlg.m_Name); - // Modify the box TOcaf_Commands TSC(LabObject); - TSC.ModifyBox(Dlg.m_x, Dlg.m_y, Dlg.m_z, Dlg.m_w, Dlg.m_l, Dlg.m_h, TCollection_ExtendedString(Name), log); + TSC.ModifyBox (Dlg.m_x, Dlg.m_y, Dlg.m_z, Dlg.m_w, Dlg.m_l, Dlg.m_h, + TCollection_ExtendedString ((Standard_ExtString )(const wchar_t* )Dlg.m_Name), log); // Get the presentation of the box, display it and set it selected Handle(TPrsStd_AISPresentation) prs= TPrsStd_AISPresentation::Set(LabObject, TNaming_NamedShape::GetID()); @@ -474,11 +471,10 @@ D->CommitCommand(); \n\ // Open a new command (for undo) D->NewCommand(); - TCollection_AsciiString Name((Standard_CString)(LPCTSTR)Dlg.m_Name); - // Modify the cylinder TOcaf_Commands TSC(LabObject); - TSC.ModifyCyl(Dlg.m_x, Dlg.m_y, Dlg.m_z, Dlg.m_r, Dlg.m_h, TCollection_ExtendedString(Name), log); + TSC.ModifyCyl (Dlg.m_x, Dlg.m_y, Dlg.m_z, Dlg.m_r, Dlg.m_h, + TCollection_ExtendedString ((Standard_ExtString )(const wchar_t* )Dlg.m_Name), log); // Get the presentation of the cylinder, display it and set it selected Handle(TPrsStd_AISPresentation) prs= TPrsStd_AISPresentation::Set(LabObject, TNaming_NamedShape::GetID()); @@ -591,11 +587,11 @@ D->CommitCommand(); \n\ myAISContext->UpdateCurrentViewer(); return; } - TCollection_AsciiString Name((Standard_CString)(LPCTSTR)Dlg.m_Name); // Modify the cylinder TOcaf_Commands ToolTSC(ToolLab); - ToolTSC.ModifyCyl(Dlg.m_x, Dlg.m_y, Dlg.m_z, Dlg.m_r, Dlg.m_h, TCollection_ExtendedString(Name), log); + ToolTSC.ModifyCyl (Dlg.m_x, Dlg.m_y, Dlg.m_z, Dlg.m_r, Dlg.m_h, + TCollection_ExtendedString ((Standard_ExtString )(const wchar_t* )Dlg.m_Name), log); // Redisplay the modified Tool object TDataStd_Integer::Set(ToolLab, 1); @@ -613,7 +609,7 @@ D->CommitCommand(); \n\ // { log.SetTouched(LabObject); if(myCutDriver->Execute(log)) - MessageBox(0,"Recompute failed","Modify cut",MB_ICONEXCLAMATION); + MessageBoxW (AfxGetApp()->m_pMainWnd->m_hWnd, L"Recompute failed", L"Modify cut", MB_ICONEXCLAMATION); // } // Erase the Original object and the Tool objectedisplay the modified Tool object @@ -672,7 +668,7 @@ D->CommitCommand(); \n\ } else { - MessageBox(0,"No associated function driver","Modify",MB_OK); + MessageBoxW (AfxGetApp()->m_pMainWnd->m_hWnd, L"No associated function driver", L"Modify", MB_OK); } CString text(Message.ToCString()); @@ -902,8 +898,8 @@ void COcafDoc::OnCloseDocument() void COcafDoc::OnFileSaveAs() { - Standard_CString SPathName = (Standard_CString) (LPCTSTR) PathName; - TCollection_ExtendedString TPathName(SPathName); + const wchar_t* SPathName = PathName; + TCollection_ExtendedString TPathName ((Standard_ExtString )SPathName); CString Filter; @@ -918,11 +914,10 @@ void COcafDoc::OnFileSaveAs() } CFileDialog dlg(FALSE, - "std", + L"std", GetTitle(), OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT, Filter, -// "std Files (*.std)|*.std; |All Files (*.*)|*.*||", NULL ); @@ -934,13 +929,10 @@ void COcafDoc::OnFileSaveAs() CWaitCursor aWaitCursor; CString CSPath = dlg.GetPathName(); -// if((CSPath.Find(CString(".std")))==-1 ) -// CSPath = CSPath + ".std"; - cout << "Save As " << CSPath << endl; PathName=CSPath; - Standard_CString SPath = (Standard_CString) (LPCTSTR) CSPath; - TCollection_ExtendedString TPath(SPath); + const wchar_t* SPath = CSPath; + TCollection_ExtendedString TPath ((Standard_ExtString )SPath); if (TPath.SearchFromEnd(".xml") > 0) { @@ -965,7 +957,7 @@ void COcafDoc::OnFileSaveAs() } catch(...) { - AfxMessageBox("Error! The file wasn't saved."); + AfxMessageBox (L"Error! The file wasn't saved."); return; } // // save the document in the current application @@ -994,14 +986,14 @@ void COcafDoc::OnFileSave() if (myOcafDoc.IsNull()) { - AfxMessageBox("Error during saving! Empty document."); + AfxMessageBox (L"Error during saving! Empty document."); return; } if(PathName!="") { - Standard_CString SPath = (Standard_CString) (LPCTSTR) PathName; - TCollection_ExtendedString TPath(SPath); + const wchar_t* SPath = PathName; + TCollection_ExtendedString TPath ((Standard_ExtString )SPath); if (TPath.SearchFromEnd(".xml") > 0) { @@ -1026,7 +1018,7 @@ void COcafDoc::OnFileSave() } catch(...) { - AfxMessageBox("Error! The file wasn't saved."); + AfxMessageBox (L"Error! The file wasn't saved."); return; } @@ -1046,11 +1038,10 @@ m_App->SaveAs(myOcafDoc,(TCollection_ExtendedString) TPath); \n\ } CFileDialog dlg(FALSE, - "std", + L"std", GetTitle(), OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT, - "OCAFSample(STD) (*.std)|*.std|OCAFSample(XML) (*.xml)|*.xml|OCAFSample(Binary) (*.cbf)|*.cbf||", -// "std Files (*.std)|*.std; |All Files (*.*)|*.*||", + L"OCAFSample(STD) (*.std)|*.std|OCAFSample(XML) (*.xml)|*.xml|OCAFSample(Binary) (*.cbf)|*.cbf||", NULL ); if (dlg.DoModal() != IDOK) return; @@ -1060,8 +1051,8 @@ m_App->SaveAs(myOcafDoc,(TCollection_ExtendedString) TPath); \n\ CWaitCursor aWaitCursor; CString CSPath = dlg.GetPathName(); - Standard_CString SPath = (Standard_CString)(LPCTSTR) CSPath; - TCollection_ExtendedString TPath(SPath); + const wchar_t* SPath = CSPath; + TCollection_ExtendedString TPath ((Standard_ExtString )SPath); // Choose storage format if (TPath.SearchFromEnd(".xml") > 0) @@ -1087,22 +1078,10 @@ m_App->SaveAs(myOcafDoc,(TCollection_ExtendedString) TPath); \n\ } catch(...) { - AfxMessageBox("Error! The file wasn't saved."); + AfxMessageBox (L"Error! The file wasn't saved."); return; } - -// if((CSPath.Find(CString(".std")))==-1 ) -// CSPath = CSPath + ".std"; - -// cout << "Save As " << CSPath << endl; -// PathName=CSPath; -// Standard_CString SPath = (Standard_CString) (LPCTSTR) CSPath; -// TCollection_ExtendedString TPath(SPath); - - // save the document in the current application -// m_App->SaveAs(myOcafDoc,TPath); - SetPathName(SPath); PathName=CSPath; diff --git a/samples/mfc/standard/06_Ocaf/src/TOcafFunction_CutDriver.cxx b/samples/mfc/standard/06_Ocaf/src/TOcafFunction_CutDriver.cxx index e3d97503c2..e83fd92a97 100755 --- a/samples/mfc/standard/06_Ocaf/src/TOcafFunction_CutDriver.cxx +++ b/samples/mfc/standard/06_Ocaf/src/TOcafFunction_CutDriver.cxx @@ -127,7 +127,7 @@ Standard_Integer TOcafFunction_CutDriver::Execute(TFunction_Logbook& /*log*/) co // Let's check if the Cut has been successfull: if (!mkCut.IsDone()) { - MessageBox(0,"Cut not done.","Cut Function Driver",MB_ICONERROR); + MessageBoxW (NULL, L"Cut not done.", L"Cut Function Driver", MB_ICONERROR); return 2; } TopoDS_Shape ResultShape = mkCut.Shape(); diff --git a/samples/mfc/standard/06_Ocaf/src/TOcaf_Commands.cxx b/samples/mfc/standard/06_Ocaf/src/TOcaf_Commands.cxx index 89e6807034..fa41e6b35b 100755 --- a/samples/mfc/standard/06_Ocaf/src/TOcaf_Commands.cxx +++ b/samples/mfc/standard/06_Ocaf/src/TOcaf_Commands.cxx @@ -95,7 +95,7 @@ TDF_Label TOcaf_Commands::CreateBox(Standard_Real x, Standard_Real y, Standard_R if(!TFunction_DriverTable::Get()->FindDriver(TOcafFunction_BoxDriver::GetID(), myBoxDriver)) return L; myBoxDriver->Init(L); - if (myBoxDriver->Execute(log)) MessageBox(0,"DFunction_Execute : failed","Box",MB_ICONERROR); + if (myBoxDriver->Execute(log)) MessageBoxW (NULL, L"DFunction_Execute : failed", L"Box", MB_ICONERROR); return L; } @@ -150,7 +150,7 @@ TDF_Label TOcaf_Commands::CreateCyl(Standard_Real x, Standard_Real y, Standard_R if(!TFunction_DriverTable::Get()->FindDriver(TOcafFunction_CylDriver::GetID(), myCylDriver)) return L; myCylDriver->Init(L); - if (myCylDriver->Execute(log)) MessageBox(0,"DFunction_Execute : failed","Cylinder",MB_ICONERROR); + if (myCylDriver->Execute(log)) MessageBoxW (NULL, L"DFunction_Execute : failed", L"Cylinder", MB_ICONERROR); return L; } @@ -217,7 +217,7 @@ TDF_Label TOcaf_Commands::ModifyBox(Standard_Real x, Standard_Real y, Standard_R Handle(TFunction_Function) TFF; if ( !MainLab.FindAttribute(TFunction_Function::GetID(),TFF) ) { - MessageBox(0,"Object cannot be modify.", "Modification", MB_ICONEXCLAMATION); + MessageBox (NULL, L"Object cannot be modify.", L"Modification", MB_ICONEXCLAMATION); return MainLab; } @@ -233,7 +233,7 @@ TDF_Label TOcaf_Commands::ModifyBox(Standard_Real x, Standard_Real y, Standard_R // Set the box touched, it will be usefull to recompute an object which used this box as attribute log.SetTouched(MainLab); if(myBoxDriver->Execute(log)) - MessageBox(0,"Recompute failed","Modify box",MB_ICONEXCLAMATION); + MessageBox (NULL, L"Recompute failed", L"Modify box", MB_ICONEXCLAMATION); } return MainLab; @@ -292,7 +292,7 @@ TDF_Label TOcaf_Commands::ModifyCyl(Standard_Real x, Standard_Real y, Standard_R Handle(TFunction_Function) TFF; if ( !MainLab.FindAttribute(TFunction_Function::GetID(),TFF) ) { - MessageBox(0,"Object cannot be modify.", "Modification", MB_ICONEXCLAMATION); + MessageBoxW (NULL, L"Object cannot be modify.", L"Modification", MB_ICONEXCLAMATION); return MainLab; } @@ -308,7 +308,7 @@ TDF_Label TOcaf_Commands::ModifyCyl(Standard_Real x, Standard_Real y, Standard_R // Set the cylinder touched, it will be usefull to recompute an object which used this cylinder as attribute log.SetTouched(MainLab); if(myCylDriver->Execute(log)) - MessageBox(0,"Recompute failed","Modify cylinder",MB_ICONEXCLAMATION); + MessageBoxW (NULL, L"Recompute failed", L"Modify cylinder", MB_ICONEXCLAMATION); } return MainLab; @@ -351,7 +351,7 @@ TDF_Label TOcaf_Commands::Cut(TDF_Label ObjectLab, TDF_Label ToolObjectLab) if(!TFunction_DriverTable::Get()->FindDriver(TOcafFunction_CutDriver::GetID(), myCutDriver)) return L; myCutDriver->Init(L); - if (myCutDriver->Execute(log)) MessageBox(0,"DFunction_Execute : failed","Cut",MB_ICONERROR); + if (myCutDriver->Execute(log)) MessageBoxW (NULL, L"DFunction_Execute : failed", L"Cut", MB_ICONERROR); return L; } diff --git a/samples/mfc/standard/07_Triangulation/CMakeLists.txt b/samples/mfc/standard/07_Triangulation/CMakeLists.txt index af393635d2..e332e646fe 100644 --- a/samples/mfc/standard/07_Triangulation/CMakeLists.txt +++ b/samples/mfc/standard/07_Triangulation/CMakeLists.txt @@ -2,7 +2,8 @@ cmake_minimum_required (VERSION 2.6) project (Triangulation) -add_definitions (-DWINVER=0x0500) +add_definitions (-DWINVER=0x0501 -DUNICODE -D_UNICODE) +set (CMAKE_MFC_FLAG 2) set (Triangulation_SRC_DIR ${MFC_STANDARD_SAMPLES_DIR}/07_Triangulation/src) set (Triangulation_HEADER_FILES ${Triangulation_SRC_DIR}/ISession_Curve.h diff --git a/samples/mfc/standard/07_Triangulation/adm/win/vc10/Triangulation.vcxproj b/samples/mfc/standard/07_Triangulation/adm/win/vc10/Triangulation.vcxproj index 8a9efb710d..552a901c48 100644 --- a/samples/mfc/standard/07_Triangulation/adm/win/vc10/Triangulation.vcxproj +++ b/samples/mfc/standard/07_Triangulation/adm/win/vc10/Triangulation.vcxproj @@ -27,22 +27,22 @@ Application Dynamic - MultiByte + Unicode Application Dynamic - MultiByte + Unicode Application Dynamic - MultiByte + Unicode Application Dynamic - MultiByte + Unicode diff --git a/samples/mfc/standard/07_Triangulation/adm/win/vc11/Triangulation.vcxproj b/samples/mfc/standard/07_Triangulation/adm/win/vc11/Triangulation.vcxproj index 3abb9cbac8..8bfe1e2fe5 100644 --- a/samples/mfc/standard/07_Triangulation/adm/win/vc11/Triangulation.vcxproj +++ b/samples/mfc/standard/07_Triangulation/adm/win/vc11/Triangulation.vcxproj @@ -27,25 +27,25 @@ Application Dynamic - MultiByte + Unicode v110 Application Dynamic - MultiByte + Unicode v110 Application Dynamic - MultiByte + Unicode v110 Application Dynamic - MultiByte + Unicode v110 @@ -97,7 +97,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\..\Common;..\..\..\;$(CSF_OPT_INC);..\..\..\src;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) + NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -139,7 +139,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\..\Common;..\..\..\;$(CSF_OPT_INC);..\..\..\src;%(AdditionalIncludeDirectories) - NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) + NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -180,7 +180,7 @@ Disabled ..\..\..\..\Common;..\..\..\;$(CSF_OPT_INC);..\..\..\src;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) + _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -222,7 +222,7 @@ Disabled ..\..\..\..\Common;..\..\..\;$(CSF_OPT_INC);..\..\..\src;%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) + _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use diff --git a/samples/mfc/standard/07_Triangulation/adm/win/vc12/Triangulation.vcxproj b/samples/mfc/standard/07_Triangulation/adm/win/vc12/Triangulation.vcxproj new file mode 100644 index 0000000000..0ba1ca942b --- /dev/null +++ b/samples/mfc/standard/07_Triangulation/adm/win/vc12/Triangulation.vcxproj @@ -0,0 +1,321 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {B50C10C8-5260-498B-A80F-48FFB4534360} + Triangulation + MFCProj + + + + Application + Dynamic + Unicode + v120 + + + Application + Dynamic + Unicode + v120 + + + Application + Dynamic + Unicode + v120 + + + Application + Dynamic + Unicode + v120 + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + ../../../../win32\vc12\bin\ + .\win32\obj\ + false + ../../../../win64\vc12\bin\ + .\win64\obj\ + false + ../../../../win32\vc12\bind\ + .\win32\objd\ + true + ../../../../win64\vc12\bind\ + .\win64\objd\ + true + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\win32\obj/Triangulation.tlb + + + + + MaxSpeed + OnlyExplicitInline + ..\..\..\..\Common;..\..\..\;$(CSF_OPT_INC);..\..\..\src;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + Use + stdafx.h + .\win32\obj/Triangulation.pch + .\win32\obj/ + .\win32\obj/ + .\win32\obj/ + Level4 + true + Default + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKShapeSchema.lib;TKBO.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + ../../../../win32\vc12\bin/Triangulation.exe + true + ..\..\..\..\win32\vc12\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories) + ../../../../win32\vc12\bin/Triangulation.pdb + Windows + MachineX86 + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + X64 + .\win64\obj/Triangulation.tlb + + + + + MaxSpeed + OnlyExplicitInline + ..\..\..\..\Common;..\..\..\;$(CSF_OPT_INC);..\..\..\src;%(AdditionalIncludeDirectories) + NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + Use + stdafx.h + .\win64\obj/Triangulation.pch + .\win64\obj/ + .\win64\obj/ + .\win64\obj/ + Level4 + true + Default + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKShapeSchema.lib;TKBO.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + ../../../../win64\vc12\bin/Triangulation.exe + true + ..\..\..\..\win64\vc12\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories) + ../../../../win64\vc12\bin/Triangulation.pdb + Windows + MachineX64 + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\win32\objd/Triangulation.tlb + + + + + Disabled + ..\..\..\..\Common;..\..\..\;$(CSF_OPT_INC);..\..\..\src;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + Use + stdafx.h + .\win32\objd/Triangulation.pch + .\win32\objd/ + .\win32\objd/ + .\win32\objd/ + Level4 + true + EditAndContinue + Default + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKShapeSchema.lib;TKBO.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + ../../../../win32\vc12\bind/Triangulation.exe + true + ..\..\..\..\win32\vc12\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories) + true + ../../../../win32\vc12\bind/Triangulation.pdb + Windows + MachineX86 + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + X64 + .\win64\objd/Triangulation.tlb + + + + + Disabled + ..\..\..\..\Common;..\..\..\;$(CSF_OPT_INC);..\..\..\src;%(AdditionalIncludeDirectories) + _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + Use + stdafx.h + .\win64\objd/Triangulation.pch + .\win64\objd/ + .\win64\objd/ + .\win64\objd/ + Level4 + true + ProgramDatabase + Default + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKShapeSchema.lib;TKBO.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + ../../../../win64\vc12\bind/Triangulation.exe + true + ..\..\..\..\win64\vc12\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories) + true + ../../../../win64\vc12\bind/Triangulation.pdb + Windows + MachineX64 + + + + + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Create + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Create + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + Create + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + Create + + + + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + + + + + + + + + + + + + + + + + + {2d6cbbe8-6965-4016-b503-0d715ae26691} + false + + + + + + \ No newline at end of file diff --git a/samples/mfc/standard/07_Triangulation/adm/win/vc12/Triangulation.vcxproj.filters b/samples/mfc/standard/07_Triangulation/adm/win/vc12/Triangulation.vcxproj.filters new file mode 100644 index 0000000000..91717b535c --- /dev/null +++ b/samples/mfc/standard/07_Triangulation/adm/win/vc12/Triangulation.vcxproj.filters @@ -0,0 +1,67 @@ + + + + + {1ffd2e2a-cb4e-4b01-93a8-1689da39afe5} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + {f9d99f5f-32c4-422c-b52f-1e0132811a39} + h;hpp;hxx;hm;inl + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + + \ No newline at end of file diff --git a/samples/mfc/standard/07_Triangulation/adm/win/vc8/Triangulation.vcproj b/samples/mfc/standard/07_Triangulation/adm/win/vc8/Triangulation.vcproj index 9be328c7d0..a4d9a9d730 100644 --- a/samples/mfc/standard/07_Triangulation/adm/win/vc8/Triangulation.vcproj +++ b/samples/mfc/standard/07_Triangulation/adm/win/vc8/Triangulation.vcproj @@ -26,7 +26,7 @@ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="2" ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" + CharacterSet="1" > SetSampleName("Tesselate"); - ((CTriangulationApp*) AfxGetApp())->SetSamplePath(""); + ((CTriangulationApp*) AfxGetApp())->SetSampleName (L"Tesselate"); + ((CTriangulationApp*) AfxGetApp())->SetSamplePath (L""); getAISContext()->EraseAll(); if (myIndex >=0 && myIndex < myNbSamples) sample (myFileNames[myIndex]); @@ -401,12 +401,10 @@ void Tesselate_Presentation::tesselateShape(const TopoDS_Shape& aShape) void Tesselate_Presentation::sample(const Standard_CString aFileName) { - CString initfile(((OCC_App*) AfxGetApp())->GetInitDataDir()); - initfile += "\\..\\..\\Data\\"; - initfile += aFileName; + CString initfile(((OCC_App*) AfxGetApp())->GetInitDataDir()); + initfile += "\\..\\..\\Data\\"; + initfile += aFileName; - - TCollection_AsciiString Path((Standard_CString)(LPCTSTR)initfile); /* ResetView(); @@ -431,20 +429,24 @@ void Tesselate_Presentation::sample(const Standard_CString aFileName) } */ + std::filebuf aFileBuf; + std::istream aStream (&aFileBuf); + if (!aFileBuf.open (initfile, ios::in)) + { + initfile += L" was not found. The sample can not be shown."; + GetDocument()->PocessTextInDialog ("Compute the triangulation on a shape", initfile); + return; + } + TopoDS_Shape aShape; BRep_Builder aBld; - //Standard_Boolean isRead = BRepTools::Read (aShape, aPath.ToCString(), aBld); - //if (!isRead) -// isRead = BRepTools::Read (aShape, bPath.ToCString(), aBld); - Standard_Boolean isRead = BRepTools::Read (aShape, Path.ToCString(), aBld); - if (!isRead) + BRepTools::Read (aShape, aStream, aBld); + if (aShape.IsNull()) { - Path += " was not found. The sample can not be shown."; - GetDocument()->PocessTextInDialog("Compute the triangulation on a shape", Path); -// setResultText(Path.ToCString()); + initfile += L" was not found. The sample can not be shown."; + GetDocument()->PocessTextInDialog ("Compute the triangulation on a shape", initfile); return; } tesselateShape (aShape); - } diff --git a/samples/mfc/standard/07_Triangulation/src/TriangulationApp.cpp b/samples/mfc/standard/07_Triangulation/src/TriangulationApp.cpp index 140fdf6b84..4925e24fde 100755 --- a/samples/mfc/standard/07_Triangulation/src/TriangulationApp.cpp +++ b/samples/mfc/standard/07_Triangulation/src/TriangulationApp.cpp @@ -16,7 +16,7 @@ CTriangulationApp::CTriangulationApp() : OCC_App() { SampleName = "TopologyTriangulation"; //for about dialog - SetSamplePath("..\\..\\07_Triangulation"); + SetSamplePath (L"..\\..\\07_Triangulation"); } ///////////////////////////////////////////////////////////////////////////// diff --git a/samples/mfc/standard/07_Triangulation/src/TriangulationDoc.cpp b/samples/mfc/standard/07_Triangulation/src/TriangulationDoc.cpp index 598c70992c..14e6417be0 100755 --- a/samples/mfc/standard/07_Triangulation/src/TriangulationDoc.cpp +++ b/samples/mfc/standard/07_Triangulation/src/TriangulationDoc.cpp @@ -136,9 +136,9 @@ void CTriangulationDoc::OnVisu() myAISContext->Remove(aListIterator.Value()); } -TopoDS_Shape theBox = BRepPrimAPI_MakeBox(200,60,60); -TopoDS_Shape theSphere = BRepPrimAPI_MakeSphere(gp_Pnt(100,20,20),80); -TopoDS_Shape ShapeFused = BRepAlgoAPI_Fuse(theSphere,theBox); +TopoDS_Shape theBox = BRepPrimAPI_MakeBox(200,60,60).Shape(); +TopoDS_Shape theSphere = BRepPrimAPI_MakeSphere(gp_Pnt(100, 20, 20), 80).Shape(); +TopoDS_Shape ShapeFused = BRepAlgoAPI_Fuse(theSphere, theBox).Shape(); BRepMesh_IncrementalMesh(ShapeFused,1); Handle (AIS_Shape) aSection = new AIS_Shape(ShapeFused); @@ -261,8 +261,8 @@ void CTriangulationDoc::OnClear() myAISContext->Remove(aListIterator.Value()); } -TopoDS_Shape theBox = BRepPrimAPI_MakeBox(200,60,60); -TopoDS_Shape theSphere = BRepPrimAPI_MakeSphere(gp_Pnt(100,20,20),80); +TopoDS_Shape theBox = BRepPrimAPI_MakeBox(200, 60, 60).Shape(); +TopoDS_Shape theSphere = BRepPrimAPI_MakeSphere(gp_Pnt(100, 20, 20), 80).Shape(); TopoDS_Shape ShapeFused = BRepAlgoAPI_Fuse(theSphere,theBox); BRepMesh_IncrementalMesh(ShapeFused,1); @@ -350,7 +350,7 @@ void CTriangulationDoc::DoSample() { Standard_SStream aSStream; aSStream << "An exception was caught: " << Standard_Failure::Caught() << ends; - Standard_CString aMsg = aSStream.str().c_str(); + CString aMsg = aSStream.str().c_str(); // aSStream.rdbuf()->freeze(0); // allow deletion of dynamic array AfxMessageBox (aMsg); } @@ -424,4 +424,4 @@ void CTriangulationDoc::Fit() CMDIChildWnd *pChild = (CMDIChildWnd *) pFrame->GetActiveFrame(); OCC_3dView *pView = (OCC_3dView*)pChild->GetActiveView(); pView->FitAll(); -} \ No newline at end of file +} diff --git a/samples/mfc/standard/08_HLR/CMakeLists.txt b/samples/mfc/standard/08_HLR/CMakeLists.txt index bdd8b66a52..b92752e2fc 100644 --- a/samples/mfc/standard/08_HLR/CMakeLists.txt +++ b/samples/mfc/standard/08_HLR/CMakeLists.txt @@ -2,7 +2,8 @@ cmake_minimum_required (VERSION 2.6) project (HLR) -add_definitions(-DWINVER=0x0500) +add_definitions(-DWINVER=0x0501 -DUNICODE -D_UNICODE) +set (CMAKE_MFC_FLAG 2) set (HLR_SRC_DIR ${MFC_STANDARD_SAMPLES_DIR}/08_HLR/src) set (HLR_HEADER_FILES ${HLR_SRC_DIR}/HLRApp.h diff --git a/samples/mfc/standard/08_HLR/adm/win/vc10/HLR.vcxproj b/samples/mfc/standard/08_HLR/adm/win/vc10/HLR.vcxproj index 7455a4deb9..384b3a0556 100644 --- a/samples/mfc/standard/08_HLR/adm/win/vc10/HLR.vcxproj +++ b/samples/mfc/standard/08_HLR/adm/win/vc10/HLR.vcxproj @@ -27,22 +27,22 @@ Application Dynamic - MultiByte + Unicode Application Dynamic - MultiByte + Unicode Application Dynamic - MultiByte + Unicode Application Dynamic - MultiByte + Unicode diff --git a/samples/mfc/standard/08_HLR/adm/win/vc11/HLR.vcxproj b/samples/mfc/standard/08_HLR/adm/win/vc11/HLR.vcxproj index 4bac832c40..763225e7ec 100644 --- a/samples/mfc/standard/08_HLR/adm/win/vc11/HLR.vcxproj +++ b/samples/mfc/standard/08_HLR/adm/win/vc11/HLR.vcxproj @@ -27,25 +27,25 @@ Application Dynamic - MultiByte + Unicode v110 Application Dynamic - MultiByte + Unicode v110 Application Dynamic - MultiByte + Unicode v110 Application Dynamic - MultiByte + Unicode v110 @@ -97,7 +97,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\;..\..\..\..\Common;$(CSF_OPT_INC);..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) + NDEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -139,7 +139,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\;..\..\..\..\Common;$(CSF_OPT_INC);..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) - NDEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) + NDEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -180,7 +180,7 @@ Disabled ..\..\..\;..\..\..\..\Common;$(CSF_OPT_INC);..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) + _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -222,7 +222,7 @@ Disabled ..\..\..\;..\..\..\..\Common;$(CSF_OPT_INC);..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) + _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use diff --git a/samples/mfc/standard/08_HLR/adm/win/vc12/HLR.vcxproj b/samples/mfc/standard/08_HLR/adm/win/vc12/HLR.vcxproj new file mode 100644 index 0000000000..a08260976f --- /dev/null +++ b/samples/mfc/standard/08_HLR/adm/win/vc12/HLR.vcxproj @@ -0,0 +1,413 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {76045260-8DA6-4A3E-B220-F5B1B4ADE192} + HLR + MFCProj + + + + Application + Dynamic + Unicode + v120 + + + Application + Dynamic + Unicode + v120 + + + Application + Dynamic + Unicode + v120 + + + Application + Dynamic + Unicode + v120 + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + ../../../../win32\vc12\bin\ + .\win32\obj\ + false + ../../../../win64\vc12\bin\ + .\win64\obj\ + false + ../../../../win32\vc12\bind\ + .\win32\objd\ + true + ../../../../win64\vc12\bind\ + .\win64\objd\ + true + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\win32\obj/HLR.tlb + + + + + MaxSpeed + OnlyExplicitInline + ..\..\..\;..\..\..\..\Common;$(CSF_OPT_INC);..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + Use + stdafx.h + .\win32\obj/HLR.pch + .\win32\obj/ + .\win32\obj/ + .\win32\obj/ + Level4 + true + Default + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + ../../../../win32\vc12\bin/HLR.exe + true + ..\..\..\..\win32\vc12\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories) + ../../../../win32\vc12\bin/HLR.pdb + Windows + MachineX86 + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + X64 + .\win64\obj/HLR.tlb + + + + + MaxSpeed + OnlyExplicitInline + ..\..\..\;..\..\..\..\Common;$(CSF_OPT_INC);..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) + NDEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + Use + stdafx.h + .\win64\obj/HLR.pch + .\win64\obj/ + .\win64\obj/ + .\win64\obj/ + Level4 + true + Default + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + ../../../../win64\vc12\bin/HLR.exe + true + ..\..\..\..\win64\vc12\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories) + ../../../../win64\vc12\bin/HLR.pdb + Windows + MachineX64 + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\win32\objd/HLR.tlb + + + + + Disabled + ..\..\..\;..\..\..\..\Common;$(CSF_OPT_INC);..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + Use + stdafx.h + .\win32\objd/HLR.pch + .\win32\objd/ + .\win32\objd/ + .\win32\objd/ + Level4 + true + EditAndContinue + Default + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + ../../../../win32\vc12\bind/HLR.exe + true + ..\..\..\..\win32\vc12\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories) + true + ../../../../win32\vc12\bind/HLR.pdb + Windows + MachineX86 + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + X64 + .\win64\objd/HLR.tlb + + + + + Disabled + ..\..\..\;..\..\..\..\Common;$(CSF_OPT_INC);..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) + _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + Use + stdafx.h + .\win64\objd/HLR.pch + .\win64\objd/ + .\win64\objd/ + .\win64\objd/ + Level4 + true + ProgramDatabase + Default + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + ../../../../win64\vc12\bind/HLR.exe + true + ..\..\..\..\win64\vc12\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories) + true + ../../../../win64\vc12\bind/HLR.pdb + Windows + MachineX64 + + + + + %(PreprocessorDefinitions) + res;%(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + res;%(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + res;%(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + res;%(AdditionalIncludeDirectories) + + + + + Disabled + .\Properties;%(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Disabled + .\Properties;%(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + Disabled + .\Properties;%(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Disabled + .\Properties;%(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + Disabled + .\Properties;%(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Disabled + .\Properties;%(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + Disabled + .\Properties;%(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Create + Disabled + .\Properties;%(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Create + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + Create + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + Create + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {2d6cbbe8-6965-4016-b503-0d715ae26691} + false + + + + + + \ No newline at end of file diff --git a/samples/mfc/standard/08_HLR/adm/win/vc12/HLR.vcxproj.filters b/samples/mfc/standard/08_HLR/adm/win/vc12/HLR.vcxproj.filters new file mode 100644 index 0000000000..d8f08c9e32 --- /dev/null +++ b/samples/mfc/standard/08_HLR/adm/win/vc12/HLR.vcxproj.filters @@ -0,0 +1,142 @@ + + + + + {71b03503-46e1-4a70-bf46-9d403d37b35a} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + {22270cbf-7f10-4c26-8fc6-7f68842b776d} + h;hpp;hxx;hm;inl + + + {f220deda-1476-43c2-af8d-81ff1947d33d} + ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe + + + + + Source Files + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + \ No newline at end of file diff --git a/samples/mfc/standard/08_HLR/adm/win/vc8/HLR.vcproj b/samples/mfc/standard/08_HLR/adm/win/vc8/HLR.vcproj index 6c0aff8a17..7606a7ac2a 100644 --- a/samples/mfc/standard/08_HLR/adm/win/vc8/HLR.vcproj +++ b/samples/mfc/standard/08_HLR/adm/win/vc8/HLR.vcproj @@ -26,7 +26,7 @@ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="2" ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" + CharacterSet="1" > Application Dynamic - MultiByte + Unicode Application Dynamic - MultiByte + Unicode Application Dynamic - MultiByte + Unicode Application Dynamic - MultiByte + Unicode diff --git a/samples/mfc/standard/09_Animation/adm/win/vc11/Animation.vcxproj b/samples/mfc/standard/09_Animation/adm/win/vc11/Animation.vcxproj index d00c3a346a..289a65f566 100644 --- a/samples/mfc/standard/09_Animation/adm/win/vc11/Animation.vcxproj +++ b/samples/mfc/standard/09_Animation/adm/win/vc11/Animation.vcxproj @@ -27,25 +27,25 @@ Application Dynamic - MultiByte + Unicode v110 Application Dynamic - MultiByte + Unicode v110 Application Dynamic - MultiByte + Unicode v110 Application Dynamic - MultiByte + Unicode v110 @@ -96,7 +96,7 @@ Disabled ..\..\..\;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) + _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -138,7 +138,7 @@ Disabled ..\..\..\;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) + _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use diff --git a/samples/mfc/standard/09_Animation/adm/win/vc12/Animation.vcxproj b/samples/mfc/standard/09_Animation/adm/win/vc12/Animation.vcxproj new file mode 100644 index 0000000000..2833d6fef8 --- /dev/null +++ b/samples/mfc/standard/09_Animation/adm/win/vc12/Animation.vcxproj @@ -0,0 +1,413 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {92492ACB-1F57-40BB-818F-33AD1C20273A} + Animation + MFCProj + + + + Application + Dynamic + Unicode + v120 + + + Application + Dynamic + Unicode + v120 + + + Application + Dynamic + Unicode + v120 + + + Application + Dynamic + Unicode + v120 + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + ../../../../win32\vc12\bind\ + .\win32\objd\ + true + ../../../../win64\vc12\bind\ + .\win64\objd\ + true + ../../../../win32\vc12\bin\ + .\win32\obj\ + false + ../../../../win64\vc12\bin\ + .\win64\obj\ + false + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\win32\objd/Animation.tlb + + + + + Disabled + ..\..\..\;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + Use + stdafx.h + .\win32\objd/Animation.pch + .\win32\objd/ + .\win32\objd/ + .\win32\objd/ + Level4 + true + EditAndContinue + Default + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) + ../../../../win32\vc12\bind/Animation.exe + true + ..\..\..\..\win32\vc12\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories) + true + ../../../../win32\vc12\bind/Animation.pdb + Windows + MachineX86 + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + X64 + .\win64\objd/Animation.tlb + + + + + Disabled + ..\..\..\;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + Use + stdafx.h + .\win64\objd/Animation.pch + .\win64\objd/ + .\win64\objd/ + .\win64\objd/ + Level4 + true + ProgramDatabase + Default + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) + ../../../../win64\vc12\bind/Animation.exe + true + ..\..\..\..\win64\vc12\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories) + true + ../../../../win64\vc12\bind/Animation.pdb + Windows + MachineX64 + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\win32\obj/Animation.tlb + + + + + MaxSpeed + OnlyExplicitInline + ..\..\..\;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_WINDOWS;WNT;CSFDB;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + Use + stdafx.h + .\win32\obj/Animation.pch + .\win32\obj/ + .\win32\obj/ + .\win32\obj/ + Level4 + true + Default + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) + ../../../../win32\vc12\bin/Animation.exe + true + ..\..\..\..\win32\vc12\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories) + ../../../../win32\vc12\bin/Animation.pdb + Windows + MachineX86 + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + X64 + .\win64\obj/Animation.tlb + + + + + MaxSpeed + OnlyExplicitInline + ..\..\..\;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) + NDEBUG;WIN64;_WINDOWS;WNT;CSFDB;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + Use + stdafx.h + .\win64\obj/Animation.pch + .\win64\obj/ + .\win64\obj/ + .\win64\obj/ + Level4 + true + Default + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + true + + + TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) + ../../../../win64\vc12\bin/Animation.exe + true + ..\..\..\..\win64\vc12\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories) + ../../../../win64\vc12\bin/Animation.pdb + Windows + MachineX64 + + + + + %(PreprocessorDefinitions) + res;%(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + res;%(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + res;%(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + res;%(AdditionalIncludeDirectories) + + + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Create + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Create + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + Create + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + Create + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + + + + + + + + + + + + + + + + + + + {2d6cbbe8-6965-4016-b503-0d715ae26691} + false + + + + + + \ No newline at end of file diff --git a/samples/mfc/standard/09_Animation/adm/win/vc12/Animation.vcxproj.filters b/samples/mfc/standard/09_Animation/adm/win/vc12/Animation.vcxproj.filters new file mode 100644 index 0000000000..879de1c590 --- /dev/null +++ b/samples/mfc/standard/09_Animation/adm/win/vc12/Animation.vcxproj.filters @@ -0,0 +1,94 @@ + + + + + {d5298b93-c300-4e09-b89c-a7e7077e364f} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + {44848e1a-ccd0-42de-b2d7-989ef24a56a9} + h;hpp;hxx;hm;inl + + + {ac89cece-2b9f-4975-ad38-a1fc83f2b2b3} + ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe + + + + + Source Files + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Resource Files + + + Resource Files + + + \ No newline at end of file diff --git a/samples/mfc/standard/09_Animation/adm/win/vc8/Animation.vcproj b/samples/mfc/standard/09_Animation/adm/win/vc8/Animation.vcproj index b2fa16dcc3..2cb6c12c54 100644 --- a/samples/mfc/standard/09_Animation/adm/win/vc8/Animation.vcproj +++ b/samples/mfc/standard/09_Animation/adm/win/vc8/Animation.vcproj @@ -26,7 +26,7 @@ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="2" ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" + CharacterSet="1" > 0) ? tchBuf : NULL); - aString = (CASROOTValue + "\\data\\occ"); + CString aPathPropeller = aDataDirPath + "\\Propeller.rle"; + if (aFileBuf.open (aPathPropeller, ios::in)) + { + BRepTools::Read (Propeller, aStream, B); + aFileBuf.close(); + } - char DataDirPath[200]; - strcpy_s(DataDirPath, aString); - char temp[200]; - strcpy_s(temp, DataDirPath); + CString aPathPiston = aDataDirPath + "\\Piston.rle"; + if (aFileBuf.open (aPathPiston, ios::in)) + { + BRepTools::Read (Piston, aStream, B); + aFileBuf.close(); + } - strcat_s(temp,"\\CrankArm.rle"); - BRepTools::Read(CrankArm, temp, B); - - strcpy_s(temp, DataDirPath); - strcat_s(temp,"\\CylinderHead.rle"); - BRepTools::Read(CylinderHead, temp, B); + CString aPathEngineBlock = aDataDirPath + "\\EngineBlock.rle"; + if (aFileBuf.open (aPathEngineBlock, ios::in)) + { + BRepTools::Read (EngineBlock, aStream, B); + aFileBuf.close(); + } - strcpy_s(temp, DataDirPath); - strcat_s(temp,"\\Propeller.rle"); - BRepTools::Read(Propeller, temp, B); - - strcpy_s(temp, DataDirPath); - strcat_s(temp,"\\Piston.rle"); - BRepTools::Read(Piston, temp, B); - - strcpy_s(temp, DataDirPath); - strcat_s(temp,"\\EngineBlock.rle"); - BRepTools::Read(EngineBlock, temp, B); - if (CrankArm.IsNull() || CylinderHead.IsNull() || Propeller.IsNull() || Piston.IsNull() || EngineBlock.IsNull()) { - int rep = MessageBox(NULL, "Shape(s) not found.\nCheck the Data directory path!", "Error",MB_OK | MB_ICONERROR); + int rep = MessageBoxW (AfxGetApp()->m_pMainWnd->m_hWnd, L"Shape(s) not found.\nCheck the Data directory path!", L"Error", MB_OK | MB_ICONERROR); if (rep == IDOK) exit(0); } @@ -356,7 +366,7 @@ void CAnimationDoc::OnFileLoadgrid() NULL, NULL, OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT, - "Points Files (*.pnt;*.pnts)|*.pnt; *.pnts|All Files (*.*)|*.*||", + L"Points Files (*.pnt;*.pnts)|*.pnt; *.pnts|All Files (*.*)|*.*||", NULL ); CString initdir(((OCC_App*) AfxGetApp())->GetInitDataDir()); @@ -426,12 +436,6 @@ void CAnimationDoc::OnFileLoadgrid() void CAnimationDoc::OnUpdateWalkWalkthru(CCmdUI* pCmdUI) { // TODO: Add your command update UI handler code here - - int i ; - char szMsg [256] ; - i = GetEnvironmentVariable( "CSF_WALKTHROUGH" , szMsg , sizeof szMsg ) ; - if ( i ) - pCmdUI->SetCheck ( 1 ) ; - else - pCmdUI->SetCheck ( 0 ) ; + CString aValue; + pCmdUI->SetCheck (aValue.GetEnvironmentVariable (L"CSF_WALKTHROUGH") ? 1 : 0); } diff --git a/samples/mfc/standard/09_Animation/src/AnimationView3D.cpp b/samples/mfc/standard/09_Animation/src/AnimationView3D.cpp index 3c82518a83..09f8aec6c6 100755 --- a/samples/mfc/standard/09_Animation/src/AnimationView3D.cpp +++ b/samples/mfc/standard/09_Animation/src/AnimationView3D.cpp @@ -926,31 +926,27 @@ void CAnimationView3D::SetFocal (double theFocus, double theAngle) void CAnimationView3D::ReloadData() { - char szMsg [128] ; - double dTwist ; - myView->At ( m_Atx , m_Aty , m_Atz ) ; myView->Eye ( m_Eyex , m_Eyey , m_Eyez ) ; + double dTwist = myView->Twist() * 180. / M_PI; - dTwist = myView->Twist () ; - dTwist = dTwist * 180. / M_PI ; + CString aMsg; + aMsg.Format (L"%lf", m_Atx); + m_Tune.GetDlgItem (IDC_XAT)->SetWindowText (aMsg); + aMsg.Format (L"%lf", m_Aty); + m_Tune.GetDlgItem (IDC_YAT)->SetWindowText (aMsg); + aMsg.Format (L"%lf", m_Atz); + m_Tune.GetDlgItem (IDC_ZAT)->SetWindowText (aMsg); - sprintf_s ( szMsg , "%lf" , m_Atx ) ; - (m_Tune.GetDlgItem ( IDC_XAT ))->SetWindowText ( szMsg ) ; - sprintf_s ( szMsg , "%lf" , m_Aty ) ; - (m_Tune.GetDlgItem ( IDC_YAT ))->SetWindowText ( szMsg ) ; - sprintf_s ( szMsg , "%lf" , m_Atz ) ; - (m_Tune.GetDlgItem ( IDC_ZAT ))->SetWindowText ( szMsg ) ; + aMsg.Format (L"%lf", m_Eyex); + m_Tune.GetDlgItem (IDC_XEYE)->SetWindowText (aMsg); + aMsg.Format (L"%lf", m_Eyey); + m_Tune.GetDlgItem (IDC_YEYE)->SetWindowText (aMsg); + aMsg.Format (L"%lf", m_Eyez); + m_Tune.GetDlgItem (IDC_ZEYE)->SetWindowText (aMsg); - sprintf_s ( szMsg , "%lf" , m_Eyex ) ; - (m_Tune.GetDlgItem ( IDC_XEYE ))->SetWindowText ( szMsg ) ; - sprintf_s ( szMsg , "%lf" , m_Eyey ) ; - (m_Tune.GetDlgItem ( IDC_YEYE ))->SetWindowText ( szMsg ) ; - sprintf_s ( szMsg , "%lf" , m_Eyez ) ; - (m_Tune.GetDlgItem ( IDC_ZEYE ))->SetWindowText ( szMsg ) ; - - sprintf_s ( szMsg , "%lf" , dTwist ) ; - (m_Tune.GetDlgItem ( IDC_TWIST ))->SetWindowText ( szMsg ) ; + aMsg.Format (L"%lf", dTwist); + m_Tune.GetDlgItem (IDC_TWIST)->SetWindowText (aMsg); double dx,dy,dz ; dx = m_Atx - m_Eyex ; diff --git a/samples/mfc/standard/09_Animation/src/Fonc.cxx b/samples/mfc/standard/09_Animation/src/Fonc.cxx index d2b317eb3b..5199c86b93 100755 --- a/samples/mfc/standard/09_Animation/src/Fonc.cxx +++ b/samples/mfc/standard/09_Animation/src/Fonc.cxx @@ -8,52 +8,35 @@ // cf jm-oliva@paris3.matra-dtv.fr ( Merci JMO ) //======================================================================= -Standard_Boolean grid2surf(Standard_CString ShapeName,Handle(Geom_BSplineSurface)& S ) +Standard_Boolean grid2surf(CString ShapeName, Handle(Geom_BSplineSurface)& S) { + CString aFileName = ShapeName; + aFileName.Replace(L'\\', L'/'); + Handle(TColStd_HArray2OfReal) H; Standard_Real xmin, ymin, Dx, Dy; - H = ReadRegularGrid(ShapeName, xmin, ymin, Dx, Dy); + H = ReadRegularGrid (aFileName, xmin, ymin, Dx, Dy); GeomAPI_PointsToBSplineSurface MkSurf; MkSurf.Interpolate(H->Array2(), xmin, Dx, ymin, Dy); S = MkSurf.Surface(); return Standard_True; } - -//======================================================================= -//function : grid2surf -//purpose : -// cf jm-oliva@paris3.matra-dtv.fr ( Merci JMO ) -//======================================================================= - -Standard_Boolean grid2surf(const CString aCStringShapeName, - Handle(Geom_BSplineSurface)& S ) -{ - char tmp_char[256] =""; - strcpy_s(tmp_char,aCStringShapeName); - int i = 0, len = (int)strlen(tmp_char); - while (i < len) - { - if (tmp_char[i] == '\\') - tmp_char[i] = '/'; - i++; - } - Standard_CString aFileName = tmp_char; - return grid2surf(aFileName,S); -} - //======================================================================= //function : ReadRegularGrid //purpose : // cf jm-oliva@paris3.matra-dtv.fr ( Merci JMO ) //======================================================================= -Handle(TColStd_HArray2OfReal) ReadRegularGrid(Standard_CString FileName, +Handle(TColStd_HArray2OfReal) ReadRegularGrid(CString FileName, Standard_Real& xmin, Standard_Real& ymin, Standard_Real& Deltax, Standard_Real& Deltay) { + CString aFileName = FileName; + aFileName.Replace (L'\\', L'/'); + Handle(TColStd_HArray2OfReal) H; Standard_Integer R1 = 1, R2, C1 = 1, C2, R, C; Standard_Real x, y, z; @@ -61,7 +44,7 @@ Handle(TColStd_HArray2OfReal) ReadRegularGrid(Standard_CString FileName, xmin = ymin = 10000000; FILE *fp = NULL; - fopen_s(&fp, FileName, "r"); + _wfopen_s (&fp, aFileName, L"r"); if (fp) { @@ -111,29 +94,3 @@ Handle(TColStd_HArray2OfReal) ReadRegularGrid(Standard_CString FileName, } return H; } - -//======================================================================= -//function : ReadRegularGrid -//purpose : -// cf jm-oliva@paris3.matra-dtv.fr ( Merci JMO ) -//======================================================================= -Handle(TColStd_HArray2OfReal) ReadRegularGrid(const CString aCStringFileName, - Standard_Real& xmin, - Standard_Real& ymin, - Standard_Real& Deltax, - Standard_Real& Deltay) -{ - char tmp_char[256] =""; - strcpy_s(tmp_char,aCStringFileName); - int i = 0, len = (int)strlen(tmp_char); - while (i < len) - { - if (tmp_char[i] == '\\') - tmp_char[i] = '/'; - i++; - } - Standard_CString aFileName = tmp_char; - Handle(TColStd_HArray2OfReal) H; - H = ReadRegularGrid(aFileName,xmin,ymin,Deltax,Deltay); - return H; -} diff --git a/samples/mfc/standard/09_Animation/src/Fonc.hxx b/samples/mfc/standard/09_Animation/src/Fonc.hxx index 18260d1c6d..a0f4eb9920 100755 --- a/samples/mfc/standard/09_Animation/src/Fonc.hxx +++ b/samples/mfc/standard/09_Animation/src/Fonc.hxx @@ -36,18 +36,11 @@ #include -Standard_Boolean grid2surf(Standard_CString ShapeName,Handle(Geom_BSplineSurface)& S ); -Standard_Boolean grid2surf(const CString aCStringShapeName,Handle(Geom_BSplineSurface)& S ); +Standard_Boolean grid2surf(CString ShapeName, Handle(Geom_BSplineSurface)& S); Handle(Geom_BSplineCurve) SetTransfo(Handle(Geom_BSplineCurve) aBSCurve); Handle(Geom_BSplineCurve) BuildBSplineCurve(Standard_Boolean DisplayPoints = Standard_True); -Handle(TColStd_HArray2OfReal) ReadRegularGrid(Standard_CString FileName, +Handle(TColStd_HArray2OfReal) ReadRegularGrid(CString FileName, Standard_Real& xmin, Standard_Real& ymin, Standard_Real& Deltax, Standard_Real& Deltay); -Handle(TColStd_HArray2OfReal) ReadRegularGrid(const CString aCStringFileName, - Standard_Real& xmin, - Standard_Real& ymin, - Standard_Real& Deltax, - Standard_Real& Deltay); - diff --git a/samples/mfc/standard/10_Convert/CMakeLists.txt b/samples/mfc/standard/10_Convert/CMakeLists.txt index d5c7e4dcc4..0d20f8067c 100644 --- a/samples/mfc/standard/10_Convert/CMakeLists.txt +++ b/samples/mfc/standard/10_Convert/CMakeLists.txt @@ -2,7 +2,8 @@ cmake_minimum_required (VERSION 2.6) project (Convert) -add_definitions (-DWINVER=0x0500) +add_definitions (-DWINVER=0x0501 -DUNICODE -D_UNICODE) +set (CMAKE_MFC_FLAG 2) set (Convert_SRC_DIR ${MFC_STANDARD_SAMPLES_DIR}/10_Convert/src) set (Convert_HEADER_FILES ${Convert_SRC_DIR}/Convert_Presentation.h diff --git a/samples/mfc/standard/10_Convert/adm/win/vc10/Convert.vcxproj b/samples/mfc/standard/10_Convert/adm/win/vc10/Convert.vcxproj index dd9ab78d3c..55ca809125 100644 --- a/samples/mfc/standard/10_Convert/adm/win/vc10/Convert.vcxproj +++ b/samples/mfc/standard/10_Convert/adm/win/vc10/Convert.vcxproj @@ -27,22 +27,22 @@ Application Dynamic - MultiByte + Unicode Application Dynamic - MultiByte + Unicode Application Dynamic - MultiByte + Unicode Application Dynamic - MultiByte + Unicode diff --git a/samples/mfc/standard/10_Convert/adm/win/vc11/Convert.vcxproj b/samples/mfc/standard/10_Convert/adm/win/vc11/Convert.vcxproj index afb3c52dd5..cac37ff2d6 100644 --- a/samples/mfc/standard/10_Convert/adm/win/vc11/Convert.vcxproj +++ b/samples/mfc/standard/10_Convert/adm/win/vc11/Convert.vcxproj @@ -27,25 +27,25 @@ Application Dynamic - MultiByte + Unicode v110 Application Dynamic - MultiByte + Unicode v110 Application Dynamic - MultiByte + Unicode v110 Application Dynamic - MultiByte + Unicode v110 @@ -97,7 +97,7 @@ MaxSpeed OnlyExplicitInline ../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CSF_OPT_INC);../../../Common;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -142,7 +142,7 @@ MaxSpeed OnlyExplicitInline ../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CSF_OPT_INC);../../../Common;%(AdditionalIncludeDirectories) - WIN64;NDEBUG;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) + WIN64;NDEBUG;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -186,7 +186,7 @@ Disabled ../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CSF_OPT_INC);../../../Common;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) + _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -230,7 +230,7 @@ Disabled ../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CSF_OPT_INC);../../../Common;%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) + _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL diff --git a/samples/mfc/standard/10_Convert/adm/win/vc12/Convert.vcxproj b/samples/mfc/standard/10_Convert/adm/win/vc12/Convert.vcxproj new file mode 100644 index 0000000000..b4e59daf30 --- /dev/null +++ b/samples/mfc/standard/10_Convert/adm/win/vc12/Convert.vcxproj @@ -0,0 +1,467 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {C527B648-F98D-42E5-9F59-251FD95D15A0} + Convert + MFCProj + + + + Application + Dynamic + Unicode + v120 + + + Application + Dynamic + Unicode + v120 + + + Application + Dynamic + Unicode + v120 + + + Application + Dynamic + Unicode + v120 + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + ../../../../win32\vc12\bin\ + .\win32\obj\ + false + ../../../../win64\vc12\bin\ + .\win64\obj\ + false + ../../../../win32\vc12\bind\ + .\win32\objd\ + true + ../../../../win64\vc12\bind\ + .\win64\objd\ + true + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\win32\obj/Convert.tlb + + + + + MaxSpeed + OnlyExplicitInline + ../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CSF_OPT_INC);../../../Common;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + + + StdAfx.h + .\win32\obj/Convert.pch + .\win32\obj/ + .\win32\obj/ + .\win32\obj/ + Level4 + true + Default + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies) + ../../../../win32\vc12\bin/Convert.exe + true + ..\..\..\..\win32\vc12\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories) + .\win32\obj\$(TargetFileName).intermediate.manifest + ../../../../win32\vc12\bin/Convert.pdb + Windows + false + MachineX86 + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + X64 + .\win64\obj/Convert.tlb + + + + + MaxSpeed + OnlyExplicitInline + ../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CSF_OPT_INC);../../../Common;%(AdditionalIncludeDirectories) + WIN64;NDEBUG;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + + + StdAfx.h + .\win64\obj/Convert.pch + .\win64\obj/ + .\win64\obj/ + .\win64\obj/ + Level4 + true + Default + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies) + ../../../../win64\vc12\bin/Convert.exe + true + ..\..\..\..\win64\vc12\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories) + .\win64\obj\$(TargetFileName).intermediate.manifest + ../../../../win64\vc12\bin/Convert.pdb + Windows + false + MachineX64 + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\win32\objd/Convert.tlb + + + + + Disabled + ../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CSF_OPT_INC);../../../Common;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + + + StdAfx.h + .\win32\objd/Convert.pch + .\win32\objd/ + .\win32\objd/ + .\win32\objd/ + Level4 + true + EditAndContinue + Default + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies) + ../../../../win32\vc12\bind/Convert.exe + true + ..\..\..\..\win32\vc12\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories) + .\win32\objd\$(TargetFileName).intermediate.manifest + true + ../../../../win32\vc12\bind/Convert.pdb + Windows + MachineX86 + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + X64 + .\win64\objd/Convert.tlb + + + + + Disabled + ../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CSF_OPT_INC);../../../Common;%(AdditionalIncludeDirectories) + _DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + + + StdAfx.h + .\win64\objd/Convert.pch + .\win64\objd/ + .\win64\objd/ + .\win64\objd/ + Level4 + true + ProgramDatabase + Default + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies) + ../../../../win64\vc12\bind/Convert.exe + true + ..\..\..\..\win64\vc12\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories) + .\win64\objd\$(TargetFileName).intermediate.manifest + true + ../../../../win64\vc12\bind/Convert.pdb + Windows + MachineX64 + + + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + + + + + + + + + + + + + + + %(PreprocessorDefinitions) + \mfc\15_AdditionalSamples\Common\WNT;%(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + \mfc\15_AdditionalSamples\Common\WNT;%(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + \mfc\15_AdditionalSamples\Common\WNT;%(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + \mfc\15_AdditionalSamples\Common\WNT;%(AdditionalIncludeDirectories) + + + + + + + + + + + + + {2d6cbbe8-6965-4016-b503-0d715ae26691} + false + + + + + + \ No newline at end of file diff --git a/samples/mfc/standard/10_Convert/adm/win/vc12/Convert.vcxproj.filters b/samples/mfc/standard/10_Convert/adm/win/vc12/Convert.vcxproj.filters new file mode 100644 index 0000000000..2423254399 --- /dev/null +++ b/samples/mfc/standard/10_Convert/adm/win/vc12/Convert.vcxproj.filters @@ -0,0 +1,112 @@ + + + + + {b2e6cca6-ebc5-4e7e-b06c-1e047a9e5013} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + {3f765fb2-98a9-4f66-b536-0f09b68eefce} + h;hpp;hxx;hm;inl + + + {44a1d1d0-2210-4fc3-9d12-694b98b3e218} + + + {40f21a32-e9bf-4885-95d3-c8ee7a07c9ad} + + + {8cb29cb9-5584-4028-9405-cd74b6d71fb5} + + + {83444696-f610-4476-9d6b-1fed4444557f} + + + + + Source Files + + + Source Files + + + Common Files\Sources + + + Common Files\Sources + + + Common Files\Sources + + + Common Files\Sources + + + Common Files\Sources + + + Common Files\Sources + + + Common Files\Sources + + + Common Files\Sources + + + + + Header Files + + + Common Files\Headers + + + Common Files\Headers + + + Common Files\Headers + + + Common Files\Headers + + + Common Files\Headers + + + Common Files\Headers + + + Common Files\Headers + + + Common Files\Headers + + + Common Files\Headers + + + + + Common Files\Sources + + + + + Common Files\Resource Files + + + Common Files\Resource Files + + + Common Files\Resource Files + + + Common Files\Resource Files + + + Common Files\Resource Files + + + + \ No newline at end of file diff --git a/samples/mfc/standard/10_Convert/adm/win/vc8/Convert.vcproj b/samples/mfc/standard/10_Convert/adm/win/vc8/Convert.vcproj index 98e9b28ceb..691b62697a 100644 --- a/samples/mfc/standard/10_Convert/adm/win/vc8/Convert.vcproj +++ b/samples/mfc/standard/10_Convert/adm/win/vc8/Convert.vcproj @@ -26,7 +26,7 @@ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="2" ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" + CharacterSet="1" > SetSampleName("Convert"); - ((COCCDemoApp*) AfxGetApp())->SetSamplePath("..\\..\\10_Convert"); + ((COCCDemoApp*) AfxGetApp())->SetSampleName (L"Convert"); + ((COCCDemoApp*) AfxGetApp())->SetSamplePath (L"..\\..\\10_Convert"); getAISContext()->EraseAll(); if (myIndex >=0 && myIndex < myNbFuncs) (this->*SampleFuncs[myIndex])(); diff --git a/samples/mfc/standard/10_Convert/src/WNT/OCCDemo.cpp b/samples/mfc/standard/10_Convert/src/WNT/OCCDemo.cpp index ef2ac83e6d..f84d37e510 100755 --- a/samples/mfc/standard/10_Convert/src/WNT/OCCDemo.cpp +++ b/samples/mfc/standard/10_Convert/src/WNT/OCCDemo.cpp @@ -36,7 +36,7 @@ COCCDemoApp::COCCDemoApp() : OCC_App() } catch (Standard_Failure) { - AfxMessageBox ("Fatal Error During Graphic Initialisation"); + AfxMessageBox (L"Fatal Error During Graphic Initialisation"); } } diff --git a/samples/mfc/standard/10_Convert/src/WNT/OCCDemoDoc.cpp b/samples/mfc/standard/10_Convert/src/WNT/OCCDemoDoc.cpp index c63713cd8c..b79e2be484 100755 --- a/samples/mfc/standard/10_Convert/src/WNT/OCCDemoDoc.cpp +++ b/samples/mfc/standard/10_Convert/src/WNT/OCCDemoDoc.cpp @@ -154,8 +154,7 @@ void COCCDemoDoc::DoSample() { Standard_SStream aSStream; aSStream << "An exception was caught: " << Standard_Failure::Caught() << ends; - Standard_CString aMsg = aSStream.str().c_str(); -// aSStream.rdbuf()->freeze(0); // allow deletion of dynamic array + CString aMsg = aSStream.str().c_str(); AfxMessageBox (aMsg); } } diff --git a/samples/mfc/standard/10_Convert/src/WNT/ResultDialog.cpp b/samples/mfc/standard/10_Convert/src/WNT/ResultDialog.cpp index 55739d5a81..c54135bfde 100755 --- a/samples/mfc/standard/10_Convert/src/WNT/ResultDialog.cpp +++ b/samples/mfc/standard/10_Convert/src/WNT/ResultDialog.cpp @@ -111,7 +111,7 @@ void CResultDialog::Initialize() CLIP_DEFAULT_PRECIS, // nClipPrecision DEFAULT_QUALITY, // nQuality FF_MODERN, // Fix width fonts are FF_MODERN - "Courier New")); // lpszFacename + L"Courier New")); // lpszFacename pEd->SetFont(&aFixedWidthFont, false); // save button's width and height, so they are calculated only once diff --git a/samples/mfc/standard/All-vc12.sln b/samples/mfc/standard/All-vc12.sln new file mode 100644 index 0000000000..b56d428599 --- /dev/null +++ b/samples/mfc/standard/All-vc12.sln @@ -0,0 +1,125 @@ +Microsoft Visual Studio Solution File, Format Version 13.00 +# Visual Studio 2013 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Geometry", "01_Geometry\adm\win\vc12\Geometry.vcxproj", "{31E8199C-C981-4B7F-9CC2-B8502565B581}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Modeling", "02_Modeling\adm\win\vc12\Modeling.vcxproj", "{B10FC678-B9AF-4B05-B3DC-8F790C610CC3}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Viewer2d", "03_Viewer2d\adm\win\vc12\Viewer2d.vcxproj", "{6B905DC2-4E72-4EDA-99C2-7473634690FE}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Viewer3d", "04_Viewer3d\adm\win\vc12\Viewer3d.vcxproj", "{949DFBDF-9007-4C88-8925-43209C36A5D6}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ImportExport", "05_ImportExport\adm\win\vc12\ImportExport.vcxproj", "{1C9A05AE-AF5A-4ACE-9A72-83436D77504C}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Ocaf", "06_Ocaf\adm\win\vc12\Ocaf.vcxproj", "{B3C10EF6-42C7-4DB8-A49C-7E38255D5B1B}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Triangulation", "07_Triangulation\adm\win\vc12\Triangulation.vcxproj", "{B50C10C8-5260-498B-A80F-48FFB4534360}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HLR", "08_HLR\adm\win\vc12\HLR.vcxproj", "{76045260-8DA6-4A3E-B220-F5B1B4ADE192}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Animation", "09_Animation\adm\win\vc12\Animation.vcxproj", "{92492ACB-1F57-40BB-818F-33AD1C20273A}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mfcsample", "mfcsample\adm\win\vc12\mfcsample.vcxproj", "{2D6CBBE8-6965-4016-B503-0D715AE26691}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Convert", "10_Convert\adm\win\vc12\Convert.vcxproj", "{C527B648-F98D-42E5-9F59-251FD95D15A0}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {31E8199C-C981-4B7F-9CC2-B8502565B581}.Debug|Win32.ActiveCfg = Debug|Win32 + {31E8199C-C981-4B7F-9CC2-B8502565B581}.Debug|Win32.Build.0 = Debug|Win32 + {31E8199C-C981-4B7F-9CC2-B8502565B581}.Debug|x64.ActiveCfg = Debug|x64 + {31E8199C-C981-4B7F-9CC2-B8502565B581}.Debug|x64.Build.0 = Debug|x64 + {31E8199C-C981-4B7F-9CC2-B8502565B581}.Release|Win32.ActiveCfg = Release|Win32 + {31E8199C-C981-4B7F-9CC2-B8502565B581}.Release|Win32.Build.0 = Release|Win32 + {31E8199C-C981-4B7F-9CC2-B8502565B581}.Release|x64.ActiveCfg = Release|x64 + {31E8199C-C981-4B7F-9CC2-B8502565B581}.Release|x64.Build.0 = Release|x64 + {B10FC678-B9AF-4B05-B3DC-8F790C610CC3}.Debug|Win32.ActiveCfg = Debug|Win32 + {B10FC678-B9AF-4B05-B3DC-8F790C610CC3}.Debug|Win32.Build.0 = Debug|Win32 + {B10FC678-B9AF-4B05-B3DC-8F790C610CC3}.Debug|x64.ActiveCfg = Debug|x64 + {B10FC678-B9AF-4B05-B3DC-8F790C610CC3}.Debug|x64.Build.0 = Debug|x64 + {B10FC678-B9AF-4B05-B3DC-8F790C610CC3}.Release|Win32.ActiveCfg = Release|Win32 + {B10FC678-B9AF-4B05-B3DC-8F790C610CC3}.Release|Win32.Build.0 = Release|Win32 + {B10FC678-B9AF-4B05-B3DC-8F790C610CC3}.Release|x64.ActiveCfg = Release|x64 + {B10FC678-B9AF-4B05-B3DC-8F790C610CC3}.Release|x64.Build.0 = Release|x64 + {6B905DC2-4E72-4EDA-99C2-7473634690FE}.Debug|Win32.ActiveCfg = Debug|Win32 + {6B905DC2-4E72-4EDA-99C2-7473634690FE}.Debug|Win32.Build.0 = Debug|Win32 + {6B905DC2-4E72-4EDA-99C2-7473634690FE}.Debug|x64.ActiveCfg = Debug|x64 + {6B905DC2-4E72-4EDA-99C2-7473634690FE}.Debug|x64.Build.0 = Debug|x64 + {6B905DC2-4E72-4EDA-99C2-7473634690FE}.Release|Win32.ActiveCfg = Release|Win32 + {6B905DC2-4E72-4EDA-99C2-7473634690FE}.Release|Win32.Build.0 = Release|Win32 + {6B905DC2-4E72-4EDA-99C2-7473634690FE}.Release|x64.ActiveCfg = Release|x64 + {6B905DC2-4E72-4EDA-99C2-7473634690FE}.Release|x64.Build.0 = Release|x64 + {949DFBDF-9007-4C88-8925-43209C36A5D6}.Debug|Win32.ActiveCfg = Debug|Win32 + {949DFBDF-9007-4C88-8925-43209C36A5D6}.Debug|Win32.Build.0 = Debug|Win32 + {949DFBDF-9007-4C88-8925-43209C36A5D6}.Debug|x64.ActiveCfg = Debug|x64 + {949DFBDF-9007-4C88-8925-43209C36A5D6}.Debug|x64.Build.0 = Debug|x64 + {949DFBDF-9007-4C88-8925-43209C36A5D6}.Release|Win32.ActiveCfg = Release|Win32 + {949DFBDF-9007-4C88-8925-43209C36A5D6}.Release|Win32.Build.0 = Release|Win32 + {949DFBDF-9007-4C88-8925-43209C36A5D6}.Release|x64.ActiveCfg = Release|x64 + {949DFBDF-9007-4C88-8925-43209C36A5D6}.Release|x64.Build.0 = Release|x64 + {1C9A05AE-AF5A-4ACE-9A72-83436D77504C}.Debug|Win32.ActiveCfg = Debug|Win32 + {1C9A05AE-AF5A-4ACE-9A72-83436D77504C}.Debug|Win32.Build.0 = Debug|Win32 + {1C9A05AE-AF5A-4ACE-9A72-83436D77504C}.Debug|x64.ActiveCfg = Debug|x64 + {1C9A05AE-AF5A-4ACE-9A72-83436D77504C}.Debug|x64.Build.0 = Debug|x64 + {1C9A05AE-AF5A-4ACE-9A72-83436D77504C}.Release|Win32.ActiveCfg = Release|Win32 + {1C9A05AE-AF5A-4ACE-9A72-83436D77504C}.Release|Win32.Build.0 = Release|Win32 + {1C9A05AE-AF5A-4ACE-9A72-83436D77504C}.Release|x64.ActiveCfg = Release|x64 + {1C9A05AE-AF5A-4ACE-9A72-83436D77504C}.Release|x64.Build.0 = Release|x64 + {B3C10EF6-42C7-4DB8-A49C-7E38255D5B1B}.Debug|Win32.ActiveCfg = Debug|Win32 + {B3C10EF6-42C7-4DB8-A49C-7E38255D5B1B}.Debug|Win32.Build.0 = Debug|Win32 + {B3C10EF6-42C7-4DB8-A49C-7E38255D5B1B}.Debug|x64.ActiveCfg = Debug|x64 + {B3C10EF6-42C7-4DB8-A49C-7E38255D5B1B}.Debug|x64.Build.0 = Debug|x64 + {B3C10EF6-42C7-4DB8-A49C-7E38255D5B1B}.Release|Win32.ActiveCfg = Release|Win32 + {B3C10EF6-42C7-4DB8-A49C-7E38255D5B1B}.Release|Win32.Build.0 = Release|Win32 + {B3C10EF6-42C7-4DB8-A49C-7E38255D5B1B}.Release|x64.ActiveCfg = Release|x64 + {B3C10EF6-42C7-4DB8-A49C-7E38255D5B1B}.Release|x64.Build.0 = Release|x64 + {B50C10C8-5260-498B-A80F-48FFB4534360}.Debug|Win32.ActiveCfg = Debug|Win32 + {B50C10C8-5260-498B-A80F-48FFB4534360}.Debug|Win32.Build.0 = Debug|Win32 + {B50C10C8-5260-498B-A80F-48FFB4534360}.Debug|x64.ActiveCfg = Debug|x64 + {B50C10C8-5260-498B-A80F-48FFB4534360}.Debug|x64.Build.0 = Debug|x64 + {B50C10C8-5260-498B-A80F-48FFB4534360}.Release|Win32.ActiveCfg = Release|Win32 + {B50C10C8-5260-498B-A80F-48FFB4534360}.Release|Win32.Build.0 = Release|Win32 + {B50C10C8-5260-498B-A80F-48FFB4534360}.Release|x64.ActiveCfg = Release|x64 + {B50C10C8-5260-498B-A80F-48FFB4534360}.Release|x64.Build.0 = Release|x64 + {76045260-8DA6-4A3E-B220-F5B1B4ADE192}.Debug|Win32.ActiveCfg = Debug|Win32 + {76045260-8DA6-4A3E-B220-F5B1B4ADE192}.Debug|Win32.Build.0 = Debug|Win32 + {76045260-8DA6-4A3E-B220-F5B1B4ADE192}.Debug|x64.ActiveCfg = Debug|x64 + {76045260-8DA6-4A3E-B220-F5B1B4ADE192}.Debug|x64.Build.0 = Debug|x64 + {76045260-8DA6-4A3E-B220-F5B1B4ADE192}.Release|Win32.ActiveCfg = Release|Win32 + {76045260-8DA6-4A3E-B220-F5B1B4ADE192}.Release|Win32.Build.0 = Release|Win32 + {76045260-8DA6-4A3E-B220-F5B1B4ADE192}.Release|x64.ActiveCfg = Release|x64 + {76045260-8DA6-4A3E-B220-F5B1B4ADE192}.Release|x64.Build.0 = Release|x64 + {92492ACB-1F57-40BB-818F-33AD1C20273A}.Debug|Win32.ActiveCfg = Debug|Win32 + {92492ACB-1F57-40BB-818F-33AD1C20273A}.Debug|Win32.Build.0 = Debug|Win32 + {92492ACB-1F57-40BB-818F-33AD1C20273A}.Debug|x64.ActiveCfg = Debug|x64 + {92492ACB-1F57-40BB-818F-33AD1C20273A}.Debug|x64.Build.0 = Debug|x64 + {92492ACB-1F57-40BB-818F-33AD1C20273A}.Release|Win32.ActiveCfg = Release|Win32 + {92492ACB-1F57-40BB-818F-33AD1C20273A}.Release|Win32.Build.0 = Release|Win32 + {92492ACB-1F57-40BB-818F-33AD1C20273A}.Release|x64.ActiveCfg = Release|x64 + {92492ACB-1F57-40BB-818F-33AD1C20273A}.Release|x64.Build.0 = Release|x64 + {2D6CBBE8-6965-4016-B503-0D715AE26691}.Debug|Win32.ActiveCfg = Debug|Win32 + {2D6CBBE8-6965-4016-B503-0D715AE26691}.Debug|Win32.Build.0 = Debug|Win32 + {2D6CBBE8-6965-4016-B503-0D715AE26691}.Debug|x64.ActiveCfg = Debug|x64 + {2D6CBBE8-6965-4016-B503-0D715AE26691}.Debug|x64.Build.0 = Debug|x64 + {2D6CBBE8-6965-4016-B503-0D715AE26691}.Release|Win32.ActiveCfg = Release|Win32 + {2D6CBBE8-6965-4016-B503-0D715AE26691}.Release|Win32.Build.0 = Release|Win32 + {2D6CBBE8-6965-4016-B503-0D715AE26691}.Release|x64.ActiveCfg = Release|x64 + {2D6CBBE8-6965-4016-B503-0D715AE26691}.Release|x64.Build.0 = Release|x64 + {C527B648-F98D-42E5-9F59-251FD95D15A0}.Debug|Win32.ActiveCfg = Debug|Win32 + {C527B648-F98D-42E5-9F59-251FD95D15A0}.Debug|Win32.Build.0 = Debug|Win32 + {C527B648-F98D-42E5-9F59-251FD95D15A0}.Debug|x64.ActiveCfg = Debug|x64 + {C527B648-F98D-42E5-9F59-251FD95D15A0}.Debug|x64.Build.0 = Debug|x64 + {C527B648-F98D-42E5-9F59-251FD95D15A0}.Release|Win32.ActiveCfg = Release|Win32 + {C527B648-F98D-42E5-9F59-251FD95D15A0}.Release|Win32.Build.0 = Release|Win32 + {C527B648-F98D-42E5-9F59-251FD95D15A0}.Release|x64.ActiveCfg = Release|x64 + {C527B648-F98D-42E5-9F59-251FD95D15A0}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/samples/mfc/standard/Common/DimensionDlg.cpp b/samples/mfc/standard/Common/DimensionDlg.cpp index 872dcf96aa..748a478f5a 100644 --- a/samples/mfc/standard/Common/DimensionDlg.cpp +++ b/samples/mfc/standard/Common/DimensionDlg.cpp @@ -113,7 +113,7 @@ BOOL CDimensionDlg::OnInitDialog() CheckRadioButton (IDC_2DText, IDC_3DText, IDC_2DText); SetTextModeControlsVisible (false); CComboBox* aCombo =(CComboBox* )GetDlgItem (IDC_FontSize); - aCombo->SelectString (0,"10"); + aCombo->SelectString (0, L"10"); UpdateData (FALSE); @@ -167,13 +167,13 @@ void CDimensionDlg::CreateLengthParamsTab() { TC_ITEM aTabItem; aTabItem.mask = TCIF_TEXT; - aTabItem.pszText = "Edge"; + aTabItem.pszText = L"Edge"; myLengthParams->InsertItem (0, &aTabItem); - aTabItem.pszText = "Vertices"; + aTabItem.pszText = L"Vertices"; myLengthParams->InsertItem (1, &aTabItem); - aTabItem.pszText = "Parallel edges"; + aTabItem.pszText = L"Parallel edges"; myLengthParams->InsertItem (2, &aTabItem); - aTabItem.pszText = "Parallel faces"; + aTabItem.pszText = L"Parallel faces"; myLengthParams->InsertItem (3, &aTabItem); CLengthParamsEdgePage *aPage1 = new CLengthParamsEdgePage (myAISContext); @@ -218,11 +218,11 @@ void CDimensionDlg::CreateAngleParamsTab() { TC_ITEM aTabItem; aTabItem.mask = TCIF_TEXT; - aTabItem.pszText = "Two edges"; + aTabItem.pszText = L"Two edges"; myAngleParams->InsertItem (0, &aTabItem); - aTabItem.pszText = "Three vertices"; + aTabItem.pszText = L"Three vertices"; myAngleParams->InsertItem (1, &aTabItem); - aTabItem.pszText = "Two faces"; + aTabItem.pszText = L"Two faces"; myAngleParams->InsertItem (2, &aTabItem); CLengthParamsEdgesPage *aPage1 = new CLengthParamsEdgesPage (myAISContext, true); @@ -259,7 +259,7 @@ void CDimensionDlg::CreateRadiusParamsTab() { TC_ITEM aTabItem; aTabItem.mask = TCIF_TEXT; - aTabItem.pszText = "Circle or arc"; + aTabItem.pszText = L"Circle or arc"; myRadiusParams->InsertItem (0, &aTabItem); CRadiusParamsPage *aPage1 = new CRadiusParamsPage (myAISContext); aTabItem.mask = TCIF_PARAM; @@ -279,7 +279,7 @@ void CDimensionDlg::CreateDiameterParamsTab() { TC_ITEM aTabItem; aTabItem.mask = TCIF_TEXT; - aTabItem.pszText = "Circle or arc"; + aTabItem.pszText = L"Circle or arc"; myDiameterParams->InsertItem (0, &aTabItem); CRadiusParamsPage *aPage1 = new CRadiusParamsPage (myAISContext,Standard_True); aTabItem.mask = TCIF_PARAM; @@ -615,8 +615,8 @@ const Standard_Real CDimensionDlg::GetFontHeight() const { CComboBox *aComboBox = (CComboBox*)GetDlgItem (IDC_FontSize); CString aStr; - aComboBox->GetWindowTextA (aStr); - return (Standard_Real)atof (aStr); + aComboBox->GetWindowText (aStr); + return _wtof (aStr); } //======================================================================= @@ -671,10 +671,10 @@ void CDimensionDlg::UpdateUnitsListForLength() { CComboBox *aCombo = (CComboBox*)GetDlgItem (IDC_DisplayUnits); aCombo->ResetContent(); - aCombo->AddString ("No"); - aCombo->AddString ("m"); - aCombo->AddString ("mm"); - aCombo->AddString ("in"); + aCombo->AddString (L"No"); + aCombo->AddString (L"m"); + aCombo->AddString (L"mm"); + aCombo->AddString (L"in"); aCombo->SetCurSel (1); } @@ -687,9 +687,9 @@ void CDimensionDlg::UpdateUnitsListForAngle() { CComboBox *aCombo = (CComboBox*)GetDlgItem (IDC_DisplayUnits); aCombo->ResetContent(); - aCombo->AddString ("No"); - aCombo->AddString ("deg"); - aCombo->AddString ("rad"); + aCombo->AddString (L"No"); + aCombo->AddString (L"deg"); + aCombo->AddString (L"rad"); aCombo->SetCurSel (1); } @@ -701,7 +701,7 @@ void CDimensionDlg::UpdateUnitsListForAngle() const Standard_Boolean CDimensionDlg::IsUnitsDisplayed() const { CString aStr; - GetDlgItem (IDC_DisplayUnits)->GetWindowTextA (aStr); + GetDlgItem (IDC_DisplayUnits)->GetWindowText (aStr); return !aStr.IsEmpty() && aStr != "No"; } @@ -715,9 +715,9 @@ const TCollection_AsciiString CDimensionDlg::GetUnits() const if (!IsUnitsDisplayed()) return TCollection_AsciiString(); CString aStr; - GetDlgItem (IDC_DisplayUnits)->GetWindowTextA (aStr); - Standard_CString aChars = (LPCSTR)aStr; - return TCollection_AsciiString (aChars); + GetDlgItem (IDC_DisplayUnits)->GetWindowText (aStr); + TCollection_ExtendedString aCharsW ((Standard_ExtString )(const wchar_t* )aStr); + return TCollection_AsciiString (aCharsW, '?'); } //======================================================================= diff --git a/samples/mfc/standard/Common/ImportExport/ImportExport.cpp b/samples/mfc/standard/Common/ImportExport/ImportExport.cpp index 590f4d466d..51e05e4f50 100755 --- a/samples/mfc/standard/Common/ImportExport/ImportExport.cpp +++ b/samples/mfc/standard/Common/ImportExport/ImportExport.cpp @@ -102,9 +102,9 @@ Handle(TopTools_HSequenceOfShape) CImportExport::BuildSequenceFromContext(const //= = //====================================================================== -int CImportExport::ReadBREP(const Handle_AIS_InteractiveContext& anInteractiveContext,LPCTSTR InitialDir /* = NULL*/) +int CImportExport::ReadBREP (const Handle_AIS_InteractiveContext& anInteractiveContext) { - Handle(TopTools_HSequenceOfShape) aSequence = CImportExport::ReadBREP(InitialDir); + Handle(TopTools_HSequenceOfShape) aSequence = CImportExport::ReadBREP(); if(aSequence->IsEmpty()) return 1; Handle_AIS_Shape aShape; @@ -117,18 +117,17 @@ int CImportExport::ReadBREP(const Handle_AIS_InteractiveContext& anInteractiveCo return 0; } -Handle(TopTools_HSequenceOfShape) CImportExport::ReadBREP(LPCTSTR /*InitialDir*/ /* = NULL*/) // not by reference --> the sequence is created here !! +Handle(TopTools_HSequenceOfShape) CImportExport::ReadBREP() { CFileDialog dlg(TRUE, NULL, NULL, OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT, - "BREP Files (*.brep , *.rle)|*.brep; *.BREP; *.rle; *.RLE; |All Files (*.*)|*.*||", + L"BREP Files (*.brep , *.rle)|*.brep; *.BREP; *.rle; *.RLE; |All Files (*.*)|*.*||", NULL ); - TCHAR tchBuf[80]; - - CString CASROOTValue = ((GetEnvironmentVariable("CASROOT", tchBuf, 80) > 0) ? tchBuf : NULL); + CString CASROOTValue; + CASROOTValue.GetEnvironmentVariable (L"CASROOT"); CString initdir = (CASROOTValue + "\\..\\data\\occ"); dlg.m_ofn.lpstrInitialDir = initdir; @@ -140,17 +139,16 @@ Handle(TopTools_HSequenceOfShape) CImportExport::ReadBREP(LPCTSTR /*InitialDir* SetCursor(AfxGetApp()->LoadStandardCursor(IDC_WAIT)); CString filename = dlg.GetPathName(); TopoDS_Shape aShape; - Standard_CString aFileName = (Standard_CString)(LPCTSTR)filename; - Standard_Boolean result = ReadBREP(aFileName,aShape); + Standard_Boolean result = ReadBREP (filename, aShape); if (result) { if (!BRepAlgo::IsValid(aShape)) - MessageBox(AfxGetMainWnd()->m_hWnd,"Warning: The shape is not valid!","Cascade Warning",MB_ICONWARNING); + MessageBoxW (AfxGetMainWnd()->m_hWnd, L"Warning: The shape is not valid!", L"Cascade Warning", MB_ICONWARNING); aSequence->Append(aShape); } else - MessageBox(AfxGetMainWnd()->m_hWnd,"Error: The file was not read","Cascade Error",MB_ICONERROR); + MessageBoxW (AfxGetMainWnd()->m_hWnd, L"Error: The file was not read", L"Cascade Error", MB_ICONERROR); SetCursor(AfxGetApp()->LoadStandardCursor(IDC_ARROW)); } @@ -159,19 +157,28 @@ Handle(TopTools_HSequenceOfShape) CImportExport::ReadBREP(LPCTSTR /*InitialDir* } //---------------------------------------------------------------------- -Standard_Boolean CImportExport::ReadBREP(const Standard_CString& aFileName, +Standard_Boolean CImportExport::ReadBREP(CString aFileName, TopoDS_Shape& aShape) { - BRep_Builder aBuilder; - Standard_Boolean result = BRepTools::Read(aShape,aFileName,aBuilder); - return result; + aShape.Nullify(); + + std::filebuf aFileBuf; + std::istream aStream (&aFileBuf); + if (!aFileBuf.open (aFileName, ios::in)) + { + return Standard_False; + } + + BRep_Builder aBuilder; + BRepTools::Read (aShape, aStream, aBuilder); + return !aShape.IsNull(); } void CImportExport::SaveBREP(const Handle_AIS_InteractiveContext& anInteractiveContext) { anInteractiveContext->InitCurrent(); if (anInteractiveContext->NbCurrents() == 0){ - AfxMessageBox("No shape selected for export!"); + AfxMessageBox (L"No shape selected for export!"); return; } Handle(TopTools_HSequenceOfShape) aHSequenceOfShape; @@ -201,12 +208,11 @@ void CImportExport::SaveBREP(const Handle_AIS_InteractiveContext& anInteractiveC Standard_Boolean CImportExport::SaveBREP(const TopoDS_Shape& aShape) { - CFileDialog dlg(FALSE,_T("*.brep"),NULL,OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT, - "BREP Files (*.brep)|*.brep;|BREP Files (*.BREP)|*.BREP;||", NULL ); + CFileDialog dlg (FALSE, L"*.brep",NULL,OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT, + L"BREP Files (*.brep)|*.brep;|BREP Files (*.BREP)|*.BREP;||", NULL); -TCHAR tchBuf[80]; - -CString CASROOTValue = ((GetEnvironmentVariable("CASROOT", tchBuf, 80) > 0) ? tchBuf : NULL); +CString CASROOTValue; +CASROOTValue.GetEnvironmentVariable (L"CASROOT"); CString initdir = (CASROOTValue + "\\..\\data\\occ"); dlg.m_ofn.lpstrInitialDir = initdir; @@ -216,22 +222,29 @@ dlg.m_ofn.lpstrInitialDir = initdir; { SetCursor(AfxGetApp()->LoadStandardCursor(IDC_WAIT)); CString filename = dlg.GetPathName(); - Standard_CString aFileName = (Standard_CString)(LPCTSTR)filename; - result = SaveBREP(aFileName,aShape); + result = SaveBREP (filename, aShape); if (!result) - MessageBox(0,"Error : The shape or shapes were not saved.", - "CasCade Error",MB_ICONERROR); + MessageBoxW (AfxGetApp()->m_pMainWnd->m_hWnd, + L"Error : The shape or shapes were not saved.", + L"CasCade Error", MB_ICONERROR); SetCursor(AfxGetApp()->LoadStandardCursor(IDC_ARROW)); } return result; } //---------------------------------------------------------------------------------------- -Standard_Boolean CImportExport::SaveBREP(const Standard_CString& aFileName, - const TopoDS_Shape& aShape) +Standard_Boolean CImportExport::SaveBREP (CString aFileName, + const TopoDS_Shape& aShape) { - Standard_Boolean result = BRepTools::Write(aShape,aFileName); - return result; + std::filebuf aFileBuf; + std::ostream aStream (&aFileBuf); + if (!aFileBuf.open (aFileName, ios::out)) + { + return Standard_False; + } + + BRepTools::Write (aShape, aStream); + return Standard_True; } @@ -308,12 +321,11 @@ Handle(TopTools_HSequenceOfShape) CImportExport::ReadCSFDB() // not by reference NULL, NULL, OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT, - "CSFDB Files (*.CSFDB , *.csf)|*.csfdb; *.csf; |All Files (*.*)|*.*||", + L"CSFDB Files (*.CSFDB , *.csf)|*.csfdb; *.csf; |All Files (*.*)|*.*||", NULL ); -TCHAR tchBuf[80]; - -CString CASROOTValue = ((GetEnvironmentVariable("CASROOT", tchBuf, 80) > 0) ? tchBuf : NULL); +CString CASROOTValue; +CASROOTValue.GetEnvironmentVariable(L"CASROOT"); CString initdir = (CASROOTValue + "\\..\\data\\csfdb"); dlg.m_ofn.lpstrInitialDir = initdir; @@ -322,19 +334,12 @@ dlg.m_ofn.lpstrInitialDir = initdir; if (dlg.DoModal() == IDOK) { SetCursor(AfxGetApp()->LoadStandardCursor(IDC_WAIT)); - CString filename = dlg.GetPathName(); - Standard_CString aFileName = (Standard_CString)(LPCTSTR)filename; + TCollection_ExtendedString aFileNameW ((Standard_ExtString )(const wchar_t* )dlg.GetPathName()); + TCollection_AsciiString aFileName (aFileNameW, '?'); TCollection_AsciiString Message; - Standard_Boolean result = ReadCSFDB(aFileName,aSequence,Message); - if (result) - { - // Display The Message : - MessageBox(0,Message.ToCString(),"CasCade ",MB_OK); - - - } - else - MessageBox(0,Message.ToCString(),"CasCade Error",MB_ICONERROR); + Standard_Boolean result = ReadCSFDB (aFileName.ToCString(), aSequence, Message); + CString aMsg (Message.ToCString()); + MessageBoxW(AfxGetApp()->m_pMainWnd->m_hWnd, aMsg, result ? L"CasCade" : L"CasCade Error", result ? MB_OK : MB_ICONERROR); SetCursor(AfxGetApp()->LoadStandardCursor(IDC_ARROW)); } return aSequence; @@ -439,7 +444,7 @@ void CImportExport::SaveCSFDB(const Handle(AIS_InteractiveContext)& anInteractiv { anInteractiveContext->InitCurrent(); if (anInteractiveContext->NbCurrents() == 0){ - AfxMessageBox("No shape selected for export!"); + AfxMessageBox (L"No shape selected for export!"); return; } Handle(Quantity_HArray1OfColor) anArrayOfColors; @@ -455,18 +460,13 @@ Standard_Boolean CImportExport::SaveCSFDB(const Handle(TopTools_HSequenceOfShape if (aDlg.DoModal() == IDOK) { SetCursor(AfxGetApp()->LoadStandardCursor(IDC_WAIT)); - CString filename = aDlg.GetPathName(); - Standard_CString aFileName = (Standard_CString)(LPCTSTR)filename; + TCollection_ExtendedString aFileNameW ((Standard_ExtString )(const wchar_t* )aDlg.GetPathName()); + TCollection_AsciiString aFileName (aFileNameW, '?'); TCollection_AsciiString Message; //MgtBRep_TriangleMode selection = aDlg.m_TriangleMode; - Standard_Boolean result = SaveCSFDB(aFileName,aHSequenceOfShape,Message); - if (result) - { - // Display The Message : - MessageBox(0,Message.ToCString(),"CasCade ",MB_OK); - } - else - MessageBox(0,Message.ToCString(),"CasCade Error",MB_ICONERROR); + Standard_Boolean result = SaveCSFDB (aFileName.ToCString(), aHSequenceOfShape, Message); + CString aMsg (Message.ToCString()); + MessageBoxW (AfxGetApp()->m_pMainWnd->m_hWnd, aMsg, result ? L"CasCade" : L"CasCade Error", result ? MB_OK : MB_ICONERROR); SetCursor(AfxGetApp()->LoadStandardCursor(IDC_ARROW)); } return result; @@ -480,7 +480,7 @@ Standard_Boolean CImportExport::SaveCSFDB(const Standard_CString& aFileName, Standard_Boolean ReturnValue = Standard_True; if (aHSequenceOfShape->Length() == 0) { - MessageBox(0,"No Shape in the HSequence!!","CasCade Warning",MB_ICONWARNING); + MessageBoxW (AfxGetApp()->m_pMainWnd->m_hWnd, L"No Shape in the HSequence!!", L"CasCade Warning", MB_ICONWARNING); return Standard_False; } @@ -582,12 +582,11 @@ Handle(TopTools_HSequenceOfShape) CImportExport::ReadIGES()// not by reference - NULL, NULL, OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT, - "IGES Files (*.iges , *.igs)|*.iges; *.igs|All Files (*.*)|*.*||", + L"IGES Files (*.iges , *.igs)|*.iges; *.igs|All Files (*.*)|*.*||", NULL ); -TCHAR tchBuf[80]; - -CString CASROOTValue = ((GetEnvironmentVariable("CASROOT", tchBuf, 80) > 0) ? tchBuf : NULL); +CString CASROOTValue; +CASROOTValue.GetEnvironmentVariable (L"CASROOT"); CString initdir = (CASROOTValue + "\\..\\data\\iges"); dlg.m_ofn.lpstrInitialDir = initdir; @@ -596,14 +595,14 @@ dlg.m_ofn.lpstrInitialDir = initdir; if (dlg.DoModal() == IDOK) { SetCursor(AfxGetApp()->LoadStandardCursor(IDC_WAIT)); - CString C = dlg.GetPathName(); - Standard_CString aFileName = (Standard_CString)(LPCTSTR)C; - Standard_Integer status = ReadIGES(aFileName,aSequence); - if (status != IFSelect_RetDone) + TCollection_ExtendedString aFileNameW ((Standard_ExtString )(const wchar_t* )dlg.GetPathName()); + TCollection_AsciiString aFileName (aFileNameW, '?'); + Standard_Integer status = ReadIGES (aFileName.ToCString(), aSequence); + if (status != IFSelect_RetDone) { - MessageBox(0,"Error : The file is not read","CasCade Error",MB_ICONERROR); - } - + MessageBoxW (AfxGetApp()->m_pMainWnd->m_hWnd, L"Error : The file is not read", L"CasCade Error", MB_ICONERROR); + } + SetCursor(AfxGetApp()->LoadStandardCursor(IDC_ARROW)); } return aSequence; @@ -631,7 +630,7 @@ void CImportExport::SaveIGES(const Handle(AIS_InteractiveContext)& anInteractive { anInteractiveContext->InitCurrent(); if (anInteractiveContext->NbCurrents() == 0){ - AfxMessageBox("No shape selected for export!"); + AfxMessageBox (L"No shape selected for export!"); return; } Handle(Quantity_HArray1OfColor) anArrayOfColors; @@ -643,16 +642,15 @@ Standard_Boolean CImportExport::SaveIGES(const Handle(TopTools_HSequenceOfShape) { if (aHSequenceOfShape->Length() == 0) { - MessageBox(0,"No Shape in the HSequence!!","CasCade Warning",MB_ICONWARNING); + MessageBoxW (AfxGetApp()->m_pMainWnd->m_hWnd, L"No Shape in the HSequence!!", L"CasCade Warning", MB_ICONWARNING); return Standard_False; } - CFileDialog dlg(FALSE,_T("*.iges"),NULL,OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT, - "IGES Files (*.iges )|*.iges;|IGES Files (*.igs )| *.igs;||", NULL ); + CFileDialog dlg(FALSE, L"*.iges",NULL,OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT, + L"IGES Files (*.iges )|*.iges;|IGES Files (*.igs )| *.igs;||", NULL); -TCHAR tchBuf[80]; - -CString CASROOTValue = ((GetEnvironmentVariable("CASROOT", tchBuf, 80) > 0) ? tchBuf : NULL); +CString CASROOTValue; +CASROOTValue.GetEnvironmentVariable (L"CASROOT"); CString initdir = (CASROOTValue + "\\..\\data\\iges"); dlg.m_ofn.lpstrInitialDir = initdir; @@ -661,11 +659,11 @@ dlg.m_ofn.lpstrInitialDir = initdir; if (dlg.DoModal() == IDOK) { SetCursor(AfxGetApp()->LoadStandardCursor(IDC_WAIT)); - CString C = dlg.GetPathName(); - Standard_CString aFileName = (Standard_CString)(LPCTSTR)C; + TCollection_ExtendedString aFileNameW ((Standard_ExtString )(const wchar_t* )dlg.GetPathName()); + TCollection_AsciiString aFileName (aFileNameW, '?'); - result = SaveIGES(aFileName,aHSequenceOfShape); + result = SaveIGES (aFileName.ToCString(), aHSequenceOfShape); SetCursor(AfxGetApp()->LoadStandardCursor(IDC_ARROW)); } return result; @@ -711,12 +709,11 @@ Handle(TopTools_HSequenceOfShape) CImportExport::ReadSTEP()// not by reference - NULL, NULL, OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT, - "STEP Files (*.stp;*.step)|*.stp; *.step|All Files (*.*)|*.*||", + L"STEP Files (*.stp;*.step)|*.stp; *.step|All Files (*.*)|*.*||", NULL ); -TCHAR tchBuf[80]; - -CString CASROOTValue = ((GetEnvironmentVariable("CASROOT", tchBuf, 80) > 0) ? tchBuf : NULL); +CString CASROOTValue; +CASROOTValue.GetEnvironmentVariable(L"CASROOT"); CString initdir = (CASROOTValue + "\\..\\data\\step"); dlg.m_ofn.lpstrInitialDir = initdir; @@ -725,19 +722,19 @@ dlg.m_ofn.lpstrInitialDir = initdir; if (dlg.DoModal() == IDOK) { SetCursor(AfxGetApp()->LoadStandardCursor(IDC_WAIT)); - CString C = dlg.GetPathName(); - Standard_CString aFileName = (Standard_CString)(LPCTSTR)C; - IFSelect_ReturnStatus ReturnStatus = ReadSTEP(aFileName,aSequence); + TCollection_ExtendedString aFileNameW ((Standard_ExtString )(const wchar_t* )dlg.GetPathName()); + TCollection_AsciiString aFileName (aFileNameW, '?'); + IFSelect_ReturnStatus ReturnStatus = ReadSTEP (aFileName.ToCString(), aSequence); switch (ReturnStatus) { case IFSelect_RetError : - MessageBox(0,"Not a valid Step file","ERROR",MB_ICONWARNING); + MessageBoxW (AfxGetApp()->m_pMainWnd->m_hWnd, L"Not a valid Step file", L"ERROR", MB_ICONWARNING); break; case IFSelect_RetFail : - MessageBox(0,"Reading has failed","ERROR",MB_ICONWARNING); + MessageBoxW (AfxGetApp()->m_pMainWnd->m_hWnd, L"Reading has failed", L"ERROR", MB_ICONWARNING); break; case IFSelect_RetVoid : - MessageBox(0,"Nothing to transfer","ERROR",MB_ICONWARNING); + MessageBoxW (AfxGetApp()->m_pMainWnd->m_hWnd, L"Nothing to transfer", L"ERROR", MB_ICONWARNING); break; } SetCursor(AfxGetApp()->LoadStandardCursor(IDC_ARROW)); @@ -786,7 +783,7 @@ void CImportExport::SaveSTEP(const Handle(AIS_InteractiveContext)& anInteractive { anInteractiveContext->InitCurrent(); if (anInteractiveContext->NbCurrents() == 0){ - AfxMessageBox("No shape selected for export!"); + AfxMessageBox (L"No shape selected for export!"); return; } Handle(Quantity_HArray1OfColor) anArrayOfColors; @@ -831,7 +828,7 @@ IFSelect_ReturnStatus CImportExport::SaveSTEP(const Handle(TopTools_HSequenceOfS { if (aHSequenceOfShape->Length() == 0) { - MessageBox(0,"No Shape in the HSequence!!","CasCade Warning",MB_ICONWARNING); + MessageBox (AfxGetApp()->m_pMainWnd->m_hWnd, L"No Shape in the HSequence!!", L"CasCade Warning", MB_ICONWARNING); return IFSelect_RetError; } @@ -843,8 +840,8 @@ IFSelect_ReturnStatus CImportExport::SaveSTEP(const Handle(TopTools_HSequenceOfS if (aDlg.DoModal() == IDOK) { SetCursor(AfxGetApp()->LoadStandardCursor(IDC_WAIT)); - CString C = aDlg.GetPathName(); - Standard_CString aFileName = (Standard_CString)(LPCTSTR)C; + TCollection_ExtendedString aFileNameW ((Standard_ExtString )(const wchar_t* )aDlg.GetPathName()); + TCollection_AsciiString aFileName (aFileNameW, '?'); STEPControl_StepModelType selection = aDlg.m_Cc1ModelType; @@ -852,22 +849,22 @@ IFSelect_ReturnStatus CImportExport::SaveSTEP(const Handle(TopTools_HSequenceOfS if (!TestFacetedBrep(aHSequenceOfShape)) { - MessageBox(0,"At least one shape doesn't contain facetes","CasCade Warning",MB_ICONWARNING); + MessageBoxW (AfxGetApp()->m_pMainWnd->m_hWnd, L"At least one shape doesn't contain facetes", L"CasCade Warning", MB_ICONWARNING); return IFSelect_RetError; } - status = SaveSTEP(aFileName,aHSequenceOfShape,selection); + status = SaveSTEP (aFileName.ToCString(), aHSequenceOfShape, selection); switch (status) { case IFSelect_RetError: - MessageBox(0,"Incorrect Data","ERROR",MB_ICONWARNING); + MessageBoxW (AfxGetApp()->m_pMainWnd->m_hWnd, L"Incorrect Data", L"ERROR", MB_ICONWARNING); break; case IFSelect_RetFail: - MessageBox(0,"Writing has failed","ERROR",MB_ICONWARNING); + MessageBoxW (AfxGetApp()->m_pMainWnd->m_hWnd, L"Writing has failed", L"ERROR", MB_ICONWARNING); break; case IFSelect_RetVoid: - MessageBox(0,"Nothing to transfer","ERROR",MB_ICONWARNING); + MessageBoxW (AfxGetApp()->m_pMainWnd->m_hWnd, L"Nothing to transfer", L"ERROR", MB_ICONWARNING); break; } SetCursor(AfxGetApp()->LoadStandardCursor(IDC_ARROW)); @@ -907,7 +904,7 @@ void CImportExport::SaveSTL(const Handle(AIS_InteractiveContext)& anInteractiveC { anInteractiveContext->InitCurrent(); if (anInteractiveContext->NbCurrents() == 0){ - AfxMessageBox("No shape selected for export!"); + AfxMessageBox (L"No shape selected for export!"); return; } Handle(Quantity_HArray1OfColor) anArrayOfColors; @@ -917,31 +914,25 @@ void CImportExport::SaveSTL(const Handle(AIS_InteractiveContext)& anInteractiveC Standard_Boolean CImportExport::SaveSTL(const Handle(TopTools_HSequenceOfShape)& aHSequenceOfShape) { - CFileDialog dlg(FALSE,_T("*.stl"),NULL,OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT, - "stl Files (*.stl)|*.stl;|STL Files (*.STL)|*.STL;||", NULL ); + CFileDialog dlg(FALSE, L"*.stl", NULL, OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT, + L"stl Files (*.stl)|*.stl;|STL Files (*.STL)|*.STL;||", NULL); -TCHAR tchBuf[80]; - -CString CASROOTValue = ((GetEnvironmentVariable("CASROOT", tchBuf, 80) > 0) ? tchBuf : NULL); +CString CASROOTValue; +CASROOTValue.GetEnvironmentVariable(L"CASROOT"); CString initdir = (CASROOTValue + "\\..\\data\\stl"); dlg.m_ofn.lpstrInitialDir = initdir; - Standard_Boolean result; + Standard_Boolean result = Standard_False; if (dlg.DoModal() == IDOK) { SetCursor(AfxGetApp()->LoadStandardCursor(IDC_WAIT)); - CString C = dlg.GetPathName(); - Standard_CString aFileName = (Standard_CString)(LPCTSTR)C; + TCollection_ExtendedString aFileNameW ((Standard_ExtString )(const wchar_t* )dlg.GetPathName()); + TCollection_AsciiString aFileName (aFileNameW, '?'); TCollection_AsciiString Message; - result = SaveSTL(aFileName,aHSequenceOfShape,Message); - if (result) - { - // Display The Message : - MessageBox(0,Message.ToCString(),"CasCade ",MB_OK); - } - else - MessageBox(0,Message.ToCString(),"CasCade Error",MB_ICONERROR); + result = SaveSTL (aFileName.ToCString(), aHSequenceOfShape, Message); + CString aMsg (Message.ToCString()); + MessageBoxW (AfxGetApp()->m_pMainWnd->m_hWnd, aMsg, result ? L"CasCade" : L"CasCade Error", result ? MB_OK : MB_ICONERROR); SetCursor(AfxGetApp()->LoadStandardCursor(IDC_ARROW)); } return result; @@ -954,7 +945,7 @@ Standard_Boolean CImportExport::SaveSTL(const Standard_CString& aFileName, Standard_Boolean ReturnValue = Standard_True; if (aHSequenceOfShape->Length() == 0) { - MessageBox(0,"No Shape in the HSequence!!","CasCade Warning",MB_ICONWARNING); + MessageBoxW (AfxGetApp()->m_pMainWnd->m_hWnd, L"No Shape in the HSequence!!", L"CasCade Warning", MB_ICONWARNING); return Standard_False; } @@ -1002,7 +993,7 @@ void CImportExport::SaveVRML(const Handle(AIS_InteractiveContext)& anInteractive { anInteractiveContext->InitCurrent(); if (anInteractiveContext->NbCurrents() == 0){ - AfxMessageBox("No shape selected for export!"); + AfxMessageBox (L"No shape selected for export!"); return; } Handle(Quantity_HArray1OfColor) anArrayOfColors; @@ -1015,31 +1006,25 @@ Standard_Boolean CImportExport::SaveVRML(const Handle(TopTools_HSequenceOfShape) const Handle(Quantity_HArray1OfColor)& anArrayOfColors, const Handle(TColStd_HArray1OfReal)& anArrayOfTransparencies) { - CFileDialog dlg(FALSE,_T("*.vrml"),NULL,OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT, - "vrml Files (*.vrml)|*.vrml;|vrm Files (*.vrm)|*.vrm;||", NULL ); + CFileDialog dlg(FALSE, L"*.vrml", NULL, OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT, + L"vrml Files (*.vrml)|*.vrml;|vrm Files (*.vrm)|*.vrm;||", NULL); -TCHAR tchBuf[80]; - -CString CASROOTValue = ((GetEnvironmentVariable("CASROOT", tchBuf, 80) > 0) ? tchBuf : NULL); +CString CASROOTValue; +CASROOTValue.GetEnvironmentVariable(L"CASROOT"); CString initdir = (CASROOTValue + "\\..\\data\\vrml"); dlg.m_ofn.lpstrInitialDir = initdir; - Standard_Boolean result; + Standard_Boolean result = Standard_False; if (dlg.DoModal() == IDOK) { SetCursor(AfxGetApp()->LoadStandardCursor(IDC_WAIT)); - CString C = dlg.GetPathName(); - Standard_CString aFileName = (Standard_CString)(LPCTSTR)C; + TCollection_ExtendedString aFileNameW ((Standard_ExtString )(const wchar_t* )dlg.GetPathName()); + TCollection_AsciiString aFileName (aFileNameW, '?'); TCollection_AsciiString Message; - result = SaveVRML(aFileName,aHSequenceOfShape,anArrayOfColors, anArrayOfTransparencies, Message); - if (result) - { - // Display The Message : - MessageBox(0,Message.ToCString(),"CasCade ",MB_OK); - } - else - MessageBox(0,Message.ToCString(),"CasCade Error",MB_ICONERROR); + result = SaveVRML (aFileName.ToCString(), aHSequenceOfShape, anArrayOfColors, anArrayOfTransparencies, Message); + CString aMsg (Message.ToCString()); + MessageBoxW (AfxGetApp()->m_pMainWnd->m_hWnd, aMsg, result ? L"CasCade" : L"CasCade Error", result ? MB_OK : MB_ICONERROR); SetCursor(AfxGetApp()->LoadStandardCursor(IDC_ARROW)); } return result; @@ -1054,7 +1039,7 @@ Standard_Boolean CImportExport::SaveVRML(const Standard_CString& Standard_Boolean ReturnValue = Standard_True; if (aHSequenceOfShape->Length() == 0) { - MessageBox(0,"No Shape in the HSequence!!","CasCade Warning",MB_ICONWARNING); + MessageBoxW (AfxGetApp()->m_pMainWnd->m_hWnd, L"No Shape in the HSequence!!", L"CasCade Warning", MB_ICONWARNING); return Standard_False; } diff --git a/samples/mfc/standard/Common/ImportExport/ImportExport.h b/samples/mfc/standard/Common/ImportExport/ImportExport.h index ab64ebe70e..01165faa8a 100755 --- a/samples/mfc/standard/Common/ImportExport/ImportExport.h +++ b/samples/mfc/standard/Common/ImportExport/ImportExport.h @@ -35,15 +35,15 @@ public : //====================================================================== // return is HSequence to be able to select a set of files - static int ReadBREP(const Handle_AIS_InteractiveContext& anInteractiveContext, LPCTSTR InitialDir = NULL); - static Handle_TopTools_HSequenceOfShape ReadBREP(LPCTSTR InitialDir = NULL); // not by reference --> the sequence is created here !! - static Standard_Boolean ReadBREP(const Standard_CString& aFileName, + static int ReadBREP(const Handle_AIS_InteractiveContext& anInteractiveContext); + static Handle_TopTools_HSequenceOfShape ReadBREP(); + static Standard_Boolean ReadBREP(CString aFileName, TopoDS_Shape& aShape); //---------------------------------------------------------------------- static void SaveBREP(const Handle_AIS_InteractiveContext& anInteractiveContext); static Standard_Boolean SaveBREP(const TopoDS_Shape& aShape); - static Standard_Boolean SaveBREP(const Standard_CString& aFileName, + static Standard_Boolean SaveBREP(CString aFileName, const TopoDS_Shape& aShape); diff --git a/samples/mfc/standard/Common/ImportExport/SaveCSFDBDlg.cpp b/samples/mfc/standard/Common/ImportExport/SaveCSFDBDlg.cpp index 4d46e031ed..1b60496774 100755 --- a/samples/mfc/standard/Common/ImportExport/SaveCSFDBDlg.cpp +++ b/samples/mfc/standard/Common/ImportExport/SaveCSFDBDlg.cpp @@ -20,9 +20,9 @@ CFileSaveCSFDBDialog::CFileSaveCSFDBDialog(CWnd* pParent /*=NULL*/) //{{AFX_DATA_INIT(CFileSaveCSFDBDialog) m_TriangleMode = MgtBRep_WithTriangle; //}}AFX_DATA_INIT - TCHAR tchBuf[80]; -CString CASROOTValue = ((GetEnvironmentVariable("CASROOT", tchBuf, 80) > 0) ? tchBuf : NULL); +CString CASROOTValue; +CASROOTValue.GetEnvironmentVariable (L"CASROOT"); CString initdir = (CASROOTValue + "\\..\\data\\csfdb"); m_ofn.lpstrInitialDir = initdir; @@ -60,8 +60,8 @@ BOOL CFileSaveCSFDBDialog::OnInitDialog() { BOOL bRet = CFileDialog::OnInitDialog(); - m_SaveTypeCombo.InsertString(-1,"WithTriangle"); - m_SaveTypeCombo.InsertString(-1,"WithoutTriangle"); + m_SaveTypeCombo.InsertString(-1, L"WithTriangle"); + m_SaveTypeCombo.InsertString(-1, L"WithoutTriangle"); m_SaveTypeCombo.SetCurSel(m_TriangleMode); return bRet; diff --git a/samples/mfc/standard/Common/ImportExport/SaveSTEPDlg.cpp b/samples/mfc/standard/Common/ImportExport/SaveSTEPDlg.cpp index c1094b5d46..2459de2f83 100755 --- a/samples/mfc/standard/Common/ImportExport/SaveSTEPDlg.cpp +++ b/samples/mfc/standard/Common/ImportExport/SaveSTEPDlg.cpp @@ -23,9 +23,8 @@ CFileSaveSTEPDialog::CFileSaveSTEPDialog(CWnd* pParent /*=NULL*/) m_Cc1ModelType = STEPControl_ManifoldSolidBrep; //}}AFX_DATA_INIT - TCHAR tchBuf[80]; - -CString CASROOTValue = ((GetEnvironmentVariable("CASROOT", tchBuf, 80) > 0) ? tchBuf : NULL); +CString CASROOTValue; +CASROOTValue.GetEnvironmentVariable (L"CASROOT"); CString initdir = (CASROOTValue + "\\..\\data\\step"); m_ofn.lpstrInitialDir = initdir; @@ -79,12 +78,12 @@ BOOL CFileSaveSTEPDialog::OnInitDialog() { BOOL bRet = CFileDialog::OnInitDialog(); - m_SaveTypeCombo.InsertString(-1,"ManifoldSolidBrep"); + m_SaveTypeCombo.InsertString(-1, L"ManifoldSolidBrep"); - m_SaveTypeCombo.InsertString(-1,"FacetedBrep"); + m_SaveTypeCombo.InsertString(-1, L"FacetedBrep"); - m_SaveTypeCombo.InsertString(-1,"ShellBasedSurfaceModel"); - m_SaveTypeCombo.InsertString(-1,"GeometricCurveSet"); + m_SaveTypeCombo.InsertString(-1, L"ShellBasedSurfaceModel"); + m_SaveTypeCombo.InsertString(-1, L"GeometricCurveSet"); m_SaveTypeCombo.SetCurSel(m_DialogType); return bRet; diff --git a/samples/mfc/standard/Common/OCC_3dBaseDoc.cpp b/samples/mfc/standard/Common/OCC_3dBaseDoc.cpp index 18267671de..9a2c8ad620 100755 --- a/samples/mfc/standard/Common/OCC_3dBaseDoc.cpp +++ b/samples/mfc/standard/Common/OCC_3dBaseDoc.cpp @@ -222,20 +222,17 @@ void OCC_3dBaseDoc::Fit() pView->FitAll(); } -int OCC_3dBaseDoc::OnFileImportBrep_WithInitDir(LPCTSTR InitialDir) -{ - if(CImportExport::ReadBREP(myAISContext, InitialDir) == 1) - return 1; - Fit(); - return 0; +int OCC_3dBaseDoc::OnFileImportBrep_WithInitDir (const wchar_t* ) +{ + if (CImportExport::ReadBREP (myAISContext) == 1) + return 1; + Fit(); + return 0; } void OCC_3dBaseDoc::OnFileImportBrep() { - if(CImportExport::ReadBREP(myAISContext) == 1) - return; - Fit(); - + OnFileImportBrep_WithInitDir (NULL); } void OCC_3dBaseDoc::OnFileExportBrep() diff --git a/samples/mfc/standard/Common/OCC_3dBaseDoc.h b/samples/mfc/standard/Common/OCC_3dBaseDoc.h index 5c179b2bf9..cd93b28a85 100755 --- a/samples/mfc/standard/Common/OCC_3dBaseDoc.h +++ b/samples/mfc/standard/Common/OCC_3dBaseDoc.h @@ -58,7 +58,7 @@ public: static void Fit(); - int OnFileImportBrep_WithInitDir(LPCTSTR InitialDir); + int OnFileImportBrep_WithInitDir (const wchar_t* InitialDir); // Generated message map functions protected: diff --git a/samples/mfc/standard/Common/OCC_3dDoc.cpp b/samples/mfc/standard/Common/OCC_3dDoc.cpp index ae66a7130d..1a2f4d42c9 100755 --- a/samples/mfc/standard/Common/OCC_3dDoc.cpp +++ b/samples/mfc/standard/Common/OCC_3dDoc.cpp @@ -33,12 +33,13 @@ OCC_3dDoc::~OCC_3dDoc() } -void OCC_3dDoc::PocessTextInDialog(char* aTitle, TCollection_AsciiString& aMessage) +void OCC_3dDoc::PocessTextInDialog (CString theTitle, + CString theMessage) { // aMessage+= "-------------------------------- END ----------------------------------------\n"; - myCResultDialog.SetTitle(aTitle); - myCResultDialog.SetText(aMessage.ToCString()); - SetTitle(aTitle); + myCResultDialog.SetTitle (theTitle); + myCResultDialog.SetText (theMessage); + SetTitle (theTitle); } void OCC_3dDoc::ClearDialog() diff --git a/samples/mfc/standard/Common/OCC_3dDoc.h b/samples/mfc/standard/Common/OCC_3dDoc.h index b22f1c141a..84c6c52f22 100755 --- a/samples/mfc/standard/Common/OCC_3dDoc.h +++ b/samples/mfc/standard/Common/OCC_3dDoc.h @@ -21,7 +21,12 @@ public: OCC_3dDoc(); virtual ~OCC_3dDoc(); - void PocessTextInDialog(char* aTitle, TCollection_AsciiString& aMessage); + void PocessTextInDialog (CString theTitle, CString theMessage); + void PocessTextInDialog (CString theTitle, const TCollection_AsciiString& theMessage) + { + CString aMessage (theMessage.ToCString()); + PocessTextInDialog (theTitle, aMessage); + } void ClearDialog(); void AddTextInDialog(TCollection_AsciiString& aMessage); diff --git a/samples/mfc/standard/Common/OCC_App.cpp b/samples/mfc/standard/Common/OCC_App.cpp index b64e527676..1728d3bd93 100644 --- a/samples/mfc/standard/Common/OCC_App.cpp +++ b/samples/mfc/standard/Common/OCC_App.cpp @@ -45,18 +45,18 @@ OCC_App::OCC_App() : CWinApp() } catch(Standard_Failure) { - AfxMessageBox ("Fatal error during graphic initialization", MB_ICONSTOP); + AfxMessageBox (L"Fatal error during graphic initialization", MB_ICONSTOP); ExitProcess (1); } } void OCC_App::SetSamplePath(LPCTSTR aPath) { - char AbsoluteExecutableFileName[MAX_PATH+1]; - HMODULE hModule = GetModuleHandle(NULL); - GetModuleFileName(hModule, AbsoluteExecutableFileName, MAX_PATH); + wchar_t anAbsoluteExecutableFileName[MAX_PATH + 1]; + HMODULE hModule = GetModuleHandleW (NULL); + GetModuleFileNameW (hModule, anAbsoluteExecutableFileName, MAX_PATH); - SamplePath = CString(AbsoluteExecutableFileName); + SamplePath = CString (anAbsoluteExecutableFileName); int index = SamplePath.ReverseFind('\\'); SamplePath.Delete(index+1, SamplePath.GetLength() - index - 1); if (aPath == NULL) @@ -141,11 +141,12 @@ BOOL CAboutDlgStd::OnInitDialog(){ { aReadmeEdit->ShowWindow(TRUE); UINT aFileLength = (UINT)aFile.GetLength(); - char* buffer=new char[aFileLength]; + char* buffer = new char[aFileLength]; aFile.Read(buffer,aFileLength); - ReadmeText.SetString(buffer); - ReadmeText.SetAt(aFileLength,'\0'); - ReadmeText.Replace("\n","\r\n"); + ReadmeText = buffer; + delete[] buffer; + ReadmeText.SetAt (aFileLength, '\0'); + ReadmeText.Replace (L"\n", L"\r\n"); UpdateData(FALSE); } else @@ -164,19 +165,19 @@ void OCC_App::OnAppAbout() aboutDlg.DoModal(); } -LPCTSTR OCC_App::GetSampleName() +const wchar_t* OCC_App::GetSampleName() const { - return SampleName; + return (const wchar_t* )SampleName; } -LPCTSTR OCC_App::GetInitDataDir() +const wchar_t* OCC_App::GetInitDataDir() const { - return (LPCTSTR) SamplePath; + return (const wchar_t* )SamplePath; } -void OCC_App::SetSampleName(LPCTSTR Name) +void OCC_App::SetSampleName (const wchar_t* theName) { - SampleName = Name; + SampleName = theName; } //============================================================================= @@ -187,11 +188,11 @@ void OCC_App::OnStereo() { Handle(OpenGl_GraphicDriver) aDriver = Handle(OpenGl_GraphicDriver)::DownCast (myGraphicDriver); - int anAnswer = MessageBox(NULL, - "It is required to switch OpenGl context to turn on / off hardware stereo support. " - "The document views need to be re-created to change \"GL\" context pixel format. " - "This will close all current views and open new one (the model will be kept).\n" - "Do you want to continue?", "Enable/disable hardware stereo support", MB_OKCANCEL | MB_ICONQUESTION); + int anAnswer = MessageBoxW (AfxGetApp()->m_pMainWnd->m_hWnd, + L"It is required to switch OpenGl context to turn on / off hardware stereo support. " + L"The document views need to be re-created to change \"GL\" context pixel format. " + L"This will close all current views and open new one (the model will be kept).\n" + L"Do you want to continue?", L"Enable/disable hardware stereo support", MB_OKCANCEL | MB_ICONQUESTION); if (anAnswer != IDOK) { return; diff --git a/samples/mfc/standard/Common/OCC_App.h b/samples/mfc/standard/Common/OCC_App.h index b379fdb88c..b3e402cb6d 100755 --- a/samples/mfc/standard/Common/OCC_App.h +++ b/samples/mfc/standard/Common/OCC_App.h @@ -16,10 +16,10 @@ class AFX_EXT_CLASS OCC_App : public CWinApp { public: - void SetSampleName(LPCTSTR Name); - virtual LPCTSTR GetSampleName(); - LPCTSTR GetInitDataDir(); - void SetSamplePath(LPCTSTR aPath); + void SetSampleName (const wchar_t* theName); + virtual const wchar_t* GetSampleName() const; + const wchar_t* GetInitDataDir() const; + void SetSamplePath (const wchar_t* thePath); OCC_App(); Handle_Graphic3d_GraphicDriver GetGraphicDriver() const { @@ -38,7 +38,7 @@ public: protected: Handle_Graphic3d_GraphicDriver myGraphicDriver; public: - LPCTSTR SampleName; + CString SampleName; CString SamplePath; }; diff --git a/samples/mfc/standard/Common/OCC_BaseDoc.cpp b/samples/mfc/standard/Common/OCC_BaseDoc.cpp index 0985de48b2..bf58d76345 100755 --- a/samples/mfc/standard/Common/OCC_BaseDoc.cpp +++ b/samples/mfc/standard/Common/OCC_BaseDoc.cpp @@ -24,29 +24,30 @@ void OCC_BaseDoc::ExportView (const Handle(V3d_View)& theView) const // Set waiting cursor SetCursor(AfxGetApp()->LoadStandardCursor(IDC_WAIT)); - CString aFileName = anExportDlg.GetPathName(); CString aFileExt = anExportDlg.GetFileExt(); + TCollection_ExtendedString aFileNameW ((Standard_ExtString )(const wchar_t* )anExportDlg.GetPathName()); + TCollection_AsciiString aFileName (aFileNameW, '?'); // For vector formats use V3d_View::Export() method - if (!(aFileExt.CompareNoCase ("ps")) || !(aFileExt.CompareNoCase ("pdf")) - || !(aFileExt.CompareNoCase ("eps")) || !(aFileExt.CompareNoCase ("tex")) - || !(aFileExt.CompareNoCase ("svg")) || !(aFileExt.CompareNoCase ("pgf"))) + if (!(aFileExt.CompareNoCase (L"ps")) || !(aFileExt.CompareNoCase (L"pdf")) + || !(aFileExt.CompareNoCase (L"eps")) || !(aFileExt.CompareNoCase (L"tex")) + || !(aFileExt.CompareNoCase (L"svg")) || !(aFileExt.CompareNoCase (L"pgf"))) { Graphic3d_ExportFormat anExportFormat; - if (!(aFileExt.CompareNoCase ("ps"))) anExportFormat = Graphic3d_EF_PostScript; - else if (!(aFileExt.CompareNoCase ("eps"))) anExportFormat = Graphic3d_EF_EnhPostScript; - else if (!(aFileExt.CompareNoCase ("pdf"))) anExportFormat = Graphic3d_EF_PDF; - else if (!(aFileExt.CompareNoCase ("tex"))) anExportFormat = Graphic3d_EF_TEX; - else if (!(aFileExt.CompareNoCase ("svg"))) anExportFormat = Graphic3d_EF_SVG; + if (!(aFileExt.CompareNoCase (L"ps"))) anExportFormat = Graphic3d_EF_PostScript; + else if (!(aFileExt.CompareNoCase (L"eps"))) anExportFormat = Graphic3d_EF_EnhPostScript; + else if (!(aFileExt.CompareNoCase (L"pdf"))) anExportFormat = Graphic3d_EF_PDF; + else if (!(aFileExt.CompareNoCase (L"tex"))) anExportFormat = Graphic3d_EF_TEX; + else if (!(aFileExt.CompareNoCase (L"svg"))) anExportFormat = Graphic3d_EF_SVG; else anExportFormat = Graphic3d_EF_PGF; - theView->View()->Export (aFileName, anExportFormat); + theView->View()->Export (aFileName.ToCString(), anExportFormat); } else { // For pixel formats use V3d_View:Dump() method - theView->Dump (aFileName); + theView->Dump (aFileName.ToCString()); } // Restore cursor diff --git a/samples/mfc/standard/Common/ResultDialog.cpp b/samples/mfc/standard/Common/ResultDialog.cpp index ee815c4459..3a7ebca863 100755 --- a/samples/mfc/standard/Common/ResultDialog.cpp +++ b/samples/mfc/standard/Common/ResultDialog.cpp @@ -39,7 +39,7 @@ void CResultDialog::Empty() { pEd = (CRichEditCtrl *) GetDlgItem (IDC_RICHEDIT_ResultDialog); //pEd->Clear(); - pEd->SetWindowText(""); + pEd->SetWindowText (L""); } void CResultDialog::SetText(const CString & aText) diff --git a/samples/mfc/standard/Common/Winmain.cpp b/samples/mfc/standard/Common/Winmain.cpp index 97f49a2907..9951bd10a5 100755 --- a/samples/mfc/standard/Common/Winmain.cpp +++ b/samples/mfc/standard/Common/Winmain.cpp @@ -107,8 +107,8 @@ Application: { Standard_SStream ostr; ostr< DynamicLibrary Dynamic - MultiByte + Unicode DynamicLibrary Dynamic - MultiByte + Unicode DynamicLibrary Dynamic - MultiByte + Unicode DynamicLibrary Dynamic - MultiByte + Unicode @@ -238,7 +238,6 @@ Level4 true Default - /p:ResGenExecuteAsTool=true;ResGenToolArchitecture=ManagedIL;ResGenTrackerSdkPath="%programfiles(x86)%\Microsoft SDKs\Windows\v7.0A\bin\NETFX 4.0 Tools\win64" %(AdditionalOptions) NDEBUG;%(PreprocessorDefinitions) diff --git a/samples/mfc/standard/mfcsample/adm/win/vc11/mfcsample.vcxproj b/samples/mfc/standard/mfcsample/adm/win/vc11/mfcsample.vcxproj index 99d3fded33..972ded5e24 100644 --- a/samples/mfc/standard/mfcsample/adm/win/vc11/mfcsample.vcxproj +++ b/samples/mfc/standard/mfcsample/adm/win/vc11/mfcsample.vcxproj @@ -27,25 +27,25 @@ DynamicLibrary Dynamic - MultiByte + Unicode v110 DynamicLibrary Dynamic - MultiByte + Unicode v110 DynamicLibrary Dynamic - MultiByte + Unicode v110 DynamicLibrary Dynamic - MultiByte + Unicode v110 @@ -96,7 +96,7 @@ Disabled $(CSF_OPT_INC);..\..\..\..\Common;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;WNT;_AFXEXT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) + _DEBUG;WIN32;_WINDOWS;WNT;_AFXEXT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -140,7 +140,7 @@ Disabled $(CSF_OPT_INC);..\..\..\..\Common;%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;WNT;_AFXEXT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) + _DEBUG;WIN64;_WINDOWS;WNT;_AFXEXT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -185,7 +185,7 @@ MaxSpeed OnlyExplicitInline $(CSF_OPT_INC);..\..\..\..\Common;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;_AFXEXT;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) + NDEBUG;WIN32;_WINDOWS;_AFXEXT;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -229,7 +229,7 @@ MaxSpeed OnlyExplicitInline $(CSF_OPT_INC);..\..\..\..\Common;..\..\..\..\..\..\Common;%(AdditionalIncludeDirectories) - NDEBUG;WIN64;_WINDOWS;_AFXEXT;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions) + NDEBUG;WIN64;_WINDOWS;_AFXEXT;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -242,7 +242,6 @@ Level4 true Default - /p:ResGenExecuteAsTool=true;ResGenToolArchitecture=ManagedIL;ResGenTrackerSdkPath="%programfiles(x86)%\Microsoft SDKs\Windows\v7.0A\bin\NETFX 4.0 Tools\win64" %(AdditionalOptions) NDEBUG;%(PreprocessorDefinitions) diff --git a/samples/mfc/standard/mfcsample/adm/win/vc12/mfcsample.vcxproj b/samples/mfc/standard/mfcsample/adm/win/vc12/mfcsample.vcxproj new file mode 100644 index 0000000000..c97f860439 --- /dev/null +++ b/samples/mfc/standard/mfcsample/adm/win/vc12/mfcsample.vcxproj @@ -0,0 +1,792 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {2D6CBBE8-6965-4016-B503-0D715AE26691} + mfcsample + MFCProj + + + + DynamicLibrary + Dynamic + Unicode + v120 + + + DynamicLibrary + Dynamic + Unicode + v120 + + + DynamicLibrary + Dynamic + Unicode + v120 + + + DynamicLibrary + Dynamic + Unicode + v120 + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + ../../../../win32\vc12\libd\ + .\win32\objd\ + true + ../../../../win64\vc12\libd\ + .\win64\objd\ + true + ../../../../win32\vc12\lib\ + .\win32\obj\ + false + ../../../../win64\vc12\lib\ + .\win64\obj\ + false + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\win32\objd/mfcsample.tlb + + + + + Disabled + $(CSF_OPT_INC);..\..\..\..\Common;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_WINDOWS;WNT;_AFXEXT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + Use + stdafx.h + .\win32\objd/mfcsample.pch + .\win32\objd/ + .\win32\objd/ + .\win32\objd/ + Level4 + true + EditAndContinue + Default + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;%(AdditionalDependencies) + ../../../../win32\vc12\libd/mfcsample.dll + true + $(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories) + true + ../../../../win32\vc12\libd/mfcsample.pdb + Windows + + + MachineX86 + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + X64 + .\win64\objd/mfcsample.tlb + + + + + Disabled + $(CSF_OPT_INC);..\..\..\..\Common;%(AdditionalIncludeDirectories) + _DEBUG;WIN64;_WINDOWS;WNT;_AFXEXT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + Use + stdafx.h + .\win64\objd/mfcsample.pch + .\win64\objd/ + .\win64\objd/ + .\win64\objd/ + Level4 + true + ProgramDatabase + Default + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;%(AdditionalDependencies) + ../../../../win64\vc12\libd/mfcsample.dll + true + $(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories) + true + ../../../../win64\vc12\libd/mfcsample.pdb + Windows + + + MachineX64 + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\win32\obj/mfcsample.tlb + + + + + MaxSpeed + OnlyExplicitInline + $(CSF_OPT_INC);..\..\..\..\Common;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_WINDOWS;_AFXEXT;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + Use + stdafx.h + .\win32\obj/mfcsample.pch + .\win32\obj/ + .\win32\obj/ + .\win32\obj/ + Level4 + true + Default + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;%(AdditionalDependencies) + ../../../../win32\vc12\lib/mfcsample.dll + true + $(CSF_OPT_LIB32);%(AdditionalLibraryDirectories) + ../../../../win32\vc12\lib/mfcsample.pdb + Windows + + + MachineX86 + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + X64 + .\win64\obj/mfcsample.tlb + + + + + MaxSpeed + OnlyExplicitInline + $(CSF_OPT_INC);..\..\..\..\Common;..\..\..\..\..\..\Common;%(AdditionalIncludeDirectories) + NDEBUG;WIN64;_WINDOWS;_AFXEXT;WNT;CSFDB;WINVER=0x0501;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + Use + stdafx.h + .\win64\obj/mfcsample.pch + .\win64\obj/ + .\win64\obj/ + .\win64\obj/ + Level4 + true + Default + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + $(IntDir)%(Filename).res + + + TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;%(AdditionalDependencies) + ../../../../win64\vc12\lib/mfcsample.dll + true + $(CSF_OPT_LIB64);%(AdditionalLibraryDirectories) + ../../../../win64\vc12\lib/mfcsample.pdb + Windows + + + MachineX64 + + + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + + + + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Create + ..\Common\stdafx.h + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Create + ..\Common\stdafx.h + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + Create + ..\Common\stdafx.h + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + Create + ..\Common\stdafx.h + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + EnableFastChecks + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MaxSpeed + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + + + %(PreprocessorDefinitions) + \mfc\Common\res;%(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + \mfc\Common\res;%(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + \mfc\Common\res;%(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + \mfc\Common\res;%(AdditionalIncludeDirectories) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/samples/mfc/standard/mfcsample/adm/win/vc12/mfcsample.vcxproj.filters b/samples/mfc/standard/mfcsample/adm/win/vc12/mfcsample.vcxproj.filters new file mode 100644 index 0000000000..1e4879dfd8 --- /dev/null +++ b/samples/mfc/standard/mfcsample/adm/win/vc12/mfcsample.vcxproj.filters @@ -0,0 +1,289 @@ + + + + + {23255ff5-fb8f-4ffd-bf15-b4aab2f5a773} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + {c0619ee9-00d5-4587-ac1c-7f8e97f7d314} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + {6c21e485-b17c-4b50-a64e-8032b8867916} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + {5cef5b98-dbfe-4dc1-9030-6333f582b9e6} + + + {2d59ab2b-935c-4f19-a01a-cf228ab78490} + h;hpp;hxx;hm;inl + + + {da6f5036-6fe5-479c-9407-d4c6bb3bc83f} + h;hpp;hxx;hm;inl + + + {f0d2a1cd-637f-4375-8949-9c5bc227c1a6} + + + {cad0c56e-8d9f-4728-9d66-f7188c6080d7} + + + {7d971500-8ead-4c2b-851d-31395a5fb01c} + ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files\Resource2D-src + + + Source Files\Resource2D-src + + + Source Files\Resource2D-src + + + Source Files\Primitive-src + + + Source Files\Primitive-src + + + Source Files\Primitive-src + + + Source Files\Primitive-src + + + Source Files\ISession2D-src + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files\Resource2D-headers + + + Header Files\Resource2D-headers + + + Header Files\Resource2D-headers + + + Header Files\Primitive-headers + + + Header Files\Primitive-headers + + + Header Files\Primitive-headers + + + Header Files\Primitive-headers + + + Header Files\ISession2D-headers + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + \ No newline at end of file diff --git a/samples/mfc/standard/mfcsample/adm/win/vc8/mfcsample.vcproj b/samples/mfc/standard/mfcsample/adm/win/vc8/mfcsample.vcproj index 994a3fbeed..9c5d36a274 100644 --- a/samples/mfc/standard/mfcsample/adm/win/vc8/mfcsample.vcproj +++ b/samples/mfc/standard/mfcsample/adm/win/vc8/mfcsample.vcproj @@ -26,7 +26,7 @@ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="2" ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" + CharacterSet="1" >