Merge from V6_main 01/04/2013

[modules/gui.git] / src / LightApp / LightApp_Operation.cxx

diff --git a/src/LightApp/LightApp_Operation.cxx b/src/LightApp/LightApp_Operation.cxx
index f13019d6c07b0c06fb368c4b3c8954c8b18a6bdc..fb814898d364986dfb7533c50f2e5e4db784a273 100755 (executable)
--- a/src/LightApp/LightApp_Operation.cxx
+++ b/src/LightApp/LightApp_Operation.cxx
@@ -1,24 +1,37 @@
-//  LIGHT LightApp
+// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2005  CEA/DEN, EDF R&D
+// 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 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
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
 //  File   : LightApp_Operation.h
 //  Author : Sergey LITONIN
-//  Module : LIGHT
-
-#include <LightApp_Operation.h>
-#include <LightApp_Module.h>
-#include <LightApp_Application.h>
-#include <LightApp_Operation.h>
-#include <LightApp_SelectionMgr.h>
-#include <LightApp_Dialog.h>
+//  Module : LightApp
+//
+#include "LightApp_Operation.h"
+#include "LightApp_Module.h"
+#include "LightApp_Application.h"
+#include "LightApp_SelectionMgr.h"
+#include "LightApp_Dialog.h"
 
 #include <SUIT_Desktop.h>
-
-#include <qapplication.h>
-
+#include <SUIT_Study.h>
 
 /*!
  * \brief Constructor
@@ -253,7 +266,7 @@ void LightApp_Operation::setDialogActive( const bool active )
     if( active )
     {
       activateSelection();
-      dlg()->setActiveWindow();
+      dlg()->activateWindow();
     }
   }
 }