X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_GroupDlg.h;h=8deca497685f11ad8575ebee2d00ff75cd9c3b1e;hp=2592f4dc491dcfdeb9efe43cd81d501b1f90b357;hb=52d825495306f72048c8754aa5c86c6a390f8262;hpb=bd4e115a78b52e3fbc016e5e30bb0e19b2a9e7d6

diff --git a/src/SMESHGUI/SMESHGUI_GroupDlg.h b/src/SMESHGUI/SMESHGUI_GroupDlg.h
index 2592f4dc4..8deca4976 100644
--- a/src/SMESHGUI/SMESHGUI_GroupDlg.h
+++ b/src/SMESHGUI/SMESHGUI_GroupDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2014  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
@@ -85,13 +85,15 @@ public slots:
   void onAdd();
   void onRemove();
 
+protected slots:
+  virtual void                  reject();
+
 private slots:
   void                          onTypeChanged( int );
   void                          onGrpTypeChanged( int );
   void                          onColorChanged( QColor );
   
   void                          onOK();
-  void                          onClose();
   bool                          onApply();
   void                          onHelp();
   void                          onDeactivate();
@@ -123,9 +125,7 @@ private:
   void                          init( SMESH::SMESH_Mesh_ptr );
   void                          init( SMESH::SMESH_GroupBase_ptr,
                                       const bool theIsConvert = false );
-  void                          closeEvent( QCloseEvent* );
   void                          enterEvent( QEvent* );
-  void                          hideEvent( QHideEvent* );   /* ESC key */
   void                          keyPressEvent( QKeyEvent* );
   void                          setSelectionMode( int );
   void                          updateButtons();
@@ -141,7 +141,7 @@ private:
   
   void                          setGroupQColor( const QColor& );
   QColor                        getGroupQColor() const;
-  
+  void                          setDefaultName() const;
   void                          setDefaultGroupColor();
 
   void                          setIsApplyAndClose( const bool theFlag );