When the main window was maximized some dialogs were cropped at the bottom of the...

[modules/smesh.git] / src / SMESHGUI / SMESHGUI.cxx

diff --git a/src/SMESHGUI/SMESHGUI.cxx b/src/SMESHGUI/SMESHGUI.cxx
index ab3327064d318d14e1801deaeca9863efefef90c..af49173b91045dbe212dc377e4e475c26e8eea02 100644 (file)
--- a/src/SMESHGUI/SMESHGUI.cxx
+++ b/src/SMESHGUI/SMESHGUI.cxx
@@ -216,7 +216,7 @@ SMESHGUI* SMESHGUI::GetOrCreateSMESHGUI( QAD_Desktop* desktop )
     Engines::Component_var comp = desktop->getEngine("FactoryServer", "SMESH");
     smeshGUI->myComponentMesh = SMESH::SMESH_Gen::_narrow(comp);
     
-    Engines::Component_var comp1 = desktop->getEngine("FactoryServer", "Geometry");    
+    Engines::Component_var comp1 = desktop->getEngine("FactoryServer", "GEOM");    
     smeshGUI->myComponentGeom = GEOM::GEOM_Gen::_narrow(comp1);
       
     /* GetCurrentStudy */
@@ -400,6 +400,7 @@ void SMESHGUI::activeStudyChanged( QAD_Desktop* parent )
 bool SMESHGUI::DefineDlgPosition(QWidget* aDlg, int& x, int& y)
 {
   /* Here the position is on the bottom right corner - 10 */
+       aDlg->resize(QSize().expandedTo(aDlg->minimumSizeHint()));
   QAD_Desktop* PP = QAD_Application::getDesktop() ;
   x = abs ( PP->x() + PP->size().width()  - aDlg->size().width()  - 10 ) ;
   y = abs ( PP->y() + PP->size().height() - aDlg->size().height() - 10 ) ;
@@ -2823,7 +2824,7 @@ void SMESHGUI::Import_Mesh(QAD_Desktop* parent, int theCommandID)
 //    Mesh_Reader* myReader = SMESHDriver::GetMeshReader(myExtension, myClass);
     
     int myMeshId = (smeshGUI->myDocument)->NewMesh();
-    Handle(SMDS_Mesh) myMesh = (smeshGUI->myDocument)->GetMesh(myMeshId);
+    SMDS_Mesh* myMesh = (smeshGUI->myDocument)->GetMesh(myMeshId);
 
     myReader->SetFile(string(filename.latin1()));
     myReader->SetMesh(myMesh);
@@ -2940,7 +2941,7 @@ void SMESHGUI::Import_Document(QAD_Desktop* parent, int theCommandID)
     QApplication::setOverrideCursor( Qt::waitCursor );
     string myClass = string("SMESHDS_Document");
 //    Document_Reader* myReader = SMESHDriver::GetDocumentReader(myExtension, myClass);
-    Handle(SMESHDS_Document) newDocument = new SMESHDS_Document(1);
+       SMESHDS_Document* newDocument = new SMESHDS_Document(1);
 
     myReader->SetFile(string(filename.latin1()));
     myReader->SetDocument(smeshGUI->myDocument);