Merge from V6_main 13/12/2012

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

diff --git a/src/SMESHGUI/SMESHGUI_GroupOnShapeDlg.cxx b/src/SMESHGUI/SMESHGUI_GroupOnShapeDlg.cxx
index 2bfdd1bc948ed16c0d4ad93b626c8138eb087201..f4cde4f1b1c3c2323cd9a07ece977c49dbab32ac 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_GroupOnShapeDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_GroupOnShapeDlg.cxx
@@ -353,10 +353,10 @@ bool SMESHGUI_GroupOnShapeOp::onApply()
           anEntryList.append( aSObject->GetID().c_str() );
     }
   }
-  update( UF_ObjBrowser | UF_Model );
-
   SMESHGUI::Modified();
 
+  update( UF_ObjBrowser | UF_Model );
+
   // Re-init controls to create the next group
   myElemGeoIDs.clear();
   myNodeGeoIDs.clear();
@@ -367,8 +367,6 @@ bool SMESHGUI_GroupOnShapeOp::onApply()
   myDlg->myNodeGeomBtn->setChecked(false);
   myDlg->updateButtons();
 
-  update( UF_ObjBrowser | UF_Model );
-
   if( LightApp_Application* anApp =
       dynamic_cast<LightApp_Application*>( SUIT_Session::session()->activeApplication() ) )
     anApp->browseObjects( anEntryList, isApplyAndClose() );
@@ -421,7 +419,7 @@ SUIT_SelectionFilter* SMESHGUI_GroupOnShapeOp::createFilter( const int theId ) c
   if ( theId == _ELEM_GEOM || theId == _NODE_GEOM )
     return new GEOM_SelectionFilter( (SalomeApp_Study*)study(), true );
   else if ( theId == _MESH )
-    return new SMESH_TypeFilter( MESH );
+    return new SMESH_TypeFilter( SMESH::MESH );
   else
     return ( SUIT_SelectionFilter*) 0;
 }