Fix combo box model problems

diff --git a/src/GUI/NETGENPluginGUI_HypothesisCreator.cxx b/src/GUI/NETGENPluginGUI_HypothesisCreator.cxx
index 660ec38ff2cace301a9bced0f1d9c93bd004a305..029bdf3e485552d25d0a4800bff7fb2af66b5938 100644 (file)
--- a/src/GUI/NETGENPluginGUI_HypothesisCreator.cxx
+++ b/src/GUI/NETGENPluginGUI_HypothesisCreator.cxx
@@ -38,8 +38,8 @@
 #include <SalomeApp_Tools.h>
 
 #include <QtxDoubleSpinBox.h>
-#include <QtxComboBox.h>
 
+#include <QComboBox>
 #include <QLabel>
 #include <QGroupBox>
 #include <QFrame>
@@ -117,15 +117,11 @@ QFrame* NETGENPluginGUI_HypothesisCreator::buildFrame()
   row++;
   
   aGroupLayout->addWidget( new QLabel( tr( "NETGEN_FINENESS" ), GroupC1 ), row, 0 );
-  myFineness = new QtxComboBox( GroupC1 );
+  myFineness = new QComboBox( GroupC1 );
   QStringList types;
-  types.append( QObject::tr( "NETGEN_VERYCOARSE" ) );
-  types.append( QObject::tr( "NETGEN_COARSE" ) );
-  types.append( QObject::tr( "NETGEN_MODERATE" ) );
-  types.append( QObject::tr( "NETGEN_FINE" ) );
-  types.append( QObject::tr( "NETGEN_VERYFINE" ) );
-  types.append( QObject::tr( "NETGEN_CUSTOM" ) );
-  myFineness->insertItems( myFineness->count(), types );
+  types << tr( "NETGEN_VERYCOARSE" ) << tr( "NETGEN_COARSE" )   << tr( "NETGEN_MODERATE" ) <<
+           tr( "NETGEN_FINE" )       << tr( "NETGEN_VERYFINE" ) << tr( "NETGEN_CUSTOM" );
+  myFineness->addItems( types );
   aGroupLayout->addWidget( myFineness, row, 1 );
   row++;
 

diff --git a/src/GUI/NETGENPluginGUI_HypothesisCreator.h b/src/GUI/NETGENPluginGUI_HypothesisCreator.h
index 65c96e19712332f8df6a65914cf9fde05eca8a6f..90678bcdc6c1a3db6771ec3d55444556a6f91161 100644 (file)
--- a/src/GUI/NETGENPluginGUI_HypothesisCreator.h
+++ b/src/GUI/NETGENPluginGUI_HypothesisCreator.h
@@ -41,7 +41,7 @@
 #include <SMESHGUI_Hypotheses.h>
 
 class QtxDoubleSpinBox;
-class QtxComboBox;
+class QComboBox;
 class QCheckBox;
 class QLineEdit;
 
@@ -89,7 +89,7 @@ private:
  QtxDoubleSpinBox* myMaxSize;
  QCheckBox*        mySecondOrder;
  QCheckBox*        myOptimize;
- QtxComboBox*      myFineness;
+ QComboBox*        myFineness;
  QtxDoubleSpinBox* myGrowthRate;
  QtxDoubleSpinBox* myNbSegPerEdge;
  QtxDoubleSpinBox* myNbSegPerRadius;