Join modifications from BR_Dev_For_4_0 tag V4_1_1.

[modules/geom.git] / src / MeasureGUI / MeasureGUI_DistanceDlg.h

diff --git a/src/MeasureGUI/MeasureGUI_DistanceDlg.h b/src/MeasureGUI/MeasureGUI_DistanceDlg.h
index cd4702a3adb555a31bb540540cf1d9957a481da3..43202a187405722093fd1ca4fb13b242a6220d5b 100644 (file)
--- a/src/MeasureGUI/MeasureGUI_DistanceDlg.h
+++ b/src/MeasureGUI/MeasureGUI_DistanceDlg.h
@@ -17,7 +17,7 @@
 //  License along with this library; if not, write to the Free Software 
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
 // 
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //
 //
@@ -29,22 +29,18 @@
 #ifndef DIALOGBOX_DISTANCE_H
 #define DIALOGBOX_DISTANCE_H
 
+#include "GEOM_MeasureGUI.hxx"
+
 #include "MeasureGUI_Skeleton.h"
 
-class MeasureGUI_2Sel1LineEdit_QTD;
+class MeasureGUI_2Sel4LineEdit_QTD;
 class gp_Pnt;
 
-#if defined WNT && defined MEASUREGUI_EXPORTS
-#define MEASUREGUI_EXPORT __declspec( dllexport )
-#else
-#define MEASUREGUI_EXPORT
-#endif
-
 //=================================================================================
 // class    : MeasureGUI_DistanceDlg
 // purpose  :
 //=================================================================================
-class MEASUREGUI_EXPORT MeasureGUI_DistanceDlg : public MeasureGUI_Skeleton
+class GEOM_MEASUREGUI_EXPORT MeasureGUI_DistanceDlg : public MeasureGUI_Skeleton
 { 
     Q_OBJECT
 
@@ -74,7 +70,7 @@ private:
     QLineEdit*                          mySelEdit2;
     QPushButton*                        mySelBtn2;
 
-    MeasureGUI_2Sel1LineEdit_QTD*       myGrp;
+    MeasureGUI_2Sel4LineEdit_QTD*       myGrp;
     GEOM::GEOM_Object_var               myObj2;
 
 };