Join modifications from BR_Dev_For_4_0 tag V4_1_1.

[modules/smesh.git] / src / SMESHGUI / SMESHGUI_MeshDlg.h

diff --git a/src/SMESHGUI/SMESHGUI_MeshDlg.h b/src/SMESHGUI/SMESHGUI_MeshDlg.h
index 84ca7a2298e07cc903b44d9c72bbe77593f89f19..4b909b3c8ea3819d5fcfdb1bc95ca2ab1a9f7e0d 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_MeshDlg.h
+++ b/src/SMESHGUI/SMESHGUI_MeshDlg.h
@@ -33,6 +33,8 @@
 #ifndef SMESHGUI_MeshDlg_H
 #define SMESHGUI_MeshDlg_H
 
 #ifndef SMESHGUI_MeshDlg_H
 #define SMESHGUI_MeshDlg_H
 

+#include "SMESH_SMESHGUI.hxx"
+

 #include "SMESHGUI_Dialog.h"
 #include <qframe.h>
 #include <qstringlist.h>
 #include "SMESHGUI_Dialog.h"
 #include <qframe.h>
 #include <qstringlist.h>


@@ -51,7 +53,7 @@ class QPopupMenu;
  *
  *  This dialog is used for mech creation or editing. 
 */
  *
  *  This dialog is used for mech creation or editing. 
 */

-class SMESHGUI_MeshDlg : public SMESHGUI_Dialog
+class SMESHGUI_EXPORT SMESHGUI_MeshDlg : public SMESHGUI_Dialog

 { 
   Q_OBJECT       
       
 { 
   Q_OBJECT       
       


@@ -60,7 +62,7 @@ public:
   enum Controls { Obj, Mesh, Geom };
   
   /*! Describes dimensions */
   enum Controls { Obj, Mesh, Geom };
   
   /*! Describes dimensions */

-  enum Dimensions { Dim1D = 0, Dim2D, Dim3D };      
+  enum Dimensions { Dim0D = 0, Dim1D, Dim2D, Dim3D };      

   
 public:
   SMESHGUI_MeshDlg( const bool theToCreate, const bool theIsMesh );
   
 public:
   SMESHGUI_MeshDlg( const bool theToCreate, const bool theIsMesh );


@@ -72,6 +74,9 @@ public:
   void                         setMaxHypoDim( const int );
   void                         setHypoSets( const QStringList& );
   void                         setGeomPopupEnabled( const bool );
   void                         setMaxHypoDim( const int );
   void                         setHypoSets( const QStringList& );
   void                         setGeomPopupEnabled( const bool );

+  void                         disableTab(const int);
+  void                         enableTab(const int);
+

 
 signals:
 
 
 signals:
 


@@ -98,7 +103,7 @@ private:
  * algorithms and hypotheses
 */ 
 
  * algorithms and hypotheses
 */ 
 

-class SMESHGUI_MeshTab : public QFrame
+class SMESHGUI_EXPORT SMESHGUI_MeshTab : public QFrame

 {
   Q_OBJECT
       
 {
   Q_OBJECT