0023599: Some MFC samples are crached during launching

Fixing compiler warnings in MFC samples (MSVC compiler)
File .gitignore modified to ignore files generated by VS 2012

diff --git a/.gitignore b/.gitignore
index c0d8f5e..5c04544 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -10,8 +10,10 @@
 /drv
 /inc
 /work
 /drv
 /inc
 /work

-/win32
-/win64
+
+# standard names of directories for objects and binaries on Windows
+win32
+win64

 
 # project files and artifacts
 /adm/msvc
 
 # project files and artifacts
 /adm/msvc


@@ -19,9 +21,11 @@
 /adm/lin
 /adm/mac
 /adm/make
 /adm/lin
 /adm/mac
 /adm/make

+/adm/cmake

 *.vcproj*user
 *.ncb
 *.suo
 *.vcproj*user
 *.ncb
 *.suo

+*.sdf

 
 # test results
 /results*
 
 # test results
 /results*

diff --git a/samples/mfc/standard/04_Viewer3d/src/OffsetDlg.cpp b/samples/mfc/standard/04_Viewer3d/src/OffsetDlg.cpp
index 34b9966..d9e0010 100755 (executable)
--- a/samples/mfc/standard/04_Viewer3d/src/OffsetDlg.cpp
+++ b/samples/mfc/standard/04_Viewer3d/src/OffsetDlg.cpp
@@ -132,6 +132,8 @@ void COffsetDlg::SetOffsets(Standard_Real theFactor, Standard_Real theUnits)
        TCollection_AsciiString Message;
 
        Standard_Boolean OneOrMoreCurrentIsDisplayed=false;
        TCollection_AsciiString Message;
 
        Standard_Boolean OneOrMoreCurrentIsDisplayed=false;

+        Standard_ShortReal aFactor = (Standard_ShortReal)theFactor;
+        Standard_ShortReal aUnits = (Standard_ShortReal)theUnits;

        
        for (aAISContext->InitCurrent();aAISContext->MoreCurrent ();aAISContext->NextCurrent ())
                if (aAISContext->IsDisplayed(aAISContext->Current())) OneOrMoreCurrentIsDisplayed=true;
        
        for (aAISContext->InitCurrent();aAISContext->MoreCurrent ();aAISContext->NextCurrent ())
                if (aAISContext->IsDisplayed(aAISContext->Current())) OneOrMoreCurrentIsDisplayed=true;


