PR: synchro V6_main tag mergeto_V7_main_11Feb13

[modules/smesh.git] / src / SMESHGUI / SMESHGUI_BuildCompoundDlg.cxx

diff --git a/src/SMESHGUI/SMESHGUI_BuildCompoundDlg.cxx b/src/SMESHGUI/SMESHGUI_BuildCompoundDlg.cxx
index edee4cecbda29c16d215f47a606bab0bdb28bf3e..cadd4593f51688b49182c8cc8966723736e8986d 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_BuildCompoundDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_BuildCompoundDlg.cxx
@@ -206,7 +206,7 @@ void SMESHGUI_BuildCompoundDlg::Init()
 
   myMesh = SMESH::SMESH_Mesh::_nil();
 
-  myMeshFilter = new SMESH_TypeFilter (MESH);
+  myMeshFilter = new SMESH_TypeFilter (SMESH::MESH);
 
   myMeshArray = new SMESH::mesh_array();
 
@@ -347,13 +347,11 @@ bool SMESHGUI_BuildCompoundDlg::ClickOnApply()
 
     SMESHGUI::Modified();
 
-#ifdef WITHGENERICOBJ
     // obj has been published in study. Its refcount has been incremented.
     // It is safe to decrement its refcount
     // so that it will be destroyed when the entry in study will be removed
     if (!CORBA::is_nil(aCompoundMesh))
       aCompoundMesh->UnRegister();
-#endif
 
     return true;
   }