PR: synchro V7_main tag mergefrom_V6_main_28Feb13

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

diff --git a/src/SMESHGUI/SMESHGUI_RevolutionDlg.h b/src/SMESHGUI/SMESHGUI_RevolutionDlg.h
index 91d1e4268f1da83d3997011a60c83e005915b76c..cfb9e1fc9b8bd68421db7f2fa193362aad116246 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_RevolutionDlg.h
+++ b/src/SMESHGUI/SMESHGUI_RevolutionDlg.h
@@ -74,13 +74,10 @@ public:
   SMESHGUI_RevolutionDlg( SMESHGUI* );
   ~SMESHGUI_RevolutionDlg();
 
   SMESHGUI_RevolutionDlg( SMESHGUI* );
   ~SMESHGUI_RevolutionDlg();
 

-  void                      reject();
-

 private:
   enum {NONE_SELECT, POINT_SELECT, FACE_SELECT};
   
   void                      Init( bool = true);
 private:
   enum {NONE_SELECT, POINT_SELECT, FACE_SELECT};
   
   void                      Init( bool = true);

-  void                      closeEvent( QCloseEvent* );

   void                      enterEvent( QEvent* );           /* mouse enter the QWidget */
   void                      keyPressEvent( QKeyEvent* );
   int                       GetConstructorId();
   void                      enterEvent( QEvent* );           /* mouse enter the QWidget */
   void                      keyPressEvent( QKeyEvent* );
   int                       GetConstructorId();


@@ -163,11 +160,11 @@ private:
 
 protected slots:
   virtual void              onDisplaySimulation( bool );
 
 protected slots:
   virtual void              onDisplaySimulation( bool );

+  virtual void                      reject();

    
 private slots:
   void                      ConstructorsClicked( int );
   void                      ClickOnOk();
    
 private slots:
   void                      ConstructorsClicked( int );
   void                      ClickOnOk();

-  void                      ClickOnCancel();

   bool                      ClickOnApply();
   void                      ClickOnHelp();
   void                      SetEditCurrentArgument();
   bool                      ClickOnApply();
   void                      ClickOnHelp();
   void                      SetEditCurrentArgument();