Merge from V6_main 28/02/2013

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

diff --git a/src/SMESHGUI/SMESHGUI_RotationDlg.h b/src/SMESHGUI/SMESHGUI_RotationDlg.h
index a4e6b4af244b4899be68af4c8551597ad7ee9d22..e52f59c1282e2ccb20d0ddefc7cc389fd79fde51 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_RotationDlg.h
+++ b/src/SMESHGUI/SMESHGUI_RotationDlg.h
@@ -66,9 +66,7 @@ public:
 
 private:
   void                   Init( bool = true );
-  void                   closeEvent( QCloseEvent* );
   void                   enterEvent( QEvent* );         /* mouse enter the QWidget */
-  void                   hideEvent( QHideEvent* );      /* ESC key */
   void                   keyPressEvent( QKeyEvent* );
   bool                   IsAxisOk();
   void                   setNewMeshName();
@@ -134,11 +132,11 @@ private:
   SMESHGUI_FilterDlg*    myFilterDlg;
 
 protected slots:
-  virtual void              onDisplaySimulation( bool );
+  virtual void           onDisplaySimulation( bool );
+  virtual void           reject();
  
 private slots:
   void                   ClickOnOk();
-  void                   ClickOnCancel();
   bool                   ClickOnApply();
   void                   ClickOnHelp();
   void                   SetEditCurrentArgument();