Merge branch 'V8_4_BR'

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

diff --git a/src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.h b/src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.h
index 26448cf22df51c49fd48c7133ff0ecb2c6b43663..72efd07ef7a0decdcb94a186604546c5c6455494 100644 (file)
--- a/src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.h
+++ b/src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2016  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
@@ -6,7 +6,7 @@
 // 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.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -35,7 +35,7 @@
 #include <QWidget>
 
 // CORBA includes
-#include <CORBA.h>
+#include <omniORB4/CORBA.h>
 
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SMESH_Mesh)
@@ -56,9 +56,9 @@ class STDMESHERSGUI_EXPORT StdMeshersGUI_ObjectReferenceParamWdg : public QWidge
 public:
   StdMeshersGUI_ObjectReferenceParamWdg( SUIT_SelectionFilter* filter, 
                                          QWidget*              parent,
-                                         bool                  multiSelection=false,
-                                         bool                  stretch=true);
-  StdMeshersGUI_ObjectReferenceParamWdg( MeshObjectType objType,
+                                         bool                  multiSelection=false
+                                         /* ,bool                  stretch=true*/);
+  StdMeshersGUI_ObjectReferenceParamWdg( SMESH::MeshObjectType objType,
                                          QWidget*       parent,
                                          bool           multiSelection=false);
   ~StdMeshersGUI_ObjectReferenceParamWdg();
@@ -80,6 +80,15 @@ public:
   bool IsObjectSelected(unsigned i=0) const
   { return i < myObjects.size() && !CORBA::is_nil(myObjects[i]); }
 
+  /*!
+   * \brief Get the selection status
+    *
+    * Useful to know which Object Reference param widget is activated
+    * to be able to activate the next one when the content of this
+    * one has been modified
+   */
+  bool IsSelectionActivated() const { return mySelectionActivated; }
+
   void AvoidSimultaneousSelection( StdMeshersGUI_ObjectReferenceParamWdg* other);
   
   void SetDefaultText(QString defaultText="", QString styleSheet="");