Use the ViewWindow as a parent for clipping dialog box and others

diff --git a/src/OCCViewer/OCCViewer_AxialScaleDlg.cxx b/src/OCCViewer/OCCViewer_AxialScaleDlg.cxx
index df14c95620512ba580e8a8ab9efc2d1327cdd0f2..55eed127873246ca3693194cd95710c9ca2947c1 100644 (file)
--- a/src/OCCViewer/OCCViewer_AxialScaleDlg.cxx
+++ b/src/OCCViewer/OCCViewer_AxialScaleDlg.cxx
@@ -39,8 +39,8 @@
   \param view - view window
   \param parent - parent widget
 */
-OCCViewer_AxialScaleDlg::OCCViewer_AxialScaleDlg( OCCViewer_ViewWindow* view, QWidget* parent )
-  : QDialog( parent ),
+OCCViewer_AxialScaleDlg::OCCViewer_AxialScaleDlg( OCCViewer_ViewWindow* view )
+  : QDialog( view ),
     myView( view )
 {
   setWindowTitle( tr( "DLG_SCALING" ) );

diff --git a/src/OCCViewer/OCCViewer_AxialScaleDlg.h b/src/OCCViewer/OCCViewer_AxialScaleDlg.h
index 17f55f4003164e21c258eec1047a47f324dc37a6..3c6cde4c783dfb2d25f9eee00db0e815e2758044 100644 (file)
--- a/src/OCCViewer/OCCViewer_AxialScaleDlg.h
+++ b/src/OCCViewer/OCCViewer_AxialScaleDlg.h
@@ -33,7 +33,7 @@ class OCCVIEWER_EXPORT OCCViewer_AxialScaleDlg : public QDialog
   Q_OBJECT
 
 public:
-  OCCViewer_AxialScaleDlg( OCCViewer_ViewWindow*, QWidget* = 0 );
+  OCCViewer_AxialScaleDlg( OCCViewer_ViewWindow* );
   ~OCCViewer_AxialScaleDlg();
 
   void Update();

diff --git a/src/OCCViewer/OCCViewer_ClippingDlg.cxx b/src/OCCViewer/OCCViewer_ClippingDlg.cxx
index 4fb3b48b0108377375bcc0c8a739e5cce6d5b18e..895377ea19c26f44e7e0f75f38f54ba35c126ae6 100644 (file)
--- a/src/OCCViewer/OCCViewer_ClippingDlg.cxx
+++ b/src/OCCViewer/OCCViewer_ClippingDlg.cxx
@@ -62,8 +62,8 @@
   \param modal - is this dialog modal
   \param fl - flags
 */
-OCCViewer_ClippingDlg::OCCViewer_ClippingDlg( OCCViewer_ViewWindow* view, QWidget* parent, const char* name, bool modal, Qt::WindowFlags fl )
-: QDialog( parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint ),
+OCCViewer_ClippingDlg::OCCViewer_ClippingDlg( OCCViewer_ViewWindow* view, const char* name, bool modal, Qt::WindowFlags fl )
+: QDialog( view, Qt::WindowTitleHint | Qt::WindowSystemMenuHint ),
   myView( view )
 {
   setObjectName( "OCCViewer_ClippingDlg" );

diff --git a/src/OCCViewer/OCCViewer_ClippingDlg.h b/src/OCCViewer/OCCViewer_ClippingDlg.h
index 8639661b7e93427f39dbdf4deea8d94b774b68c8..a16ae7ccfb12354d54060cc6edb10eeb8f9a7c08 100644 (file)
--- a/src/OCCViewer/OCCViewer_ClippingDlg.h
+++ b/src/OCCViewer/OCCViewer_ClippingDlg.h
@@ -50,7 +50,7 @@ class OCCViewer_ClippingDlg : public QDialog
     Q_OBJECT
     
     public:
-    OCCViewer_ClippingDlg(OCCViewer_ViewWindow* , QWidget* parent = 0, const char* name = 0, bool modal = FALSE, Qt::WindowFlags fl = 0);
+    OCCViewer_ClippingDlg(OCCViewer_ViewWindow* , const char* name = 0, bool modal = FALSE, Qt::WindowFlags fl = 0);
     ~OCCViewer_ClippingDlg();
 
     void SetAction( QtxAction* theAction ) { myAction = theAction; }

diff --git a/src/OCCViewer/OCCViewer_SetRotationPointDlg.cxx b/src/OCCViewer/OCCViewer_SetRotationPointDlg.cxx
index d5d1310143c75026c3b7bc0c5f59a982e2615b99..fefc08a51316bfd476df8ca2096d4f727226a18d 100644 (file)
--- a/src/OCCViewer/OCCViewer_SetRotationPointDlg.cxx
+++ b/src/OCCViewer/OCCViewer_SetRotationPointDlg.cxx
@@ -43,8 +43,8 @@
   \param modal - is this dialog modal
   \param fl - flags
 */
-OCCViewer_SetRotationPointDlg::OCCViewer_SetRotationPointDlg( OCCViewer_ViewWindow* view, QWidget* parent, const char* name, bool modal, Qt::WindowFlags fl )
-: QDialog( parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint ),
+OCCViewer_SetRotationPointDlg::OCCViewer_SetRotationPointDlg( OCCViewer_ViewWindow* view, const char* name, bool modal, Qt::WindowFlags fl )
+: QDialog( view, Qt::WindowTitleHint | Qt::WindowSystemMenuHint ),
   myView( view )
 {
   setObjectName( "OCCViewer_SetRotationPointDlg" );

diff --git a/src/OCCViewer/OCCViewer_SetRotationPointDlg.h b/src/OCCViewer/OCCViewer_SetRotationPointDlg.h
index 83cccad42043291622e7ddc17abddeab5f0f9cf6..31a2a5461490d95b7c0fafc56e1d7320338eb6e2 100644 (file)
--- a/src/OCCViewer/OCCViewer_SetRotationPointDlg.h
+++ b/src/OCCViewer/OCCViewer_SetRotationPointDlg.h
@@ -41,7 +41,7 @@ class OCCVIEWER_EXPORT OCCViewer_SetRotationPointDlg : public QDialog
   Q_OBJECT
 
 public:
-  OCCViewer_SetRotationPointDlg(OCCViewer_ViewWindow* , QWidget* parent = 0, 
+  OCCViewer_SetRotationPointDlg(OCCViewer_ViewWindow* , 
                                 const char* name = 0, bool modal = FALSE, Qt::WindowFlags fl = 0);
   ~OCCViewer_SetRotationPointDlg();
 

diff --git a/src/OCCViewer/OCCViewer_ViewWindow.cxx b/src/OCCViewer/OCCViewer_ViewWindow.cxx
index 640277e4c30deb581033a746e62e06206c548b1f..00ee8acca6d168572fdd2f085319eae976bfe582 100755 (executable)
--- a/src/OCCViewer/OCCViewer_ViewWindow.cxx
+++ b/src/OCCViewer/OCCViewer_ViewWindow.cxx
@@ -1329,7 +1329,7 @@ void OCCViewer_ViewWindow::onSetRotationPoint( bool on )
   {
     if (!mySetRotationPointDlg)
     {
-      mySetRotationPointDlg = new OCCViewer_SetRotationPointDlg (this, myDesktop);
+      mySetRotationPointDlg = new OCCViewer_SetRotationPointDlg (this);
       mySetRotationPointDlg->SetAction(mySetRotationPointAction);
     }
 
@@ -1382,7 +1382,7 @@ void OCCViewer_ViewWindow::onClipping( bool on )
   {
     if ( !myClippingDlg )
     {
-      myClippingDlg = new OCCViewer_ClippingDlg( this, myDesktop );
+      myClippingDlg = new OCCViewer_ClippingDlg( this );
       myClippingDlg->SetAction( myClippingAction );
     }
     
@@ -1403,7 +1403,7 @@ void OCCViewer_ViewWindow::onClipping( bool on )
 void OCCViewer_ViewWindow::onAxialScale()
 {
   if ( !myScalingDlg )
-    myScalingDlg = new OCCViewer_AxialScaleDlg( this, myDesktop );
+    myScalingDlg = new OCCViewer_AxialScaleDlg( this );
   
   if ( !myScalingDlg->isVisible() )
     myScalingDlg->show();