OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-03 17:56:21 +03:00
Code Packages Releases Activity

0023599: Some MFC samples are crached during launching

Browse Source 
Fixing compiler warnings in MFC samples (MSVC compiler)
File .gitignore modified to ignore files generated by VS 2012
This commit is contained in:
abv 2012-12-07 10:31:38 +04:00
parent bf75be9867
commit 23bbd9d392
4 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.gitignore vendored
View File

@ -10,8 +10,10 @@
/drv /drv
/inc /inc
/work /work
/win32
/win64 # standard names of directories for objects and binaries on Windows
win32
win64
# project files and artifacts # project files and artifacts
/adm/msvc /adm/msvc
@ -19,9 +21,11 @@
/adm/lin /adm/lin
/adm/mac /adm/mac
/adm/make /adm/make
/adm/cmake
*.vcproj*user *.vcproj*user
*.ncb *.ncb
*.suo *.suo
*.sdf
# test results # test results
/results* /results*

14
samples/mfc/standard/04_Viewer3d/src/OffsetDlg.cpp
View File

@ -132,6 +132,8 @@ void COffsetDlg::SetOffsets(Standard_Real theFactor, Standard_Real theUnits)
TCollection_AsciiString Message; TCollection_AsciiString Message;
Standard_Boolean OneOrMoreCurrentIsDisplayed=false; Standard_Boolean OneOrMoreCurrentIsDisplayed=false;
Standard_ShortReal aFactor = (Standard_ShortReal)theFactor;
Standard_ShortReal aUnits = (Standard_ShortReal)theUnits;
for (aAISContext->InitCurrent();aAISContext->MoreCurrent ();aAISContext->NextCurrent ()) for (aAISContext->InitCurrent();aAISContext->MoreCurrent ();aAISContext->NextCurrent ())
if (aAISContext->IsDisplayed(aAISContext->Current())) OneOrMoreCurrentIsDisplayed=true; if (aAISContext->IsDisplayed(aAISContext->Current())) OneOrMoreCurrentIsDisplayed=true;
@ -139,40 +141,40 @@ void COffsetDlg::SetOffsets(Standard_Real theFactor, Standard_Real theUnits)
if(OneOrMoreCurrentIsDisplayed){ if(OneOrMoreCurrentIsDisplayed){
if((aAISContext->IsCurrent(aOverlappedBox) || aAISContext->IsCurrent(aBox)) if((aAISContext->IsCurrent(aOverlappedBox) || aAISContext->IsCurrent(aBox))
&& aAISContext->IsDisplayed(aOverlappedBox)){ && 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"; Message = "Box2 -> SetPolygonOffsets(Aspect_POM_Fill, Factor, Units);\n";
//myDoc -> AddTextInDialog(Message); //myDoc -> AddTextInDialog(Message);
} }
if((aAISContext->IsCurrent(aOverlappedCylinder) || aAISContext->IsCurrent(aCylinder)) if((aAISContext->IsCurrent(aOverlappedCylinder) || aAISContext->IsCurrent(aCylinder))
&& aAISContext->IsDisplayed(aOverlappedCylinder)){ && 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"; Message = Message + "Cylinder2 -> SetPolygonOffsets(Aspect_POM_Fill, Factor, Units);\n";
//myDoc -> AddTextInDialog(Message); //myDoc -> AddTextInDialog(Message);
} }
if((aAISContext->IsCurrent(aOverlappedSphere) || aAISContext->IsCurrent(aSphere)) if((aAISContext->IsCurrent(aOverlappedSphere) || aAISContext->IsCurrent(aSphere))
&& aAISContext->IsDisplayed(aOverlappedSphere)){ && 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"; Message = Message + "Sphere2 -> SetPolygonOffsets(Aspect_POM_Fill, Factor, Units);\n";
//myDoc -> AddTextInDialog(Message); //myDoc -> AddTextInDialog(Message);
} }
} }
else{ else{
if(aAISContext->IsDisplayed(aOverlappedBox)){ 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"; Message = Message + "Box2 -> SetPolygonOffsets(Aspect_POM_Fill, Factor, Units);\n";
//myDoc -> AddTextInDialog(Message); //myDoc -> AddTextInDialog(Message);
} }
if(aAISContext->IsDisplayed(aOverlappedCylinder)){ 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"; Message = Message + "Cylinder2 -> SetPolygonOffsets(Aspect_POM_Fill, Factor, Units);\n";
//myDoc -> AddTextInDialog(Message); //myDoc -> AddTextInDialog(Message);
} }
if(aAISContext->IsDisplayed(aOverlappedSphere)){ 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"; Message = Message + "Sphere2 -> SetPolygonOffsets(Aspect_POM_Fill, Factor, Units);\n";
//myDoc -> AddTextInDialog(Message); //myDoc -> AddTextInDialog(Message);
} }

6
samples/mfc/standard/06_Ocaf/src/NewBoxDlg.cpp
View File

@ -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 "stdafx.h"
#include "NewBoxDlg.h" #include "NewBoxDlg.h"

6
samples/mfc/standard/06_Ocaf/src/NewCylDlg.cpp
View File

@ -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 "stdafx.h"
#include "NewCylDlg.h" #include "NewCylDlg.h"