Merge remote branch 'origin/V7_dev'

[modules/gui.git] / src / SUIT / SUIT_Selector.cxx

diff --git a/src/SUIT/SUIT_Selector.cxx b/src/SUIT/SUIT_Selector.cxx
index 29881c37e87751723a64823f7fd82aeed7a70ecb..8292c50de78f483be6013e3187c207a639c00b9f 100755 (executable)
--- a/src/SUIT/SUIT_Selector.cxx
+++ b/src/SUIT/SUIT_Selector.cxx
@@ -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
@@ -76,10 +76,10 @@ void SUIT_Selector::Destroyer::setSelector( SUIT_Selector* s )
 */
 SUIT_Selector::SUIT_Selector( SUIT_SelectionMgr* selMgr, QObject* parent )
 : mySelMgr( selMgr ),
-myBlock( false ),
-myEnabled( true ),
-myAutoBlock( true ),
-myDestroyer( 0 )
+  myBlock( false ),
+  myEnabled( true ),
+  myAutoBlock( true ),
+  myDestroyer( 0 )
 {
   if ( selMgr )
     selMgr->installSelector( this );
@@ -100,6 +100,7 @@ SUIT_Selector::~SUIT_Selector()
   {
     myDestroyer->setSelector( 0 );
     delete myDestroyer;
+    myDestroyer = 0;
   }
 }
 
@@ -196,3 +197,11 @@ void SUIT_Selector::selectionModes( QList<int>& lst ) const
   if ( selectionMgr() )
     selectionMgr()->selectionModes( lst );
 }
+
+/*!
+  Get owner of this selector.
+ */
+QObject* SUIT_Selector::owner() const
+{
+  return myDestroyer ? myDestroyer->parent() : 0;
+}