@@ -139,40 +141,40 @@ void COffsetDlg::SetOffsets(Standard_Real theFactor, Standard_Real theUnits)
        if(OneOrMoreCurrentIsDisplayed){
                if((aAISContext->IsCurrent(aOverlappedBox) || aAISContext->IsCurrent(aBox))
                                && aAISContext->IsDisplayed(aOverlappedBox)){
        if(OneOrMoreCurrentIsDisplayed){
                if((aAISContext->IsCurrent(aOverlappedBox) || aAISContext->IsCurrent(aBox))
                                && aAISContext->IsDisplayed(aOverlappedBox)){

-                       aOverlappedBox->SetPolygonOffsets(Aspect_POM_Fill,theFactor,theUnits);
+                       aOverlappedBox->SetPolygonOffsets(Aspect_POM_Fill,aFactor,aUnits);

                        Message = "Box2 -> SetPolygonOffsets(Aspect_POM_Fill, Factor, Units);\n";
                        //myDoc -> AddTextInDialog(Message);
                }
 
                if((aAISContext->IsCurrent(aOverlappedCylinder) || aAISContext->IsCurrent(aCylinder)) 
                                && aAISContext->IsDisplayed(aOverlappedCylinder)){
                        Message = "Box2 -> SetPolygonOffsets(Aspect_POM_Fill, Factor, Units);\n";
                        //myDoc -> AddTextInDialog(Message);
                }
 
                if((aAISContext->IsCurrent(aOverlappedCylinder) || aAISContext->IsCurrent(aCylinder)) 
                                && aAISContext->IsDisplayed(aOverlappedCylinder)){

-                       aOverlappedCylinder->SetPolygonOffsets(Aspect_POM_Fill,theFactor,theUnits);
+                       aOverlappedCylinder->SetPolygonOffsets(Aspect_POM_Fill,aFactor,aUnits);

                        Message = Message + "Cylinder2 -> SetPolygonOffsets(Aspect_POM_Fill, Factor, Units);\n";
                        //myDoc -> AddTextInDialog(Message);
                }
 
                if((aAISContext->IsCurrent(aOverlappedSphere) || aAISContext->IsCurrent(aSphere))
                                && aAISContext->IsDisplayed(aOverlappedSphere)){
                        Message = Message + "Cylinder2 -> SetPolygonOffsets(Aspect_POM_Fill, Factor, Units);\n";
                        //myDoc -> AddTextInDialog(Message);
                }
 
                if((aAISContext->IsCurrent(aOverlappedSphere) || aAISContext->IsCurrent(aSphere))
                                && aAISContext->IsDisplayed(aOverlappedSphere)){

-                       aOverlappedSphere->SetPolygonOffsets(Aspect_POM_Fill,theFactor,theUnits);
+                       aOverlappedSphere->SetPolygonOffsets(Aspect_POM_Fill,aFactor,aUnits);

                        Message = Message + "Sphere2 -> SetPolygonOffsets(Aspect_POM_Fill, Factor, Units);\n";
                        //myDoc -> AddTextInDialog(Message);
                }       
        }
        else{
                if(aAISContext->IsDisplayed(aOverlappedBox)){
                        Message = Message + "Sphere2 -> SetPolygonOffsets(Aspect_POM_Fill, Factor, Units);\n";
                        //myDoc -> AddTextInDialog(Message);
                }       
        }
        else{
                if(aAISContext->IsDisplayed(aOverlappedBox)){

-                       aOverlappedBox->SetPolygonOffsets(Aspect_POM_Fill,theFactor,theUnits);
+                       aOverlappedBox->SetPolygonOffsets(Aspect_POM_Fill,aFactor,aUnits);

                        Message = Message + "Box2 -> SetPolygonOffsets(Aspect_POM_Fill, Factor, Units);\n";
                        //myDoc -> AddTextInDialog(Message);
                }
 
                if(aAISContext->IsDisplayed(aOverlappedCylinder)){
                        Message = Message + "Box2 -> SetPolygonOffsets(Aspect_POM_Fill, Factor, Units);\n";
                        //myDoc -> AddTextInDialog(Message);
                }
 
                if(aAISContext->IsDisplayed(aOverlappedCylinder)){

-                       aOverlappedCylinder->SetPolygonOffsets(Aspect_POM_Fill,theFactor,theUnits);
+                       aOverlappedCylinder->SetPolygonOffsets(Aspect_POM_Fill,aFactor,aUnits);

                        Message = Message + "Cylinder2 -> SetPolygonOffsets(Aspect_POM_Fill, Factor, Units);\n";
                        //myDoc -> AddTextInDialog(Message);
                }
 
                if(aAISContext->IsDisplayed(aOverlappedSphere)){
                        Message = Message + "Cylinder2 -> SetPolygonOffsets(Aspect_POM_Fill, Factor, Units);\n";
                        //myDoc -> AddTextInDialog(Message);
                }
 
                if(aAISContext->IsDisplayed(aOverlappedSphere)){

-                       aOverlappedSphere->SetPolygonOffsets(Aspect_POM_Fill,theFactor,theUnits);
+                       aOverlappedSphere->SetPolygonOffsets(Aspect_POM_Fill,aFactor,aUnits);

                        Message = Message + "Sphere2 -> SetPolygonOffsets(Aspect_POM_Fill, Factor, Units);\n";
                        //myDoc -> AddTextInDialog(Message);
                }
                        Message = Message + "Sphere2 -> SetPolygonOffsets(Aspect_POM_Fill, Factor, Units);\n";
                        //myDoc -> AddTextInDialog(Message);
                }

diff --git a/samples/mfc/standard/06_Ocaf/src/NewBoxDlg.cpp b/samples/mfc/standard/06_Ocaf/src/NewBoxDlg.cpp
index 966200d..274ba27 100755 (executable)
--- a/samples/mfc/standard/06_Ocaf/src/NewBoxDlg.cpp
+++ b/samples/mfc/standard/06_Ocaf/src/NewBoxDlg.cpp
@@ -1,12 +1,6 @@
 // NewBoxDlg.cpp : implementation file
 //
 
 // NewBoxDlg.cpp : implementation file
 //
 

-#ifdef _DEBUG
-#define new DEBUG_NEW
-#undef THIS_FILE
-static char THIS_FILE[] = __FILE__;
-#endif
-

 #include "stdafx.h"
 
 #include "NewBoxDlg.h"
 #include "stdafx.h"
 
 #include "NewBoxDlg.h"

diff --git a/samples/mfc/standard/06_Ocaf/src/NewCylDlg.cpp b/samples/mfc/standard/06_Ocaf/src/NewCylDlg.cpp
index 83aa8a1..06d63b2 100755 (executable)
--- a/samples/mfc/standard/06_Ocaf/src/NewCylDlg.cpp
+++ b/samples/mfc/standard/06_Ocaf/src/NewCylDlg.cpp
@@ -1,12 +1,6 @@
 // NewCylDlg.cpp : implementation file
 //
 
 // NewCylDlg.cpp : implementation file
 //
 

-#ifdef _DEBUG
-#define new DEBUG_NEW
-#undef THIS_FILE
-static char THIS_FILE[] = __FILE__;
-#endif
-

 #include "stdafx.h"
 
 #include "NewCylDlg.h"
 #include "stdafx.h"
 
 #include "NewCylDlg.h"