Implementation of the "16219: EDF PAL 469: "RemoveFromStudy" Function" issue.

[modules/geom.git] / src / RepairGUI / RepairGUI_GlueDlg.cxx

diff --git a/src/RepairGUI/RepairGUI_GlueDlg.cxx b/src/RepairGUI/RepairGUI_GlueDlg.cxx
index e4f44624692b1d85936cd8854d03c06d79e43e51..d79190e2332b51f05489bac1b8e0480b00bae783 100644 (file)
--- a/src/RepairGUI/RepairGUI_GlueDlg.cxx
+++ b/src/RepairGUI/RepairGUI_GlueDlg.cxx
@@ -157,6 +157,8 @@ void RepairGUI_GlueDlg::Init()
   //globalSelection( GEOM_COMPOUND );
 
   mainFrame()->GroupBoxPublish->show();
+  //Hide preview checkbox
+  mainFrame()->CheckBoxPreview->hide();
 
   /* signals and slots connections */
   connect( buttonOk(),    SIGNAL(clicked()), this, SLOT(ClickOnOk()));
@@ -237,7 +239,7 @@ void RepairGUI_GlueDlg::ConstructorsClicked( int constructorId )
   updateGeometry();
   resize( minimumSizeHint() );
 
-  displayPreview();
+  processPreview();
   updateButtonState();
   activateSelection();
   SelectionIntoArgument();
@@ -250,6 +252,7 @@ void RepairGUI_GlueDlg::ConstructorsClicked( int constructorId )
 //=================================================================================
 void RepairGUI_GlueDlg::ClickOnOk()
 {
+  setIsApplyAndClose( true );
   if ( ClickOnApply() )
     ClickOnCancel();
 }
@@ -298,9 +301,8 @@ void RepairGUI_GlueDlg::SelectionIntoArgument()
 
   if ( aSelList.Extent() == 1 ) {
     Handle(SALOME_InteractiveObject) anIO = aSelList.First();
-    Standard_Boolean aRes;
-    myObject = GEOMBase::ConvertIOinGEOMObject( anIO, aRes );
-    if ( aRes )
+    myObject = GEOMBase::ConvertIOinGEOMObject( anIO );
+    if ( !CORBA::is_nil( myObject ) )
       myEditCurrentArgument->setText( GEOMBase::GetName( myObject ) );
   }
   updateButtonState();