Merge branch 'master' of newgeom:newgeom.git

diff --git a/src/ModuleBase/ModuleBase_WidgetFileSelector.cpp b/src/ModuleBase/ModuleBase_WidgetFileSelector.cpp
index 36191b141ad90918838b0122f2bacc47ccbc7fa0..259560e382bddebbf27832b31f65cd2a432a1faf 100644 (file)
--- a/src/ModuleBase/ModuleBase_WidgetFileSelector.cpp
+++ b/src/ModuleBase/ModuleBase_WidgetFileSelector.cpp
@@ -98,8 +98,8 @@ QWidget* ModuleBase_WidgetFileSelector::getControl() const
 QList<QWidget*> ModuleBase_WidgetFileSelector::getControls() const
 {
   QList<QWidget*> result;
-  QPushButton * aButton = myMainWidget->findChild<QPushButton *>();
-  result << aButton;
+  //QPushButton * aButton = myMainWidget->findChild<QPushButton *>();
+  //result << aButton;
   result << myPathField;
   return result;
 }

diff --git a/src/ModuleBase/ModuleBase_WidgetMultiSelector.cpp b/src/ModuleBase/ModuleBase_WidgetMultiSelector.cpp
index 96f8241f982737281d32416af063be67d589f251..514d67d23a8e97fa481f6106d416801917eaad05 100644 (file)
--- a/src/ModuleBase/ModuleBase_WidgetMultiSelector.cpp
+++ b/src/ModuleBase/ModuleBase_WidgetMultiSelector.cpp
@@ -131,7 +131,7 @@ QWidget* ModuleBase_WidgetMultiSelector::getControl() const
 QList<QWidget*> ModuleBase_WidgetMultiSelector::getControls() const
 {
   QList<QWidget*> result;
-  result << myTypeCombo;
+  //result << myTypeCombo;
   result << myListControl;
   return result;
 }