Merge from V6_main 28/02/2013

[modules/smesh.git] / src / SMESHGUI / SMESHGUI_SingleEditDlg.h

diff --git a/src/SMESHGUI/SMESHGUI_SingleEditDlg.h b/src/SMESHGUI/SMESHGUI_SingleEditDlg.h
index cc04610ac82c60117ab94802733e9aa0e1d61b4a..bf88ec684a84721eaf6a86c1ac6ef893a185e02f 100755 (executable)
--- a/src/SMESHGUI/SMESHGUI_SingleEditDlg.h
+++ b/src/SMESHGUI/SMESHGUI_SingleEditDlg.h
@@ -62,7 +62,7 @@ public:
 protected slots:
   void                    onOk();
   virtual bool            onApply();
-  void                    onClose();
+  virtual void            reject();
   void                    onHelp();
 
   void                    onDeactivate();
@@ -71,9 +71,7 @@ protected slots:
   void                    onTextChange( const QString& );
 
 protected:
-  void                    closeEvent( QCloseEvent* );
   void                    enterEvent( QEvent* );
-  void                    hideEvent( QHideEvent* );                        /* ESC key */
   void                    keyPressEvent( QKeyEvent* );
   QWidget*                createButtonFrame( QWidget* );
   QWidget*                createMainFrame( QWidget* );