Merge from V6_3_BR 06/06/2011

[modules/smesh.git] / src / StdMeshersGUI / StdMeshersGUI_ObjectReferenceParamWdg.cxx

diff --git a/src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.cxx b/src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.cxx
index 45aba152c8d24309a1919833e555b05555b4ac30..da40f732a94b5d874b32991eb971d413d75ed633 100644 (file)
--- a/src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.cxx
+++ b/src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.cxx
@@ -1,23 +1,23 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License.
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
 //
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
 //
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
 // File   : StdMeshersGUI_ObjectReferenceParamWdg.cxx
@@ -56,10 +56,11 @@
 //================================================================================
 
 StdMeshersGUI_ObjectReferenceParamWdg::StdMeshersGUI_ObjectReferenceParamWdg
-( SUIT_SelectionFilter* f, QWidget* parent, bool multiSelection)
+( SUIT_SelectionFilter* f, QWidget* parent, bool multiSelection, bool stretch )
   : QWidget( parent ), myMultiSelection( multiSelection )
 {
   myFilter = f;
+  myStretchActivated = stretch;
   init();
 }
 
@@ -126,7 +127,9 @@ void StdMeshersGUI_ObjectReferenceParamWdg::init()
 
   aHBox->addWidget( mySelButton );
   aHBox->addWidget( myObjNameLineEdit );
-  aHBox->addStretch();
+  if (myStretchActivated){
+    aHBox->addStretch();
+  }
 
   connect( mySelButton, SIGNAL(clicked()), SLOT(activateSelection()));
 }
@@ -150,6 +153,7 @@ void StdMeshersGUI_ObjectReferenceParamWdg::activateSelection()
     connect(mySelectionMgr, SIGNAL(currentSelectionChanged()), SLOT(onSelectionDone()));
   }
   emit selectionActivated();
+  onSelectionDone();
 
   mySelButton->setChecked( mySelectionActivated );
 }
@@ -293,4 +297,4 @@ void StdMeshersGUI_ObjectReferenceParamWdg::SetDefaultText(QString defaultText,
   myEmptyStyleSheet = styleSheet;
   myObjNameLineEdit->setText( myEmptyText );
   myObjNameLineEdit->setStyleSheet( myEmptyStyleSheet);
-}
\ No newline at end of file
+}