X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_MergeDlg.h;h=1e5ad080d65845bbe84ce1ef2223d9a545d444b4;hb=ebb518296392b51b6ca9d80037a12703a160518f;hp=dd9458d616b6c44bd658b356dcd53bc6a7a0c511;hpb=bd4e115a78b52e3fbc016e5e30bb0e19b2a9e7d6;p=modules%2Fsmesh.git

diff --git a/src/SMESHGUI/SMESHGUI_MergeDlg.h b/src/SMESHGUI/SMESHGUI_MergeDlg.h
index dd9458d61..1e5ad080d 100644
--- a/src/SMESHGUI/SMESHGUI_MergeDlg.h
+++ b/src/SMESHGUI/SMESHGUI_MergeDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2015  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
@@ -78,9 +78,7 @@ public:
 
 private:
   void                      Init();
-  void                      closeEvent( QCloseEvent* );
   void                      enterEvent( QEvent* );              /* mouse enter the QWidget */
-  void                      hideEvent( QHideEvent* );           /* ESC key */
   void                      keyPressEvent( QKeyEvent* );
   void                      onEditGroup();
 
@@ -132,6 +130,7 @@ private:
   QPushButton*              AddGroupButton;
   QPushButton*              RemoveGroupButton;
   QCheckBox*                SelectAllCB;
+  QCheckBox*                ShowIDs;
 
   QGroupBox*                GroupEdit;
   QListWidget*              ListEdit;
@@ -150,9 +149,11 @@ private:
   QString                   myEntry;
   GrpList                   myGroups;
 
+protected slots:
+  virtual void              reject();
+
  private slots:
   void                      ClickOnOk();
-  void                      ClickOnCancel();
   bool                      ClickOnApply();
   void                      ClickOnHelp();
   void                      updateControls();