From: ana <ana@opencascade.com>
Date: Wed, 10 Oct 2012 08:43:19 +0000 (+0000)
Subject: Avoid "GROUP" redefinition on win32: add 'MeshObjectType'enum to namespace SMESH
X-Git-Tag: V6_6_0a1~3
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=f9c860d9c23b20c1d3f93b98e1ab45ff3c2ed115;p=plugins%2Fhybridplugin.git

Avoid "GROUP" redefinition on win32: add 'MeshObjectType'enum to namespace SMESH
---

diff --git a/src/GUI/GHS3DPluginGUI_HypothesisCreator.cxx b/src/GUI/GHS3DPluginGUI_HypothesisCreator.cxx
index 4f32cba..eab4b29 100644
--- a/src/GUI/GHS3DPluginGUI_HypothesisCreator.cxx
+++ b/src/GUI/GHS3DPluginGUI_HypothesisCreator.cxx
@@ -594,7 +594,7 @@ QFrame* GHS3DPluginGUI_HypothesisCreator::buildFrame()
 //   myEnfMesh = SMESH::SMESH_Mesh::_nil();
 //   myEnfMeshArray = new SMESH::mesh_array();
 
-  myEnfMeshWdg = new StdMeshersGUI_ObjectReferenceParamWdg( IDSOURCE, myEnfMeshGroup, /*multiSel=*/true);
+  myEnfMeshWdg = new StdMeshersGUI_ObjectReferenceParamWdg( SMESH::IDSOURCE, myEnfMeshGroup, /*multiSel=*/true);
   myEnfMeshWdg->SetDefaultText(tr("GHS3D_ENF_SELECT_MESH"), "QLineEdit { color: grey }");
   
   myEnfMeshWdg->AvoidSimultaneousSelection(myEnfVertexWdg);