From: vsr <vsr@opencascade.com>
Date: Thu, 15 Dec 2011 11:03:42 +0000 (+0000)
Subject: Merge from V6_4_BR 15/12/2011
X-Git-Tag: pxsxl1~26
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=80e0361738b860cb5b1f9ff4a499418e20233e86;p=modules%2Fgui.git

Merge from V6_4_BR 15/12/2011
---

diff --git a/src/LightApp/LightApp_Application.cxx b/src/LightApp/LightApp_Application.cxx
index bf2a0e81a..394546a01 100644
--- a/src/LightApp/LightApp_Application.cxx
+++ b/src/LightApp/LightApp_Application.cxx
@@ -3831,7 +3831,17 @@ QString LightApp_Application::browseObjects( const QStringList& theEntryList,
         aSelector->setAutoBlock( false );
 
         SUIT_DataOwnerPtrList aList;
-        aList.append( new LightApp_DataOwner( anEntry ) );
+#ifndef DISABLE_SALOMEOBJECT
+        Handle(SALOME_InteractiveObject) aSObj = new SALOME_InteractiveObject
+          ( anObject->entry().toLatin1().constData(),
+            anObject->componentDataType().toLatin1().constData(),
+            anObject->name().toLatin1().constData() );
+        LightApp_DataOwner* owner = new LightApp_DataOwner( aSObj  );
+#else
+        LightApp_DataOwner* owner = new LightApp_DataOwner( anEntry );
+#endif
+
+        aList.append( owner );
         selectionMgr()->setSelected( aList );
         aResult = anEntry;
 
diff --git a/src/STD/STD_TabDesktop.cxx b/src/STD/STD_TabDesktop.cxx
index 780359e02..dfb6ac1f4 100644
--- a/src/STD/STD_TabDesktop.cxx
+++ b/src/STD/STD_TabDesktop.cxx
@@ -58,7 +58,7 @@ myWorkstackAction( 0 )
 
   myWorkstack->setAccel( QtxWorkstack::SplitVertical,   Qt::ALT + Qt::SHIFT + Qt::Key_V );
   myWorkstack->setAccel( QtxWorkstack::SplitHorizontal, Qt::ALT + Qt::SHIFT + Qt::Key_H );
-  myWorkstack->setAccel( QtxWorkstack::Close,           Qt::CTRL + Qt::Key_F4 );
+  //myWorkstack->setAccel( QtxWorkstack::Close,           Qt::CTRL + Qt::Key_F4 );
 
   SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
   if ( resMgr ) {