Virtual method QDialog::done() reimplemented.

diff --git a/src/SVTK/SVTK_CubeAxesDlg.cxx b/src/SVTK/SVTK_CubeAxesDlg.cxx
index ea959790e112515b3487d2506b06fd88abfd9ee3..daed6845ecfe90c11504991f5ae26c1639a87b7e 100644 (file)
--- a/src/SVTK/SVTK_CubeAxesDlg.cxx
+++ b/src/SVTK/SVTK_CubeAxesDlg.cxx
@@ -565,7 +565,8 @@ void SVTK_CubeAxesDlg::onClose()
   myAction->setOn( false );
 }
 
-void SVTK_CubeAxesDlg::closeEvent( QCloseEvent* )
+void SVTK_CubeAxesDlg::done( int r )
 {
   myAction->setOn( false );
+  QDialog::done( r );
 }

diff --git a/src/SVTK/SVTK_CubeAxesDlg.h b/src/SVTK/SVTK_CubeAxesDlg.h
index dc838217b143948fdde82eda4b1a49dd023b649c..bd7e5254c7414b561de9fac0f4eedfb4715cc80b 100644 (file)
--- a/src/SVTK/SVTK_CubeAxesDlg.h
+++ b/src/SVTK/SVTK_CubeAxesDlg.h
@@ -63,14 +63,13 @@ public:
 
   void            Update();
 
-protected:
-  virtual void    closeEvent( QCloseEvent* );
-
 private slots:
   void            onOk();
   bool            onApply();
   void            onClose();
 
+  virtual void    done( int );
+
 private:
   QWidget*        createButtonFrame( QWidget* );
   QWidget*        createMainFrame  ( QWidget* );

diff --git a/src/SVTK/SVTK_NonIsometricDlg.cxx b/src/SVTK/SVTK_NonIsometricDlg.cxx
index 82c91d45f918e15ac1ceabf13a15c7e95d3186d3..10af3818d1669c63f69ee1f92209fb44c61458dc 100644 (file)
--- a/src/SVTK/SVTK_NonIsometricDlg.cxx
+++ b/src/SVTK/SVTK_NonIsometricDlg.cxx
@@ -195,7 +195,8 @@ SVTK_NonIsometricDlg
 
 void 
 SVTK_NonIsometricDlg
-::closeEvent( QCloseEvent* )
+::done( int r )
 {
   m_Action->setOn( false );
+  QDialog::done( r );
 }

diff --git a/src/SVTK/SVTK_NonIsometricDlg.h b/src/SVTK/SVTK_NonIsometricDlg.h
index 1b1105ec2f26ea55a916949f75fe5679a634da4c..6a11a14f649c151eed39918854108200ad0129a3 100644 (file)
--- a/src/SVTK/SVTK_NonIsometricDlg.h
+++ b/src/SVTK/SVTK_NonIsometricDlg.h
@@ -53,8 +53,6 @@ public:
   void Update();
 
 protected:
-  virtual void closeEvent( QCloseEvent* );
-
   SVTK_MainWindow *m_MainWindow;
   QtxAction* m_Action;
 
@@ -68,6 +66,8 @@ protected slots:
   void onClickReset();
   void onClickOk();
   void onClickClose();
+
+  virtual void done( int );
 };
 
 #endif // SVTK_NONISOMETRICDLG_H