From: szy Date: Fri, 19 Aug 2005 13:16:23 +0000 (+0000) Subject: Windows porting X-Git-Tag: T_3_0_2a1~10 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=1ee80bad403d562c80df2f13491cd49b8588ea53;p=modules%2Fgeom.git Windows porting --- diff --git a/src/DlgRef/DlgRef_1Sel1Spin.h b/src/DlgRef/DlgRef_1Sel1Spin.h index 64c560b7b..dbf001657 100644 --- a/src/DlgRef/DlgRef_1Sel1Spin.h +++ b/src/DlgRef/DlgRef_1Sel1Spin.h @@ -31,8 +31,18 @@ #include "DlgRef_1Sel1Spin_QTD.h" #include "DlgRef_SpinBox.h" +//#if defined WNT +//#include +//#else +//#define SALOME_WNT_EXPORT +//#endif +#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS +#define DLGREF_WNT_EXPORT __declspec( dllexport ) +#else +#define DLGREF_WNT_EXPORT +#endif -class DlgRef_1Sel1Spin : public DlgRef_1Sel1Spin_QTD +class DLGREF_WNT_EXPORT DlgRef_1Sel1Spin : public DlgRef_1Sel1Spin_QTD { Q_OBJECT diff --git a/src/DlgRef/DlgRef_1Sel1Spin_QTD.h b/src/DlgRef/DlgRef_1Sel1Spin_QTD.h index dba7a6e5c..b70d054c2 100644 --- a/src/DlgRef/DlgRef_1Sel1Spin_QTD.h +++ b/src/DlgRef/DlgRef_1Sel1Spin_QTD.h @@ -19,8 +19,12 @@ class QLabel; class QLineEdit; class QPushButton; class QSpinBox; - -class DlgRef_1Sel1Spin_QTD : public QWidget +#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS +#define DLGREF_WNT_EXPORT __declspec( dllexport ) +#else +#define DLGREF_WNT_EXPORT +#endif +class DLGREF_WNT_EXPORT DlgRef_1Sel1Spin_QTD : public QWidget { Q_OBJECT diff --git a/src/DlgRef/DlgRef_1Sel3Spin.h b/src/DlgRef/DlgRef_1Sel3Spin.h index 1cdad86b6..510090565 100644 --- a/src/DlgRef/DlgRef_1Sel3Spin.h +++ b/src/DlgRef/DlgRef_1Sel3Spin.h @@ -31,8 +31,19 @@ #include "DlgRef_1Sel3Spin_QTD.h" #include "DlgRef_SpinBox.h" +//#if defined WNT +//#include +//#else +//#define SALOME_WNT_EXPORT +//#endif -class DlgRef_1Sel3Spin : public DlgRef_1Sel3Spin_QTD +#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS +#define DLGREF_WNT_EXPORT __declspec( dllexport ) +#else +#define DLGREF_WNT_EXPORT +#endif + +class DLGREF_WNT_EXPORT DlgRef_1Sel3Spin : public DlgRef_1Sel3Spin_QTD { Q_OBJECT diff --git a/src/DlgRef/DlgRef_1Sel3Spin_QTD.h b/src/DlgRef/DlgRef_1Sel3Spin_QTD.h index 681d72f62..8283cd9b7 100644 --- a/src/DlgRef/DlgRef_1Sel3Spin_QTD.h +++ b/src/DlgRef/DlgRef_1Sel3Spin_QTD.h @@ -19,8 +19,12 @@ class QLabel; class QLineEdit; class QPushButton; class QSpinBox; - -class DlgRef_1Sel3Spin_QTD : public QWidget +#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS +#define DLGREF_WNT_EXPORT __declspec( dllexport ) +#else +#define DLGREF_WNT_EXPORT +#endif +class DLGREF_WNT_EXPORT DlgRef_1Sel3Spin_QTD : public QWidget { Q_OBJECT diff --git a/src/DlgRef/DlgRef_1Sel_QTD.h b/src/DlgRef/DlgRef_1Sel_QTD.h index 133d043cf..58b6ba1bf 100644 --- a/src/DlgRef/DlgRef_1Sel_QTD.h +++ b/src/DlgRef/DlgRef_1Sel_QTD.h @@ -19,7 +19,13 @@ class QLabel; class QLineEdit; class QPushButton; -class DlgRef_1Sel_QTD : public QWidget +#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS +#define DLGREF_WNT_EXPORT __declspec( dllexport ) +#else +#define DLGREF_WNT_EXPORT +#endif + +class DLGREF_WNT_EXPORT DlgRef_1Sel_QTD : public QWidget { Q_OBJECT diff --git a/src/DlgRef/DlgRef_2Sel1Spin.h b/src/DlgRef/DlgRef_2Sel1Spin.h index 5bdc29962..8141a2085 100644 --- a/src/DlgRef/DlgRef_2Sel1Spin.h +++ b/src/DlgRef/DlgRef_2Sel1Spin.h @@ -31,8 +31,18 @@ #include "DlgRef_2Sel1Spin_QTD.h" #include "DlgRef_SpinBox.h" +//#if defined WNT +//#include +//#else +//#define SALOME_WNT_EXPORT +//#endif +#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS +#define DLGREF_WNT_EXPORT __declspec( dllexport ) +#else +#define DLGREF_WNT_EXPORT +#endif -class DlgRef_2Sel1Spin : public DlgRef_2Sel1Spin_QTD +class DLGREF_WNT_EXPORT DlgRef_2Sel1Spin : public DlgRef_2Sel1Spin_QTD { Q_OBJECT diff --git a/src/DlgRef/DlgRef_2Sel1Spin_QTD.h b/src/DlgRef/DlgRef_2Sel1Spin_QTD.h index 0d0abfc3c..bb0775373 100644 --- a/src/DlgRef/DlgRef_2Sel1Spin_QTD.h +++ b/src/DlgRef/DlgRef_2Sel1Spin_QTD.h @@ -20,7 +20,13 @@ class QLineEdit; class QPushButton; class QSpinBox; -class DlgRef_2Sel1Spin_QTD : public QWidget +#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS +#define DLGREF_WNT_EXPORT __declspec( dllexport ) +#else +#define DLGREF_WNT_EXPORT +#endif + +class DLGREF_WNT_EXPORT DlgRef_2Sel1Spin_QTD : public QWidget { Q_OBJECT diff --git a/src/DlgRef/DlgRef_2Sel2Spin.h b/src/DlgRef/DlgRef_2Sel2Spin.h index 4300521ef..7a0b41076 100644 --- a/src/DlgRef/DlgRef_2Sel2Spin.h +++ b/src/DlgRef/DlgRef_2Sel2Spin.h @@ -31,8 +31,17 @@ #include "DlgRef_2Sel2Spin_QTD.h" #include "DlgRef_SpinBox.h" - -class DlgRef_2Sel2Spin : public DlgRef_2Sel2Spin_QTD +//#if defined WNT +//#include +//#else +//#define SALOME_WNT_EXPORT +//#endif +#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS +#define DLGREF_WNT_EXPORT __declspec( dllexport ) +#else +#define DLGREF_WNT_EXPORT +#endif +class DLGREF_WNT_EXPORT DlgRef_2Sel2Spin : public DlgRef_2Sel2Spin_QTD { Q_OBJECT diff --git a/src/DlgRef/DlgRef_2Sel2Spin_QTD.h b/src/DlgRef/DlgRef_2Sel2Spin_QTD.h index dd6bd6c83..4012cecbc 100644 --- a/src/DlgRef/DlgRef_2Sel2Spin_QTD.h +++ b/src/DlgRef/DlgRef_2Sel2Spin_QTD.h @@ -20,7 +20,13 @@ class QLineEdit; class QPushButton; class QSpinBox; -class DlgRef_2Sel2Spin_QTD : public QWidget +#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS +#define DLGREF_WNT_EXPORT __declspec( dllexport ) +#else +#define DLGREF_WNT_EXPORT +#endif + +class DLGREF_WNT_EXPORT DlgRef_2Sel2Spin_QTD : public QWidget { Q_OBJECT diff --git a/src/DlgRef/DlgRef_2Sel_QTD.h b/src/DlgRef/DlgRef_2Sel_QTD.h index 07cb6c569..94ede9505 100644 --- a/src/DlgRef/DlgRef_2Sel_QTD.h +++ b/src/DlgRef/DlgRef_2Sel_QTD.h @@ -19,7 +19,13 @@ class QLabel; class QLineEdit; class QPushButton; -class DlgRef_2Sel_QTD : public QWidget +#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS +#define DLGREF_WNT_EXPORT __declspec( dllexport ) +#else +#define DLGREF_WNT_EXPORT +#endif + +class DLGREF_WNT_EXPORT DlgRef_2Sel_QTD : public QWidget { Q_OBJECT diff --git a/src/DlgRef/DlgRef_3Check_QTD.h b/src/DlgRef/DlgRef_3Check_QTD.h index a2600b7ed..d83b4093c 100644 --- a/src/DlgRef/DlgRef_3Check_QTD.h +++ b/src/DlgRef/DlgRef_3Check_QTD.h @@ -17,7 +17,13 @@ class QGridLayout; class QButtonGroup; class QRadioButton; -class DlgRef_3Check_QTD : public QWidget +#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS +#define DLGREF_WNT_EXPORT __declspec( dllexport ) +#else +#define DLGREF_WNT_EXPORT +#endif + +class DLGREF_WNT_EXPORT DlgRef_3Check_QTD : public QWidget { Q_OBJECT diff --git a/src/DlgRef/DlgRef_3Sel1Spin.h b/src/DlgRef/DlgRef_3Sel1Spin.h index 00135ab7c..3d806d127 100644 --- a/src/DlgRef/DlgRef_3Sel1Spin.h +++ b/src/DlgRef/DlgRef_3Sel1Spin.h @@ -33,12 +33,21 @@ #include "DlgRef_SpinBox.h" #include #include - +//#if defined WNT +//#include +//#else +//#define SALOME_WNT_EXPORT +//#endif +#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS +#define DLGREF_WNT_EXPORT __declspec( dllexport ) +#else +#define DLGREF_WNT_EXPORT +#endif //================================================================================= // class : DlgRef_3Sel1Spin // purpose : extension of a DlgRef_3Sel_QTD class, 1 additional spin box is added //================================================================================= -class DlgRef_3Sel1Spin : public DlgRef_3Sel_QTD +class DLGREF_WNT_EXPORT DlgRef_3Sel1Spin : public DlgRef_3Sel_QTD { Q_OBJECT diff --git a/src/DlgRef/DlgRef_3Sel_QTD.h b/src/DlgRef/DlgRef_3Sel_QTD.h index eba5a2c67..da7a9d79e 100644 --- a/src/DlgRef/DlgRef_3Sel_QTD.h +++ b/src/DlgRef/DlgRef_3Sel_QTD.h @@ -19,7 +19,13 @@ class QLabel; class QLineEdit; class QPushButton; -class DlgRef_3Sel_QTD : public QWidget +#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS +#define DLGREF_WNT_EXPORT __declspec( dllexport ) +#else +#define DLGREF_WNT_EXPORT +#endif + +class DLGREF_WNT_EXPORT DlgRef_3Sel_QTD : public QWidget { Q_OBJECT diff --git a/src/DlgRef/DlgRef_3Spin.h b/src/DlgRef/DlgRef_3Spin.h index 855f00b5d..60c28ce36 100644 --- a/src/DlgRef/DlgRef_3Spin.h +++ b/src/DlgRef/DlgRef_3Spin.h @@ -31,8 +31,17 @@ #include "DlgRef_3Spin_QTD.h" #include "DlgRef_SpinBox.h" - -class DlgRef_3Spin : public DlgRef_3Spin_QTD +//#if defined WNT +//#include +//#else +//#define SALOME_WNT_EXPORT +//#endif +#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS +#define DLGREF_WNT_EXPORT __declspec( dllexport ) +#else +#define DLGREF_WNT_EXPORT +#endif +class DLGREF_WNT_EXPORT DlgRef_3Spin : public DlgRef_3Spin_QTD { Q_OBJECT diff --git a/src/DlgRef/DlgRef_3Spin1Check.h b/src/DlgRef/DlgRef_3Spin1Check.h index c792015c2..54beec576 100644 --- a/src/DlgRef/DlgRef_3Spin1Check.h +++ b/src/DlgRef/DlgRef_3Spin1Check.h @@ -32,7 +32,12 @@ #include "DlgRef_3Spin1Check_QTD.h" #include "DlgRef_SpinBox.h" -class DlgRef_3Spin1Check : public DlgRef_3Spin1Check_QTD +#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS +#define DLGREF_WNT_EXPORT __declspec( dllexport ) +#else +#define DLGREF_WNT_EXPORT +#endif +class DLGREF_WNT_EXPORT DlgRef_3Spin1Check : public DlgRef_3Spin1Check_QTD { Q_OBJECT diff --git a/src/DlgRef/DlgRef_3Spin1Check_QTD.h b/src/DlgRef/DlgRef_3Spin1Check_QTD.h index f292ff982..2df127740 100644 --- a/src/DlgRef/DlgRef_3Spin1Check_QTD.h +++ b/src/DlgRef/DlgRef_3Spin1Check_QTD.h @@ -19,7 +19,13 @@ class QLabel; class QRadioButton; class QSpinBox; -class DlgRef_3Spin1Check_QTD : public QWidget +#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS +#define DLGREF_WNT_EXPORT __declspec( dllexport ) +#else +#define DLGREF_WNT_EXPORT +#endif + +class DLGREF_WNT_EXPORT DlgRef_3Spin1Check_QTD : public QWidget { Q_OBJECT diff --git a/src/DlgRef/DlgRef_3Spin_QTD.h b/src/DlgRef/DlgRef_3Spin_QTD.h index dceddcc97..0ffe263b7 100644 --- a/src/DlgRef/DlgRef_3Spin_QTD.h +++ b/src/DlgRef/DlgRef_3Spin_QTD.h @@ -18,7 +18,12 @@ class QGroupBox; class QLabel; class QSpinBox; -class DlgRef_3Spin_QTD : public QWidget +#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS +#define DLGREF_WNT_EXPORT __declspec( dllexport ) +#else +#define DLGREF_WNT_EXPORT +#endif +class DLGREF_WNT_EXPORT DlgRef_3Spin_QTD : public QWidget { Q_OBJECT diff --git a/src/DlgRef/DlgRef_SpinBox.h b/src/DlgRef/DlgRef_SpinBox.h index a2659a6f4..e2c3f96a6 100644 --- a/src/DlgRef/DlgRef_SpinBox.h +++ b/src/DlgRef/DlgRef_SpinBox.h @@ -30,12 +30,21 @@ #define GEOMSPINBOX_H #include "QtxDblSpinBox.h" - +//#if defined WNT +//#include +//#else +//#define SALOME_WNT_EXPORT +//#endif +#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS +#define DLGREF_WNT_EXPORT __declspec( dllexport ) +#else +#define DLGREF_WNT_EXPORT +#endif //================================================================================= // class : DlgRef_SpinBox // purpose : Derivated from QSpinBox class and modified to accept floats //================================================================================= -class DlgRef_SpinBox : public QtxDblSpinBox +class DLGREF_WNT_EXPORT DlgRef_SpinBox : public QtxDblSpinBox { Q_OBJECT