Merge from V6_main 28/02/2013

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

diff --git a/src/SMESHGUI/SMESHGUI_BuildCompoundDlg.h b/src/SMESHGUI/SMESHGUI_BuildCompoundDlg.h
index 6230022e82f42e9be2a1cbaa1b75854225942a03..a5890252c53e10ead824ce65baaca86aa9e5393e 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_BuildCompoundDlg.h
+++ b/src/SMESHGUI/SMESHGUI_BuildCompoundDlg.h
@@ -68,9 +68,7 @@ public:
 
 private:
   void                    Init();
-  void                    closeEvent( QCloseEvent* );
   void                    enterEvent( QEvent* );             /* mouse enter the QWidget */
-  void                    hideEvent( QHideEvent* );          /* ESC key */
   void                    keyPressEvent( QKeyEvent* );
 
   bool                    isValid();
@@ -115,9 +113,11 @@ private:
 
   bool                    myIsApplyAndClose;
 
+protected slots:
+  virtual void            reject();
+
 private slots:
   void                    ClickOnOk();
-  void                    ClickOnCancel();
   bool                    ClickOnApply();
   void                    ClickOnHelp();
   void                    SelectionIntoArgument();