From: abd Date: Thu, 16 Mar 2006 11:45:04 +0000 (+0000) Subject: First compiled version of GEOM sources X-Git-Tag: LAST_STABLE_VERSION_21_09_2006_ON_3_2_0~46 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=5bd9f159c19171aa8d6e96e9535f375fbf4c0e6e;p=modules%2Fgeom.git First compiled version of GEOM sources --- diff --git a/src/BooleanGUI/BooleanGUI.cxx b/src/BooleanGUI/BooleanGUI.cxx index 5f0865f6c..f48642f51 100644 --- a/src/BooleanGUI/BooleanGUI.cxx +++ b/src/BooleanGUI/BooleanGUI.cxx @@ -100,9 +100,7 @@ bool BooleanGUI::OnGUIEvent(int theCommandID, SUIT_Desktop* parent) //===================================================================================== extern "C" { -#ifdef WNT - __declspec( dllexport ) -#endif +GEOM_BOOLEANGUI_EXPORT GEOMGUI* GetLibGUI( GeometryGUI* parent ) { return BooleanGUI::GetBooleanGUI( parent ); diff --git a/src/BooleanGUI/BooleanGUI.h b/src/BooleanGUI/BooleanGUI.h index a0fdf6c23..7e7e238f6 100644 --- a/src/BooleanGUI/BooleanGUI.h +++ b/src/BooleanGUI/BooleanGUI.h @@ -31,11 +31,29 @@ #include "GEOMGUI.h" +#ifdef WNT + #if defined BOOLEANGUI_EXPORTS + #if defined WIN32 + #define GEOM_BOOLEANGUI_EXPORT __declspec( dllexport ) + #else + #define GEOM_BOOLEANGUI_EXPORT + #endif + #else + #if defined WIN32 + #define GEOM_BOOLEANGUI_EXPORT __declspec( dllimport ) + #else + #define GEOM_BOOLEANGUI_EXPORT + #endif + #endif +#else + #define GEOM_BOOLEANGUI_EXPORT +#endif + //================================================================================= // class : BooleanGUI // purpose : //================================================================================= -class BooleanGUI : public GEOMGUI +class GEOM_BOOLEANGUI_EXPORT BooleanGUI : public GEOMGUI { protected: BooleanGUI( GeometryGUI* parent ); // hide constructor to avoid direct creation diff --git a/src/BooleanGUI/BooleanGUI_Dialog.h b/src/BooleanGUI/BooleanGUI_Dialog.h index 70f6c4b75..b6e357623 100644 --- a/src/BooleanGUI/BooleanGUI_Dialog.h +++ b/src/BooleanGUI/BooleanGUI_Dialog.h @@ -29,6 +29,8 @@ #ifndef BooleanGUI_Dialog_H #define BooleanGUI_Dialog_H +#include "BooleanGUI.h" //for wnt defines + #include "GEOMBase_Skeleton.h" class DlgRef_2Sel_QTD; @@ -37,7 +39,7 @@ class DlgRef_2Sel_QTD; // class : BooleanGUI_Dialog // purpose : //================================================================================= -class BooleanGUI_Dialog : public GEOMBase_Skeleton +class GEOM_BOOLEANGUI_EXPORT BooleanGUI_Dialog : public GEOMBase_Skeleton { Q_OBJECT diff --git a/src/BuildGUI/BuildGUI.cxx b/src/BuildGUI/BuildGUI.cxx index bb0c98a2c..ea176cdc7 100644 --- a/src/BuildGUI/BuildGUI.cxx +++ b/src/BuildGUI/BuildGUI.cxx @@ -108,9 +108,7 @@ bool BuildGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent ) //===================================================================================== extern "C" { -#ifdef WNT - __declspec( dllexport ) -#endif + GEOM_BUILDGUI_EXPORT GEOMGUI* GetLibGUI( GeometryGUI* parent ) { return BuildGUI::GetBuildGUI( parent ); diff --git a/src/BuildGUI/BuildGUI.h b/src/BuildGUI/BuildGUI.h index 25b11cfa8..ae230ce16 100644 --- a/src/BuildGUI/BuildGUI.h +++ b/src/BuildGUI/BuildGUI.h @@ -29,13 +29,15 @@ #ifndef BUILDGUI_H #define BUILDGUI_H +#include "GEOM_BuildGUI.hxx" + #include "GEOMGUI.h" //================================================================================= // class : BuildGUI // purpose : //================================================================================= -class BuildGUI : public GEOMGUI +class GEOM_BUILDGUI_EXPORT BuildGUI : public GEOMGUI { protected: BuildGUI( GeometryGUI* parent ); // hide constructor to avoid direct creation diff --git a/src/BuildGUI/BuildGUI_CompoundDlg.h b/src/BuildGUI/BuildGUI_CompoundDlg.h index eef0b2fb1..b667addb8 100644 --- a/src/BuildGUI/BuildGUI_CompoundDlg.h +++ b/src/BuildGUI/BuildGUI_CompoundDlg.h @@ -29,6 +29,8 @@ #ifndef DIALOGBOX_COMPOUND_H #define DIALOGBOX_COMPOUND_H +#include "GEOM_BuildGUI.hxx" + #include "GEOMBase_Skeleton.h" #include "DlgRef_1Sel_QTD.h" @@ -36,7 +38,7 @@ // class : BuildGUI_CompoundDlg // purpose : //================================================================================= -class BuildGUI_CompoundDlg : public GEOMBase_Skeleton +class GEOM_BUILDGUI_EXPORT BuildGUI_CompoundDlg : public GEOMBase_Skeleton { Q_OBJECT diff --git a/src/BuildGUI/BuildGUI_EdgeDlg.h b/src/BuildGUI/BuildGUI_EdgeDlg.h index 2d3af1aba..f18a6a5c2 100644 --- a/src/BuildGUI/BuildGUI_EdgeDlg.h +++ b/src/BuildGUI/BuildGUI_EdgeDlg.h @@ -29,6 +29,8 @@ #ifndef DIALOGBOX_EDGE_H #define DIALOGBOX_EDGE_H +#include "GEOM_BuildGUI.hxx" + #include "GEOMBase_Skeleton.h" #include "DlgRef_2Sel_QTD.h" @@ -36,7 +38,7 @@ // class : BuildGUI_EdgeDlg // purpose : //================================================================================= -class BuildGUI_EdgeDlg : public GEOMBase_Skeleton +class GEOM_BUILDGUI_EXPORT BuildGUI_EdgeDlg : public GEOMBase_Skeleton { Q_OBJECT diff --git a/src/BuildGUI/BuildGUI_FaceDlg.h b/src/BuildGUI/BuildGUI_FaceDlg.h index f59189fd6..35a7d5646 100644 --- a/src/BuildGUI/BuildGUI_FaceDlg.h +++ b/src/BuildGUI/BuildGUI_FaceDlg.h @@ -29,6 +29,8 @@ #ifndef DIALOGBOX_FACE_H #define DIALOGBOX_FACE_H +#include "GEOM_BuildGUI.hxx" + #include "GEOMBase_Skeleton.h" #include "DlgRef_1Sel1Check_QTD.h" @@ -36,7 +38,7 @@ // class : BuildGUI_FaceDlg // purpose : //================================================================================= -class BuildGUI_FaceDlg : public GEOMBase_Skeleton +class GEOM_BUILDGUI_EXPORT BuildGUI_FaceDlg : public GEOMBase_Skeleton { Q_OBJECT diff --git a/src/BuildGUI/BuildGUI_ShellDlg.h b/src/BuildGUI/BuildGUI_ShellDlg.h index 345fa7519..9fbc89603 100644 --- a/src/BuildGUI/BuildGUI_ShellDlg.h +++ b/src/BuildGUI/BuildGUI_ShellDlg.h @@ -29,6 +29,8 @@ #ifndef DIALOGBOX_SHELL_H #define DIALOGBOX_SHELL_H +#include "GEOM_BuildGUI.hxx" + #include "GEOMBase_Skeleton.h" #include "DlgRef_1Sel_QTD.h" @@ -36,7 +38,7 @@ // class : BuildGUI_ShellDlg // purpose : //================================================================================= -class BuildGUI_ShellDlg : public GEOMBase_Skeleton +class GEOM_BUILDGUI_EXPORT BuildGUI_ShellDlg : public GEOMBase_Skeleton { Q_OBJECT diff --git a/src/BuildGUI/BuildGUI_SolidDlg.h b/src/BuildGUI/BuildGUI_SolidDlg.h index c85fef588..1d3802bfb 100644 --- a/src/BuildGUI/BuildGUI_SolidDlg.h +++ b/src/BuildGUI/BuildGUI_SolidDlg.h @@ -29,6 +29,8 @@ #ifndef DIALOGBOX_SOLID_H #define DIALOGBOX_SOLID_H +#include "GEOM_BuildGUI.hxx" + #include "GEOMBase_Skeleton.h" #include "DlgRef_1Sel1Check_QTD.h" @@ -36,7 +38,7 @@ // class : BuildGUI_SolidDlg // purpose : //================================================================================= -class BuildGUI_SolidDlg : public GEOMBase_Skeleton +class GEOM_BUILDGUI_EXPORT BuildGUI_SolidDlg : public GEOMBase_Skeleton { Q_OBJECT diff --git a/src/BuildGUI/BuildGUI_WireDlg.h b/src/BuildGUI/BuildGUI_WireDlg.h index 2f53e2534..86c2edb24 100644 --- a/src/BuildGUI/BuildGUI_WireDlg.h +++ b/src/BuildGUI/BuildGUI_WireDlg.h @@ -29,6 +29,8 @@ #ifndef DIALOGBOX_WIRE_H #define DIALOGBOX_WIRE_H +#include "GEOM_BuildGUI" + #include "GEOMBase_Skeleton.h" #include "DlgRef_1Sel_QTD.h" @@ -36,7 +38,7 @@ // class : BuildGUI_WireDlg // purpose : //================================================================================= -class BuildGUI_WireDlg : public GEOMBase_Skeleton +class GEOM_BUILDGUI_EXPORT BuildGUI_WireDlg : public GEOMBase_Skeleton { Q_OBJECT diff --git a/src/BuildGUI/GEOM_BuildGUI.hxx b/src/BuildGUI/GEOM_BuildGUI.hxx new file mode 100755 index 000000000..7a36f8552 --- /dev/null +++ b/src/BuildGUI/GEOM_BuildGUI.hxx @@ -0,0 +1,47 @@ +// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// +// +// +// File : GEOM_BuildGUI.hxx +// Author : Alexander A. BORODIN +// Module : GEOM + +#ifndef _GEOM_BuildGUI_HXX_ +#define _GEOM_BuildGUI_HXX_ + +#ifdef WNT + #if defined BUILDGUI_EXPORTS + #if defined WIN32 + #define GEOM_BUILDGUI_EXPORT __declspec( dllexport ) + #else + #define GEOM_BUILDGUI_EXPORT + #endif + #else + #if defined WIN32 + #define GEOM_BUILDGUI_EXPORT __declspec( dllimport ) + #else + #define GEOM_BUILDGUI_EXPORT + #endif + #endif +#else + #define GEOM_BUILDGUI_EXPORT +#endif + +#endif diff --git a/src/BuildGUI/Makefile.in b/src/BuildGUI/Makefile.in index 36d4f80de..db8700ff8 100644 --- a/src/BuildGUI/Makefile.in +++ b/src/BuildGUI/Makefile.in @@ -54,7 +54,8 @@ LIB_MOC = \ BuildGUI_FaceDlg.h \ BuildGUI_ShellDlg.h \ BuildGUI_SolidDlg.h \ - BuildGUI_CompoundDlg.h + BuildGUI_CompoundDlg.h \ + GEOM_BuildGUI.hxx LIB_CLIENT_IDL = SALOME_Exception.idl SALOME_GenericObj.idl SALOME_Component.idl diff --git a/src/DisplayGUI/DisplayGUI.cxx b/src/DisplayGUI/DisplayGUI.cxx index 61dc6bfca..13d6577d1 100644 --- a/src/DisplayGUI/DisplayGUI.cxx +++ b/src/DisplayGUI/DisplayGUI.cxx @@ -475,9 +475,7 @@ void DisplayGUI::ChangeDisplayMode( const int mode, SUIT_ViewWindow* viewWindow //===================================================================================== extern "C" { -#ifdef WNT - __declspec( dllexport ) -#endif + GEOM_DISPLAYGUI_EXPORT GEOMGUI* GetLibGUI( GeometryGUI* parent ) { return DisplayGUI::GetDisplayGUI( parent ); diff --git a/src/DisplayGUI/DisplayGUI.h b/src/DisplayGUI/DisplayGUI.h index 64bfd1e1f..74d409610 100644 --- a/src/DisplayGUI/DisplayGUI.h +++ b/src/DisplayGUI/DisplayGUI.h @@ -31,15 +31,23 @@ #include "GEOMGUI.h" #include "GEOMBase.h" -//#ifdef WNT -//#include -//#else -//#define SALOME_WNT_EXPORT -//#endif -#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS -#define DISPLAYGUI_WNT_EXPORT __declspec( dllexport ) + +#ifdef WNT + #if defined DISPLAYGUI_EXPORTS + #if defined WIN32 + #define GEOM_DISPLAYGUI_EXPORT __declspec( dllexport ) + #else + #define GEOM_DISPLAYGUI_EXPORT + #endif + #else + #if defined WIN32 + #define GEOM_DISPLAYGUI_EXPORT __declspec( dllimport ) + #else + #define GEOM_DISPLAYGUI_EXPORT + #endif + #endif #else -#define DISPLAYGUI_WNT_EXPORT + #define GEOM_DISPLAYGUI_EXPORT #endif //================================================================================= // class : GEOMBase_Display @@ -47,7 +55,7 @@ //================================================================================= //class QAD_ViewFrame; class SUIT_ViewWindow; -class DisplayGUI : public GEOMGUI +class GEOM_DISPLAYGUI_EXPORT DisplayGUI : public GEOMGUI { protected: DisplayGUI( GeometryGUI* parent ); // hide constructor to avoid direct creation diff --git a/src/DlgRef/DlgRef_1List1Spin1Btn_QTD.h b/src/DlgRef/DlgRef_1List1Spin1Btn_QTD.h index 4ef73377f..bbb25661c 100644 --- a/src/DlgRef/DlgRef_1List1Spin1Btn_QTD.h +++ b/src/DlgRef/DlgRef_1List1Spin1Btn_QTD.h @@ -28,6 +28,8 @@ #ifndef DLGREF_1LIST1SPIN1BTN_QTD_H #define DLGREF_1LIST1SPIN1BTN_QTD_H +#include "GEOM_DlgRef.hxx" + #include #include class QVBoxLayout; @@ -40,13 +42,7 @@ class QListViewItem; class QPushButton; class QSpinBox; -#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_1List1Spin1Btn_QTD : public QWidget +class GEOM_DLGREF_EXPORT DlgRef_1List1Spin1Btn_QTD : public QWidget { Q_OBJECT diff --git a/src/DlgRef/DlgRef_1Sel1Check1List_QTD.h b/src/DlgRef/DlgRef_1Sel1Check1List_QTD.h index 9daae866b..60095acc3 100644 --- a/src/DlgRef/DlgRef_1Sel1Check1List_QTD.h +++ b/src/DlgRef/DlgRef_1Sel1Check1List_QTD.h @@ -28,6 +28,8 @@ #ifndef DLGREF_1SEL1CHECK1LIST_QTD_H #define DLGREF_1SEL1CHECK1LIST_QTD_H +#include "GEOM_DlgRef.hxx" + #include #include class QVBoxLayout; @@ -40,13 +42,7 @@ class QLineEdit; class QPushButton; class QRadioButton; -#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_1Sel1Check1List_QTD : public QWidget +class GEOM_DLGREF_EXPORT DlgRef_1Sel1Check1List_QTD : public QWidget { Q_OBJECT diff --git a/src/DlgRef/DlgRef_1Sel1Check_QTD.h b/src/DlgRef/DlgRef_1Sel1Check_QTD.h index 70189f021..3c67a3a4e 100644 --- a/src/DlgRef/DlgRef_1Sel1Check_QTD.h +++ b/src/DlgRef/DlgRef_1Sel1Check_QTD.h @@ -28,6 +28,8 @@ #ifndef DLGREF_1SEL1CHECK_QTD_H #define DLGREF_1SEL1CHECK_QTD_H +#include "GEOM_DlgRef.hxx" + #include #include class QVBoxLayout; @@ -39,13 +41,7 @@ class QLabel; class QLineEdit; class QPushButton; -#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_1Sel1Check_QTD : public QWidget +class GEOM_DLGREF_EXPORT DlgRef_1Sel1Check_QTD : public QWidget { Q_OBJECT diff --git a/src/DlgRef/DlgRef_1Sel1Spin.h b/src/DlgRef/DlgRef_1Sel1Spin.h index dbf001657..d599d56c2 100644 --- a/src/DlgRef/DlgRef_1Sel1Spin.h +++ b/src/DlgRef/DlgRef_1Sel1Spin.h @@ -29,20 +29,12 @@ #ifndef DLGREF_1SEL1SPIN_H #define DLGREF_1SEL1SPIN_H +#include "GEOM_DlgRef.hxx" + #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_WNT_EXPORT DlgRef_1Sel1Spin : public DlgRef_1Sel1Spin_QTD + +class GEOM_DLGREF_EXPORT DlgRef_1Sel1Spin : public DlgRef_1Sel1Spin_QTD { Q_OBJECT diff --git a/src/DlgRef/DlgRef_1Sel1Spin1Check.h b/src/DlgRef/DlgRef_1Sel1Spin1Check.h index c08788e0d..993a3e934 100644 --- a/src/DlgRef/DlgRef_1Sel1Spin1Check.h +++ b/src/DlgRef/DlgRef_1Sel1Spin1Check.h @@ -29,16 +29,12 @@ #ifndef DLGREF_1SEL1SPIN1CHECK_H #define DLGREF_1SEL1SPIN1CHECK_H +#include "GEOM_DlgRef.hxx" + #include "DlgRef_1Sel1Spin1Check_QTD.h" #include "DlgRef_SpinBox.h" -#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_1Sel1Spin1Check : public DlgRef_1Sel1Spin1Check_QTD +class GEOM_DLGREF_EXPORT DlgRef_1Sel1Spin1Check : public DlgRef_1Sel1Spin1Check_QTD { Q_OBJECT diff --git a/src/DlgRef/DlgRef_1Sel1Spin1Check_QTD.h b/src/DlgRef/DlgRef_1Sel1Spin1Check_QTD.h index 1f943faa7..8cbc6c1a7 100644 --- a/src/DlgRef/DlgRef_1Sel1Spin1Check_QTD.h +++ b/src/DlgRef/DlgRef_1Sel1Spin1Check_QTD.h @@ -28,6 +28,8 @@ #ifndef DLGREF_1SEL1SPIN1CHECK_QTD_H #define DLGREF_1SEL1SPIN1CHECK_QTD_H +#include "GEOM_DlgRef.hxx" + #include #include class QVBoxLayout; @@ -40,7 +42,7 @@ class QLineEdit; class QPushButton; class QSpinBox; -class DlgRef_1Sel1Spin1Check_QTD : public QWidget +class GEOM_DLGREF_EXPORT DlgRef_1Sel1Spin1Check_QTD : public QWidget { Q_OBJECT diff --git a/src/DlgRef/DlgRef_1Sel1Spin_QTD.h b/src/DlgRef/DlgRef_1Sel1Spin_QTD.h index 1aa7d9d5d..778c0b851 100644 --- a/src/DlgRef/DlgRef_1Sel1Spin_QTD.h +++ b/src/DlgRef/DlgRef_1Sel1Spin_QTD.h @@ -28,6 +28,8 @@ #ifndef DLGREF_1SEL1SPIN_QTD_H #define DLGREF_1SEL1SPIN_QTD_H +#include "GEOM_DlgRef.hxx" + #include #include class QVBoxLayout; @@ -38,12 +40,8 @@ class QLabel; class QLineEdit; class QPushButton; class QSpinBox; -#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 + +class GEOM_DLGREF_EXPORT DlgRef_1Sel1Spin_QTD : public QWidget { Q_OBJECT diff --git a/src/DlgRef/DlgRef_1Sel2Spin.h b/src/DlgRef/DlgRef_1Sel2Spin.h index 33a11f4f5..ee6f9d0c8 100644 --- a/src/DlgRef/DlgRef_1Sel2Spin.h +++ b/src/DlgRef/DlgRef_1Sel2Spin.h @@ -29,10 +29,12 @@ #ifndef DLGREF_1SEL2SPIN_H #define DLGREF_1SEL2SPIN_H +#include "GEOM_DlgRef.hxx" + #include "DlgRef_1Sel2Spin_QTD.h" #include "DlgRef_SpinBox.h" -class DlgRef_1Sel2Spin : public DlgRef_1Sel2Spin_QTD +class GEOM_DLGREF_EXPORT DlgRef_1Sel2Spin : public DlgRef_1Sel2Spin_QTD { Q_OBJECT diff --git a/src/DlgRef/DlgRef_1Sel2Spin_QTD.h b/src/DlgRef/DlgRef_1Sel2Spin_QTD.h index 9a5cbe961..a952e67c1 100644 --- a/src/DlgRef/DlgRef_1Sel2Spin_QTD.h +++ b/src/DlgRef/DlgRef_1Sel2Spin_QTD.h @@ -28,6 +28,8 @@ #ifndef DLGREF_1SEL2SPIN_QTD_H #define DLGREF_1SEL2SPIN_QTD_H +#include "GEOM_DlgRef.hxx" + #include #include class QVBoxLayout; @@ -39,7 +41,7 @@ class QLineEdit; class QPushButton; class QSpinBox; -class DlgRef_1Sel2Spin_QTD : public QWidget +class GEOM_DLGREF_EXPORT DlgRef_1Sel2Spin_QTD : public QWidget { Q_OBJECT diff --git a/src/DlgRef/DlgRef_1Sel3Check_QTD.h b/src/DlgRef/DlgRef_1Sel3Check_QTD.h index 3ea5d09d2..0301e2661 100644 --- a/src/DlgRef/DlgRef_1Sel3Check_QTD.h +++ b/src/DlgRef/DlgRef_1Sel3Check_QTD.h @@ -28,6 +28,8 @@ #ifndef DLGREF_1SEL3CHECK_QTD_H #define DLGREF_1SEL3CHECK_QTD_H +#include "GEOM_DlgRef.hxx" + #include #include class QVBoxLayout; @@ -39,7 +41,7 @@ class QLabel; class QLineEdit; class QPushButton; -class DlgRef_1Sel3Check_QTD : public QWidget +class GEOM_DLGREF_EXPORT DlgRef_1Sel3Check_QTD : public QWidget { Q_OBJECT diff --git a/src/DlgRef/DlgRef_1Sel3Spin.h b/src/DlgRef/DlgRef_1Sel3Spin.h index 510090565..003acde75 100644 --- a/src/DlgRef/DlgRef_1Sel3Spin.h +++ b/src/DlgRef/DlgRef_1Sel3Spin.h @@ -29,21 +29,12 @@ #ifndef DLGREF_1SEL3SPIN_H #define DLGREF_1SEL3SPIN_H +#include "GEOM_DlgRef.hxx" + #include "DlgRef_1Sel3Spin_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_WNT_EXPORT DlgRef_1Sel3Spin : public DlgRef_1Sel3Spin_QTD + +class GEOM_DLGREF_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 a52e1e696..8314a9e78 100644 --- a/src/DlgRef/DlgRef_1Sel3Spin_QTD.h +++ b/src/DlgRef/DlgRef_1Sel3Spin_QTD.h @@ -28,6 +28,8 @@ #ifndef DLGREF_1SEL3SPIN_QTD_H #define DLGREF_1SEL3SPIN_QTD_H +#include "GEOM_DlgRef.hxx" + #include #include class QVBoxLayout; @@ -38,12 +40,8 @@ class QLabel; class QLineEdit; class QPushButton; class QSpinBox; -#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 + +class GEOM_DLGREF_EXPORT DlgRef_1Sel3Spin_QTD : public QWidget { Q_OBJECT diff --git a/src/DlgRef/DlgRef_1Sel4Spin.h b/src/DlgRef/DlgRef_1Sel4Spin.h index db4d2560d..a39c4cb04 100644 --- a/src/DlgRef/DlgRef_1Sel4Spin.h +++ b/src/DlgRef/DlgRef_1Sel4Spin.h @@ -29,10 +29,12 @@ #ifndef DLGREF_1SEL4SPIN_H #define DLGREF_1SEL4SPIN_H +#include "GEOM_DlgRef.hxx" + #include "DlgRef_1Sel4Spin_QTD.h" #include "DlgRef_SpinBox.h" -class DlgRef_1Sel4Spin : public DlgRef_1Sel4Spin_QTD +class GEOM_DLGREF_EXPORT DlgRef_1Sel4Spin : public DlgRef_1Sel4Spin_QTD { Q_OBJECT diff --git a/src/DlgRef/DlgRef_1Sel4Spin_QTD.h b/src/DlgRef/DlgRef_1Sel4Spin_QTD.h index 60f2a44c2..ce50174d6 100644 --- a/src/DlgRef/DlgRef_1Sel4Spin_QTD.h +++ b/src/DlgRef/DlgRef_1Sel4Spin_QTD.h @@ -28,6 +28,8 @@ #ifndef DLGREF_1SEL4SPIN_QTD_H #define DLGREF_1SEL4SPIN_QTD_H +#include "GEOM_DlgRef.hxx" + #include #include class QVBoxLayout; @@ -39,7 +41,7 @@ class QLineEdit; class QPushButton; class QSpinBox; -class DlgRef_1Sel4Spin_QTD : public QWidget +class GEOM_DLGREF_EXPORT DlgRef_1Sel4Spin_QTD : public QWidget { Q_OBJECT diff --git a/src/DlgRef/DlgRef_1Sel5Spin.h b/src/DlgRef/DlgRef_1Sel5Spin.h index 8cd0a46da..968f67053 100644 --- a/src/DlgRef/DlgRef_1Sel5Spin.h +++ b/src/DlgRef/DlgRef_1Sel5Spin.h @@ -29,16 +29,12 @@ #ifndef DLGREF_1SEL5SPIN_H #define DLGREF_1SEL5SPIN_H +#include "GEOM_DlgRef.hxx" + #include "DlgRef_1Sel5Spin_QTD.h" #include "DlgRef_SpinBox.h" -#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_1Sel5Spin : public DlgRef_1Sel5Spin_QTD +class GEOM_DLGREF_EXPORT DlgRef_1Sel5Spin : public DlgRef_1Sel5Spin_QTD { Q_OBJECT diff --git a/src/DlgRef/DlgRef_1Sel5Spin_QTD.h b/src/DlgRef/DlgRef_1Sel5Spin_QTD.h index a7a35a866..5e93d42e2 100644 --- a/src/DlgRef/DlgRef_1Sel5Spin_QTD.h +++ b/src/DlgRef/DlgRef_1Sel5Spin_QTD.h @@ -28,6 +28,8 @@ #ifndef DLGREF_1SEL5SPIN_QTD_H #define DLGREF_1SEL5SPIN_QTD_H +#include "GEOM_DlgRef.hxx" + #include #include class QVBoxLayout; @@ -39,7 +41,7 @@ class QLineEdit; class QPushButton; class QSpinBox; -class DlgRef_1Sel5Spin_QTD : public QWidget +class GEOM_DLGREF_EXPORT DlgRef_1Sel5Spin_QTD : public QWidget { Q_OBJECT diff --git a/src/DlgRef/DlgRef_1Sel_Ext.h b/src/DlgRef/DlgRef_1Sel_Ext.h index 138227aa6..81e9d40de 100644 --- a/src/DlgRef/DlgRef_1Sel_Ext.h +++ b/src/DlgRef/DlgRef_1Sel_Ext.h @@ -28,17 +28,13 @@ #ifndef DlgRef_1Sel_Ext_H #define DlgRef_1Sel_Ext_H +#include "GEOM_DlgRef.hxx" + #include "DlgRef_1Sel_QTD.h" class QGridLayout; -#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_Ext : public DlgRef_1Sel_QTD +class GEOM_DLGREF_EXPORT DlgRef_1Sel_Ext : public DlgRef_1Sel_QTD { Q_OBJECT diff --git a/src/DlgRef/DlgRef_1Sel_QTD.h b/src/DlgRef/DlgRef_1Sel_QTD.h index 55587c0a5..9ce410dca 100644 --- a/src/DlgRef/DlgRef_1Sel_QTD.h +++ b/src/DlgRef/DlgRef_1Sel_QTD.h @@ -28,6 +28,8 @@ #ifndef DLGREF_1SEL_QTD_H #define DLGREF_1SEL_QTD_H +#include "GEOM_DlgRef.hxx" + #include #include class QVBoxLayout; @@ -38,13 +40,7 @@ class QLabel; class QLineEdit; class QPushButton; -#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 +class GEOM_DLGREF_EXPORT DlgRef_1Sel_QTD : public QWidget { Q_OBJECT diff --git a/src/DlgRef/DlgRef_1Spin.h b/src/DlgRef/DlgRef_1Spin.h index ccf88983c..efcc0847b 100644 --- a/src/DlgRef/DlgRef_1Spin.h +++ b/src/DlgRef/DlgRef_1Spin.h @@ -29,14 +29,12 @@ #ifndef DLGREF_1SPIN_H #define DLGREF_1SPIN_H +#include "GEOM_DlgRef.hxx" + #include "DlgRef_1Spin_QTD.h" #include "DlgRef_SpinBox.h" -#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_1Spin : public DlgRef_1Spin_QTD + +class GEOM_DLGREF_EXPORT DlgRef_1Spin : public DlgRef_1Spin_QTD { Q_OBJECT diff --git a/src/DlgRef/DlgRef_1Spin_QTD.h b/src/DlgRef/DlgRef_1Spin_QTD.h index f50d92bc9..4966216b1 100644 --- a/src/DlgRef/DlgRef_1Spin_QTD.h +++ b/src/DlgRef/DlgRef_1Spin_QTD.h @@ -28,6 +28,8 @@ #ifndef DLGREF_1SPIN_QTD_H #define DLGREF_1SPIN_QTD_H +#include "GEOM_DlgRef.hxx" + #include #include class QVBoxLayout; @@ -36,12 +38,8 @@ class QGridLayout; class QGroupBox; class QLabel; class QSpinBox; -#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_1Spin_QTD : public QWidget + +class GEOM_DLGREF_EXPORT DlgRef_1Spin_QTD : public QWidget { Q_OBJECT diff --git a/src/DlgRef/DlgRef_2Sel1Spin.h b/src/DlgRef/DlgRef_2Sel1Spin.h index 8141a2085..f6dd01c42 100644 --- a/src/DlgRef/DlgRef_2Sel1Spin.h +++ b/src/DlgRef/DlgRef_2Sel1Spin.h @@ -29,20 +29,12 @@ #ifndef DLGREF_2SEL1SPIN_H #define DLGREF_2SEL1SPIN_H +#include "GEOM_DlgRef.hxx" + #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_WNT_EXPORT DlgRef_2Sel1Spin : public DlgRef_2Sel1Spin_QTD + +class GEOM_DLGREF_EXPORT DlgRef_2Sel1Spin : public DlgRef_2Sel1Spin_QTD { Q_OBJECT diff --git a/src/DlgRef/DlgRef_2Sel1Spin2Check.h b/src/DlgRef/DlgRef_2Sel1Spin2Check.h index 7bd7e50f8..b899ff975 100644 --- a/src/DlgRef/DlgRef_2Sel1Spin2Check.h +++ b/src/DlgRef/DlgRef_2Sel1Spin2Check.h @@ -29,15 +29,12 @@ #ifndef DLGREF_2SEL1SPIN2CHECK_H #define DLGREF_2SEL1SPIN2CHECK_H +#include "GEOM_DlgRef.hxx" + #include "DlgRef_2Sel1Spin2Check_QTD.h" #include "DlgRef_SpinBox.h" -#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_2Sel1Spin2Check : public DlgRef_2Sel1Spin2Check_QTD +class GEOM_DLGREF_EXPORT DlgRef_2Sel1Spin2Check : public DlgRef_2Sel1Spin2Check_QTD { Q_OBJECT diff --git a/src/DlgRef/DlgRef_2Sel1Spin2Check_QTD.h b/src/DlgRef/DlgRef_2Sel1Spin2Check_QTD.h index d57b10531..9d4a40820 100644 --- a/src/DlgRef/DlgRef_2Sel1Spin2Check_QTD.h +++ b/src/DlgRef/DlgRef_2Sel1Spin2Check_QTD.h @@ -28,6 +28,8 @@ #ifndef DLGREF_2SEL1SPIN2CHECK_QTD_H #define DLGREF_2SEL1SPIN2CHECK_QTD_H +#include "GEOM_DlgRef.hxx" + #include #include class QVBoxLayout; @@ -40,7 +42,7 @@ class QLineEdit; class QPushButton; class QSpinBox; -class DlgRef_2Sel1Spin2Check_QTD : public QWidget +class GEOM_DLGREF_EXPORT DlgRef_2Sel1Spin2Check_QTD : public QWidget { Q_OBJECT diff --git a/src/DlgRef/DlgRef_2Sel1Spin_QTD.h b/src/DlgRef/DlgRef_2Sel1Spin_QTD.h index df9ec8e3e..04a83b211 100644 --- a/src/DlgRef/DlgRef_2Sel1Spin_QTD.h +++ b/src/DlgRef/DlgRef_2Sel1Spin_QTD.h @@ -28,6 +28,8 @@ #ifndef DLGREF_2SEL1SPIN_QTD_H #define DLGREF_2SEL1SPIN_QTD_H +#include "GEOM_DlgRef.hxx" + #include #include class QVBoxLayout; @@ -39,13 +41,7 @@ class QLineEdit; class QPushButton; class QSpinBox; -#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 +class GEOM_DLGREF_EXPORT DlgRef_2Sel1Spin_QTD : public QWidget { Q_OBJECT diff --git a/src/DlgRef/DlgRef_2Sel2Spin.h b/src/DlgRef/DlgRef_2Sel2Spin.h index 7a0b41076..a5aa9002b 100644 --- a/src/DlgRef/DlgRef_2Sel2Spin.h +++ b/src/DlgRef/DlgRef_2Sel2Spin.h @@ -29,19 +29,12 @@ #ifndef DLGREF_2SEL2SPIN_H #define DLGREF_2SEL2SPIN_H +#include "GEOM_DlgRef.hxx" + #include "DlgRef_2Sel2Spin_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_WNT_EXPORT DlgRef_2Sel2Spin : public DlgRef_2Sel2Spin_QTD + +class GEOM_DLGREF_EXPORT DlgRef_2Sel2Spin : public DlgRef_2Sel2Spin_QTD { Q_OBJECT diff --git a/src/DlgRef/DlgRef_2Sel2Spin1Check.h b/src/DlgRef/DlgRef_2Sel2Spin1Check.h index 532075853..eeff1453d 100644 --- a/src/DlgRef/DlgRef_2Sel2Spin1Check.h +++ b/src/DlgRef/DlgRef_2Sel2Spin1Check.h @@ -29,16 +29,12 @@ #ifndef DLGREF_2SEL2SPIN1CHECK_H #define DLGREF_2SEL2SPIN1CHECK_H +#include "GEOM_DlgRef.hxx" + #include "DlgRef_2Sel2Spin1Check_QTD.h" #include "DlgRef_SpinBox.h" -#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_2Sel2Spin1Check : public DlgRef_2Sel2Spin1Check_QTD +class GEOM_DLGREF_EXPORT DlgRef_2Sel2Spin1Check : public DlgRef_2Sel2Spin1Check_QTD { Q_OBJECT diff --git a/src/DlgRef/DlgRef_2Sel2Spin1Check_QTD.h b/src/DlgRef/DlgRef_2Sel2Spin1Check_QTD.h index 2cf259170..63fdf388c 100644 --- a/src/DlgRef/DlgRef_2Sel2Spin1Check_QTD.h +++ b/src/DlgRef/DlgRef_2Sel2Spin1Check_QTD.h @@ -28,6 +28,8 @@ #ifndef DLGREF_2SEL2SPIN1CHECK_QTD_H #define DLGREF_2SEL2SPIN1CHECK_QTD_H +#include "GEOM_DlgRef.hxx" + #include #include class QVBoxLayout; @@ -40,7 +42,7 @@ class QLineEdit; class QPushButton; class QSpinBox; -class DlgRef_2Sel2Spin1Check_QTD : public QWidget +class GEOM_DLGREF_EXPORT DlgRef_2Sel2Spin1Check_QTD : public QWidget { Q_OBJECT diff --git a/src/DlgRef/DlgRef_2Sel2Spin_QTD.h b/src/DlgRef/DlgRef_2Sel2Spin_QTD.h index 5dbea6b93..1b65d1c9e 100644 --- a/src/DlgRef/DlgRef_2Sel2Spin_QTD.h +++ b/src/DlgRef/DlgRef_2Sel2Spin_QTD.h @@ -28,6 +28,8 @@ #ifndef DLGREF_2SEL2SPIN_QTD_H #define DLGREF_2SEL2SPIN_QTD_H +#include "GEOM_DlgRef.hxx" + #include #include class QVBoxLayout; @@ -39,13 +41,7 @@ class QLineEdit; class QPushButton; class QSpinBox; -#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 +class GEOM_DLGREF_EXPORT DlgRef_2Sel2Spin_QTD : public QWidget { Q_OBJECT diff --git a/src/DlgRef/DlgRef_2Sel3Spin.h b/src/DlgRef/DlgRef_2Sel3Spin.h index 0624d581f..dd809e13a 100644 --- a/src/DlgRef/DlgRef_2Sel3Spin.h +++ b/src/DlgRef/DlgRef_2Sel3Spin.h @@ -29,16 +29,12 @@ #ifndef DLGREF_2SEL3SPIN_H #define DLGREF_2SEL3SPIN_H +#include "GEOM_DlgRef.hxx" + #include "DlgRef_2Sel3Spin_QTD.h" #include "DlgRef_SpinBox.h" -#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_2Sel3Spin : public DlgRef_2Sel3Spin_QTD +class GEOM_DLGREF_EXPORT DlgRef_2Sel3Spin : public DlgRef_2Sel3Spin_QTD { Q_OBJECT diff --git a/src/DlgRef/DlgRef_2Sel3Spin_QTD.h b/src/DlgRef/DlgRef_2Sel3Spin_QTD.h index 97f47417a..274b97df2 100644 --- a/src/DlgRef/DlgRef_2Sel3Spin_QTD.h +++ b/src/DlgRef/DlgRef_2Sel3Spin_QTD.h @@ -28,6 +28,8 @@ #ifndef DLGREF_2SEL3SPIN_QTD_H #define DLGREF_2SEL3SPIN_QTD_H +#include "GEOM_DlgRef.hxx" + #include #include class QVBoxLayout; @@ -38,12 +40,8 @@ class QLabel; class QLineEdit; class QPushButton; class QSpinBox; -#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_2Sel3Spin_QTD : public QWidget + +class GEOM_DLGREF_EXPORT DlgRef_2Sel3Spin_QTD : public QWidget { Q_OBJECT diff --git a/src/DlgRef/DlgRef_2Sel4Spin1Check.h b/src/DlgRef/DlgRef_2Sel4Spin1Check.h index 3dc1af1c4..348cbaa44 100644 --- a/src/DlgRef/DlgRef_2Sel4Spin1Check.h +++ b/src/DlgRef/DlgRef_2Sel4Spin1Check.h @@ -29,16 +29,13 @@ #ifndef DLGREF_2SEL4SPIN1CHECK_H #define DLGREF_2SEL4SPIN1CHECK_H +#include "GEOM_DlgRef.hxx" + #include "DlgRef_2Sel4Spin1Check_QTD.h" #include "DlgRef_SpinBox.h" -#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_2Sel4Spin1Check : public DlgRef_2Sel4Spin1Check_QTD +class GEOM_DLGREF_EXPORT DlgRef_2Sel4Spin1Check : public DlgRef_2Sel4Spin1Check_QTD { Q_OBJECT diff --git a/src/DlgRef/DlgRef_2Sel4Spin1Check_QTD.h b/src/DlgRef/DlgRef_2Sel4Spin1Check_QTD.h index 585708b58..2eaded516 100644 --- a/src/DlgRef/DlgRef_2Sel4Spin1Check_QTD.h +++ b/src/DlgRef/DlgRef_2Sel4Spin1Check_QTD.h @@ -28,6 +28,8 @@ #ifndef DLGREF_2SEL4SPIN1CHECK_QTD_H #define DLGREF_2SEL4SPIN1CHECK_QTD_H +#include "GEOM_DlgRef.hxx" + #include #include class QVBoxLayout; @@ -40,7 +42,7 @@ class QLineEdit; class QPushButton; class QSpinBox; -class DlgRef_2Sel4Spin1Check_QTD : public QWidget +class GEOM_DLGREF_EXPORT DlgRef_2Sel4Spin1Check_QTD : public QWidget { Q_OBJECT diff --git a/src/DlgRef/DlgRef_2Sel_QTD.h b/src/DlgRef/DlgRef_2Sel_QTD.h index 70ad2b2f9..9584b2ade 100644 --- a/src/DlgRef/DlgRef_2Sel_QTD.h +++ b/src/DlgRef/DlgRef_2Sel_QTD.h @@ -28,6 +28,8 @@ #ifndef DLGREF_2SEL_QTD_H #define DLGREF_2SEL_QTD_H +#include "GEOM_DlgRef.hxx" + #include #include class QVBoxLayout; @@ -38,13 +40,7 @@ class QLabel; class QLineEdit; class QPushButton; -#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 +class GEOM_DLGREF_EXPORT DlgRef_2Sel_QTD : public QWidget { Q_OBJECT diff --git a/src/DlgRef/DlgRef_2Spin.h b/src/DlgRef/DlgRef_2Spin.h index a10517a0c..050715ae9 100644 --- a/src/DlgRef/DlgRef_2Spin.h +++ b/src/DlgRef/DlgRef_2Spin.h @@ -31,12 +31,10 @@ #include "DlgRef_2Spin_QTD.h" #include "DlgRef_SpinBox.h" -#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_2Spin : public DlgRef_2Spin_QTD + +#include "GEOM_DlgRef.hxx" + +class GEOM_DLGREF_EXPORT DlgRef_2Spin : public DlgRef_2Spin_QTD { Q_OBJECT diff --git a/src/DlgRef/DlgRef_2Spin_QTD.h b/src/DlgRef/DlgRef_2Spin_QTD.h index 8c2acbab9..790f85688 100644 --- a/src/DlgRef/DlgRef_2Spin_QTD.h +++ b/src/DlgRef/DlgRef_2Spin_QTD.h @@ -28,6 +28,8 @@ #ifndef DLGREF_2SPIN_QTD_H #define DLGREF_2SPIN_QTD_H +#include "GEOM_DlgRef.hxx" + #include #include class QVBoxLayout; @@ -36,12 +38,8 @@ class QGridLayout; class QGroupBox; class QLabel; class QSpinBox; -#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_2Spin_QTD : public QWidget + +class GEOM_DLGREF_EXPORT DlgRef_2Spin_QTD : public QWidget { Q_OBJECT diff --git a/src/DlgRef/DlgRef_3Check_QTD.h b/src/DlgRef/DlgRef_3Check_QTD.h index d843073c6..60eaa5b00 100644 --- a/src/DlgRef/DlgRef_3Check_QTD.h +++ b/src/DlgRef/DlgRef_3Check_QTD.h @@ -28,6 +28,8 @@ #ifndef DLGREF_3CHECK_QTD_H #define DLGREF_3CHECK_QTD_H +#include "GEOM_DlgRef.hxx" + #include #include class QVBoxLayout; @@ -36,13 +38,7 @@ class QGridLayout; class QButtonGroup; class QRadioButton; -#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 +class GEOM_DLGREF_EXPORT DlgRef_3Check_QTD : public QWidget { Q_OBJECT diff --git a/src/DlgRef/DlgRef_3Sel1Spin.h b/src/DlgRef/DlgRef_3Sel1Spin.h index 3d806d127..e15001c0f 100644 --- a/src/DlgRef/DlgRef_3Sel1Spin.h +++ b/src/DlgRef/DlgRef_3Sel1Spin.h @@ -29,25 +29,18 @@ #ifndef DlgRef_3SEL_1SPIN_H #define DlgRef_3SEL_1SPIN_H +#include "GEOM_DlgRef.hxx" + #include "DlgRef_3Sel_QTD.h" #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_WNT_EXPORT DlgRef_3Sel1Spin : public DlgRef_3Sel_QTD +class GEOM_DLGREF_EXPORT DlgRef_3Sel1Spin : public DlgRef_3Sel_QTD { Q_OBJECT diff --git a/src/DlgRef/DlgRef_3Sel3Spin1Check.h b/src/DlgRef/DlgRef_3Sel3Spin1Check.h index e4768659e..9f0d8d18d 100644 --- a/src/DlgRef/DlgRef_3Sel3Spin1Check.h +++ b/src/DlgRef/DlgRef_3Sel3Spin1Check.h @@ -29,16 +29,12 @@ #ifndef DLGREF_3SEL3SPIN1CHECK_H #define DLGREF_3SEL3SPIN1CHECK_H +#include "GEOM_DlgRef.hxx" + #include "DlgRef_3Sel3Spin1Check_QTD.h" #include "DlgRef_SpinBox.h" -#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_3Sel3Spin1Check : public DlgRef_3Sel3Spin1Check_QTD +class GEOM_DLGREF_EXPORT DlgRef_3Sel3Spin1Check : public DlgRef_3Sel3Spin1Check_QTD { Q_OBJECT diff --git a/src/DlgRef/DlgRef_3Sel3Spin1Check_QTD.h b/src/DlgRef/DlgRef_3Sel3Spin1Check_QTD.h index 553f90840..253191887 100644 --- a/src/DlgRef/DlgRef_3Sel3Spin1Check_QTD.h +++ b/src/DlgRef/DlgRef_3Sel3Spin1Check_QTD.h @@ -28,6 +28,8 @@ #ifndef DLGREF_3SEL3SPIN1CHECK_QTD_H #define DLGREF_3SEL3SPIN1CHECK_QTD_H +#include "GEOM_DlgRef.hxx" + #include #include class QVBoxLayout; @@ -40,7 +42,7 @@ class QLineEdit; class QPushButton; class QSpinBox; -class DlgRef_3Sel3Spin1Check_QTD : public QWidget +class GEOM_DLGREF_EXPORT DlgRef_3Sel3Spin1Check_QTD : public QWidget { Q_OBJECT diff --git a/src/DlgRef/DlgRef_3Sel4Spin2Check.h b/src/DlgRef/DlgRef_3Sel4Spin2Check.h index 62708139e..06e055a1a 100644 --- a/src/DlgRef/DlgRef_3Sel4Spin2Check.h +++ b/src/DlgRef/DlgRef_3Sel4Spin2Check.h @@ -29,16 +29,12 @@ #ifndef DLGREF_3SEL4SPIN2CHECK_H #define DLGREF_3SEL4SPIN2CHECK_H +#include "GEOM_DlgRef.hxx" + #include "DlgRef_3Sel4Spin2Check_QTD.h" #include "DlgRef_SpinBox.h" -#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_3Sel4Spin2Check : public DlgRef_3Sel4Spin2Check_QTD +class GEOM_DLGREF_EXPORT DlgRef_3Sel4Spin2Check : public DlgRef_3Sel4Spin2Check_QTD { Q_OBJECT diff --git a/src/DlgRef/DlgRef_3Sel4Spin2Check_QTD.h b/src/DlgRef/DlgRef_3Sel4Spin2Check_QTD.h index 5bbc36d54..d96e2ce85 100644 --- a/src/DlgRef/DlgRef_3Sel4Spin2Check_QTD.h +++ b/src/DlgRef/DlgRef_3Sel4Spin2Check_QTD.h @@ -28,6 +28,8 @@ #ifndef DLGREF_3SEL4SPIN2CHECK_QTD_H #define DLGREF_3SEL4SPIN2CHECK_QTD_H +#include "GEOM_DlgRef.hxx" + #include #include class QVBoxLayout; @@ -40,7 +42,7 @@ class QLineEdit; class QPushButton; class QSpinBox; -class DlgRef_3Sel4Spin2Check_QTD : public QWidget +class GEOM_DLGREF_EXPORT DlgRef_3Sel4Spin2Check_QTD : public QWidget { Q_OBJECT diff --git a/src/DlgRef/DlgRef_3Sel_QTD.h b/src/DlgRef/DlgRef_3Sel_QTD.h index f1832c9ee..9963dc04d 100644 --- a/src/DlgRef/DlgRef_3Sel_QTD.h +++ b/src/DlgRef/DlgRef_3Sel_QTD.h @@ -28,6 +28,8 @@ #ifndef DLGREF_3SEL_QTD_H #define DLGREF_3SEL_QTD_H +#include "GEOM_DlgRef.hxx" + #include #include class QVBoxLayout; @@ -38,13 +40,7 @@ class QLabel; class QLineEdit; class QPushButton; -#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 +class GEOM_DLGREF_EXPORT DlgRef_3Sel_QTD : public QWidget { Q_OBJECT diff --git a/src/DlgRef/DlgRef_3Spin.h b/src/DlgRef/DlgRef_3Spin.h index 60c28ce36..eabf34d3e 100644 --- a/src/DlgRef/DlgRef_3Spin.h +++ b/src/DlgRef/DlgRef_3Spin.h @@ -29,19 +29,12 @@ #ifndef DLGREF_3SPIN_H #define DLGREF_3SPIN_H +#include "GEOM_DlgRef.hxx" + #include "DlgRef_3Spin_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_WNT_EXPORT DlgRef_3Spin : public DlgRef_3Spin_QTD + +class GEOM_DLGREF_EXPORT DlgRef_3Spin : public DlgRef_3Spin_QTD { Q_OBJECT diff --git a/src/DlgRef/DlgRef_3Spin1Check.h b/src/DlgRef/DlgRef_3Spin1Check.h index 54beec576..2a256cf04 100644 --- a/src/DlgRef/DlgRef_3Spin1Check.h +++ b/src/DlgRef/DlgRef_3Spin1Check.h @@ -29,15 +29,12 @@ #ifndef DLGREF_3SPIN1CHECK_H #define DLGREF_3SPIN1CHECK_H +#include "GEOM_DlgRef.hxx" + #include "DlgRef_3Spin1Check_QTD.h" #include "DlgRef_SpinBox.h" -#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 +class GEOM_DLGREF_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 a8b5a61dd..fc59ff9cb 100644 --- a/src/DlgRef/DlgRef_3Spin1Check_QTD.h +++ b/src/DlgRef/DlgRef_3Spin1Check_QTD.h @@ -28,6 +28,8 @@ #ifndef DLGREF_3SPIN1CHECK_QTD_H #define DLGREF_3SPIN1CHECK_QTD_H +#include "GEOM_DlgRef.hxx" + #include #include class QVBoxLayout; @@ -38,13 +40,7 @@ class QLabel; class QRadioButton; class QSpinBox; -#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 +class GEOM_DLGREF_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 8d30c4e73..5f5eb1100 100644 --- a/src/DlgRef/DlgRef_3Spin_QTD.h +++ b/src/DlgRef/DlgRef_3Spin_QTD.h @@ -28,6 +28,8 @@ #ifndef DLGREF_3SPIN_QTD_H #define DLGREF_3SPIN_QTD_H +#include "GEOM_DlgRef.hxx" + #include #include class QVBoxLayout; @@ -37,12 +39,7 @@ class QGroupBox; class QLabel; class QSpinBox; -#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 +class GEOM_DLGREF_EXPORT DlgRef_3Spin_QTD : public QWidget { Q_OBJECT diff --git a/src/DlgRef/DlgRef_4Sel1List1Check_QTD.h b/src/DlgRef/DlgRef_4Sel1List1Check_QTD.h index da2a5b98e..2a8091851 100644 --- a/src/DlgRef/DlgRef_4Sel1List1Check_QTD.h +++ b/src/DlgRef/DlgRef_4Sel1List1Check_QTD.h @@ -28,6 +28,8 @@ #ifndef DLGREF_4SEL1LIST1CHECK_QTD_H #define DLGREF_4SEL1LIST1CHECK_QTD_H +#include "GEOM_DlgRef.hxx" + #include #include class QVBoxLayout; @@ -41,13 +43,7 @@ class QPushButton; class QCheckBox; class QPushButton; -#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_4Sel1List1Check_QTD : public QWidget +class GEOM_DLGREF_EXPORT DlgRef_4Sel1List1Check_QTD : public QWidget { Q_OBJECT diff --git a/src/DlgRef/DlgRef_4Sel1List_QTD.h b/src/DlgRef/DlgRef_4Sel1List_QTD.h index 278cbc3bf..6b9978da5 100644 --- a/src/DlgRef/DlgRef_4Sel1List_QTD.h +++ b/src/DlgRef/DlgRef_4Sel1List_QTD.h @@ -28,6 +28,8 @@ #ifndef DLGREF_4SEL1LIST_QTD_H #define DLGREF_4SEL1LIST_QTD_H +#include "GEOM_DlgRef.hxx" + #include #include class QVBoxLayout; @@ -39,7 +41,7 @@ class QLabel; class QLineEdit; class QPushButton; -class DlgRef_4Sel1List_QTD : public QWidget +class GEOM_DLGREF_EXPORT DlgRef_4Sel1List_QTD : public QWidget { Q_OBJECT diff --git a/src/DlgRef/DlgRef_6Sel_QTD.h b/src/DlgRef/DlgRef_6Sel_QTD.h index 52b0db336..d78ffd939 100644 --- a/src/DlgRef/DlgRef_6Sel_QTD.h +++ b/src/DlgRef/DlgRef_6Sel_QTD.h @@ -28,6 +28,8 @@ #ifndef DLGREF_6SEL_QTD_H #define DLGREF_6SEL_QTD_H +#include "GEOM_DlgRef.hxx" + #include #include class QVBoxLayout; @@ -38,13 +40,7 @@ class QLabel; class QLineEdit; class QPushButton; -#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_6Sel_QTD : public QWidget +class GEOM_DLGREF_EXPORT DlgRef_6Sel_QTD : public QWidget { Q_OBJECT diff --git a/src/DlgRef/DlgRef_Skeleton_QTD.h b/src/DlgRef/DlgRef_Skeleton_QTD.h index fb4807f31..ac019c278 100644 --- a/src/DlgRef/DlgRef_Skeleton_QTD.h +++ b/src/DlgRef/DlgRef_Skeleton_QTD.h @@ -28,6 +28,8 @@ #ifndef DLGREF_SKELETON_QTD_H #define DLGREF_SKELETON_QTD_H +#include "GEOM_DlgRef.hxx" + #include #include class QVBoxLayout; @@ -40,13 +42,7 @@ class QLineEdit; class QPushButton; class QRadioButton; -#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_Skeleton_QTD : public QDialog +class GEOM_DLGREF_EXPORT DlgRef_Skeleton_QTD : public QDialog { Q_OBJECT diff --git a/src/DlgRef/DlgRef_SpinBox.h b/src/DlgRef/DlgRef_SpinBox.h index e2c3f96a6..9d9b94fea 100644 --- a/src/DlgRef/DlgRef_SpinBox.h +++ b/src/DlgRef/DlgRef_SpinBox.h @@ -29,22 +29,15 @@ #ifndef GEOMSPINBOX_H #define GEOMSPINBOX_H +#include "GEOM_DlgRef.hxx" + #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_WNT_EXPORT DlgRef_SpinBox : public QtxDblSpinBox +class GEOM_DLGREF_EXPORT DlgRef_SpinBox : public QtxDblSpinBox { Q_OBJECT diff --git a/src/DlgRef/GEOM_DlgRef.hxx b/src/DlgRef/GEOM_DlgRef.hxx new file mode 100755 index 000000000..5bb5449a1 --- /dev/null +++ b/src/DlgRef/GEOM_DlgRef.hxx @@ -0,0 +1,47 @@ +// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// +// +// +// File : GEOM_DlgRef.hxx +// Author : Alexander A. BORODIN +// Module : GEOM + +#ifndef _GEOM_DlgRef_HXX_ +#define _GEOM_DlgRef_HXX_ + +#ifdef WNT + #if defined DLGREF_EXPORTS + #if defined WIN32 + #define GEOM_DLGREF_EXPORT __declspec( dllexport ) + #else + #define GEOM_DLGREF_EXPORT + #endif + #else + #if defined WIN32 + #define GEOM_DLGREF_EXPORT __declspec( dllimport ) + #else + #define GEOM_DLGREF_EXPORT + #endif + #endif +#else + #define GEOM_OBJECT_EXPORT +#endif + +#endif diff --git a/src/DlgRef/Makefile.in b/src/DlgRef/Makefile.in index 9cafbd1cd..4d92b6376 100644 --- a/src/DlgRef/Makefile.in +++ b/src/DlgRef/Makefile.in @@ -139,7 +139,8 @@ LIB_MOC = \ DlgRef_3Sel1Spin.h \ DlgRef_1Sel_Ext.h \ DlgRef_3Check_QTD.h \ - DlgRef_6Sel_QTD.h + DlgRef_6Sel_QTD.h \ + GEOM_DlgRef.hxx # header files EXPORT_HEADERS= $(LIB_MOC) diff --git a/src/EntityGUI/EntityGUI.cxx b/src/EntityGUI/EntityGUI.cxx index 82fa8a094..ce6d0cfc4 100644 --- a/src/EntityGUI/EntityGUI.cxx +++ b/src/EntityGUI/EntityGUI.cxx @@ -669,9 +669,7 @@ bool EntityGUI::OnSubShapeGetSelected(const TopoDS_Shape& ShapeTopo, const char* //===================================================================================== extern "C" { -#ifdef WNT - __declspec( dllexport ) -#endif +GEOM_ENTITYGUI_EXPORT GEOMGUI* GetLibGUI( GeometryGUI* parent ) { return EntityGUI::GetEntityGUI( parent ); diff --git a/src/EntityGUI/EntityGUI.h b/src/EntityGUI/EntityGUI.h index fe2f7d816..8e9640e53 100644 --- a/src/EntityGUI/EntityGUI.h +++ b/src/EntityGUI/EntityGUI.h @@ -29,6 +29,8 @@ #ifndef ENTITYGUI_H #define ENTITYGUI_H +#include "GEOM_EntityGUI.hxx" + #include "GEOMGUI.h" #include "GEOMBase.h" @@ -38,7 +40,7 @@ // class : EntityGUI // purpose : //================================================================================= -class EntityGUI : public GEOMGUI +class GEOM_ENTITYGUI_EXPORT EntityGUI : public GEOMGUI { protected: EntityGUI( GeometryGUI* parent ); // hide constructor to avoid direct creation diff --git a/src/EntityGUI/EntityGUI_1Sel_QTD.h b/src/EntityGUI/EntityGUI_1Sel_QTD.h index 2888d93e4..91732493e 100644 --- a/src/EntityGUI/EntityGUI_1Sel_QTD.h +++ b/src/EntityGUI/EntityGUI_1Sel_QTD.h @@ -28,6 +28,8 @@ #ifndef ENTITYGUI_1SEL_QTD_H #define ENTITYGUI_1SEL_QTD_H +#include "GEOM_EntityGUI.hxx" + #include #include class QVBoxLayout; @@ -38,7 +40,7 @@ class QLabel; class QLineEdit; class QPushButton; -class EntityGUI_1Sel_QTD : public QWidget +class GEOM_ENTITYGUI_EXPORT EntityGUI_1Sel_QTD : public QWidget { Q_OBJECT diff --git a/src/EntityGUI/EntityGUI_1Spin.h b/src/EntityGUI/EntityGUI_1Spin.h index fb5814ca2..681d9c1c9 100644 --- a/src/EntityGUI/EntityGUI_1Spin.h +++ b/src/EntityGUI/EntityGUI_1Spin.h @@ -29,10 +29,12 @@ #ifndef ENTITYGUI_1SPIN_H #define ENTITYGUI_1SPIN_H +#include "GEOM_EntityGUI.hxx" + #include "EntityGUI_1Spin_QTD.h" #include "DlgRef_SpinBox.h" -class EntityGUI_1Spin : public EntityGUI_1Spin_QTD +class GEOM_ENTITYGUI_EXPORT EntityGUI_1Spin : public EntityGUI_1Spin_QTD { Q_OBJECT diff --git a/src/EntityGUI/EntityGUI_1Spin_QTD.h b/src/EntityGUI/EntityGUI_1Spin_QTD.h index 7b26931fb..877f3c348 100644 --- a/src/EntityGUI/EntityGUI_1Spin_QTD.h +++ b/src/EntityGUI/EntityGUI_1Spin_QTD.h @@ -28,6 +28,8 @@ #ifndef ENTITYGUI_1SPIN_QTD_H #define ENTITYGUI_1SPIN_QTD_H +#include "GEOM_EntityGUI.hxx" + #include #include class QVBoxLayout; @@ -38,7 +40,7 @@ class QLabel; class QPushButton; class QSpinBox; -class EntityGUI_1Spin_QTD : public QWidget +class GEOM_ENTITYGUI_EXPORT EntityGUI_1Spin_QTD : public QWidget { Q_OBJECT diff --git a/src/EntityGUI/EntityGUI_2Spin.h b/src/EntityGUI/EntityGUI_2Spin.h index 4d0dd21a3..77183ecef 100644 --- a/src/EntityGUI/EntityGUI_2Spin.h +++ b/src/EntityGUI/EntityGUI_2Spin.h @@ -29,10 +29,12 @@ #ifndef ENTITYGUI_2SPIN_H #define ENTITYGUI_2SPIN_H +#include "GEOM_EntityGUI.hxx" + #include "EntityGUI_2Spin_QTD.h" #include "DlgRef_SpinBox.h" -class EntityGUI_2Spin : public EntityGUI_2Spin_QTD +class GEOM_ENTITYGUI_EXPORT EntityGUI_2Spin : public EntityGUI_2Spin_QTD { Q_OBJECT diff --git a/src/EntityGUI/EntityGUI_2Spin_QTD.h b/src/EntityGUI/EntityGUI_2Spin_QTD.h index bdd3c0737..9b107cea6 100644 --- a/src/EntityGUI/EntityGUI_2Spin_QTD.h +++ b/src/EntityGUI/EntityGUI_2Spin_QTD.h @@ -28,6 +28,8 @@ #ifndef ENTITYGUI_2SPIN_QTD_H #define ENTITYGUI_2SPIN_QTD_H +#include "GEOM_EntityGUI.hxx" + #include #include class QVBoxLayout; @@ -38,7 +40,7 @@ class QLabel; class QPushButton; class QSpinBox; -class EntityGUI_2Spin_QTD : public QWidget +class GEOM_ENTITYGUI_EXPORT EntityGUI_2Spin_QTD : public QWidget { Q_OBJECT diff --git a/src/EntityGUI/EntityGUI_3Spin.h b/src/EntityGUI/EntityGUI_3Spin.h index 58b732d31..b829c46e4 100644 --- a/src/EntityGUI/EntityGUI_3Spin.h +++ b/src/EntityGUI/EntityGUI_3Spin.h @@ -29,10 +29,12 @@ #ifndef ENTITYGUI_3SPIN_H #define ENTITYGUI_3SPIN_H +#include "GEOM_EntityGUI.hxx" + #include "EntityGUI_3Spin_QTD.h" #include "DlgRef_SpinBox.h" -class EntityGUI_3Spin : public EntityGUI_3Spin_QTD +class GEOM_ENTITYGUI_EXPORT EntityGUI_3Spin : public EntityGUI_3Spin_QTD { Q_OBJECT diff --git a/src/EntityGUI/EntityGUI_3Spin_QTD.h b/src/EntityGUI/EntityGUI_3Spin_QTD.h index 8ddcb62b1..4d9669d17 100644 --- a/src/EntityGUI/EntityGUI_3Spin_QTD.h +++ b/src/EntityGUI/EntityGUI_3Spin_QTD.h @@ -28,6 +28,8 @@ #ifndef ENTITYGUI_3SPIN_QTD_H #define ENTITYGUI_3SPIN_QTD_H +#include "GEOM_EntityGUI.hxx" + #include #include class QVBoxLayout; @@ -38,7 +40,7 @@ class QLabel; class QPushButton; class QSpinBox; -class EntityGUI_3Spin_QTD : public QWidget +class GEOM_ENTITYGUI_EXPORT EntityGUI_3Spin_QTD : public QWidget { Q_OBJECT diff --git a/src/EntityGUI/EntityGUI_4Spin.h b/src/EntityGUI/EntityGUI_4Spin.h index 9a97fff1e..fda15b423 100644 --- a/src/EntityGUI/EntityGUI_4Spin.h +++ b/src/EntityGUI/EntityGUI_4Spin.h @@ -29,10 +29,12 @@ #ifndef ENTITYGUI_4SPIN_H #define ENTITYGUI_4SPIN_H +#include "GEOM_EntityGUI.hxx" + #include "EntityGUI_4Spin_QTD.h" #include "DlgRef_SpinBox.h" -class EntityGUI_4Spin : public EntityGUI_4Spin_QTD +class GEOM_ENTITYGUI_EXPORT EntityGUI_4Spin : public EntityGUI_4Spin_QTD { Q_OBJECT diff --git a/src/EntityGUI/EntityGUI_4Spin_QTD.h b/src/EntityGUI/EntityGUI_4Spin_QTD.h index 2ac171b9b..a7ee98ba3 100644 --- a/src/EntityGUI/EntityGUI_4Spin_QTD.h +++ b/src/EntityGUI/EntityGUI_4Spin_QTD.h @@ -28,6 +28,8 @@ #ifndef ENTITYGUI_4SPIN_QTD_H #define ENTITYGUI_4SPIN_QTD_H +#include "GEOM_EntityGUI.hxx" + #include #include class QVBoxLayout; @@ -38,7 +40,7 @@ class QLabel; class QPushButton; class QSpinBox; -class EntityGUI_4Spin_QTD : public QWidget +class GEOM_ENTITYGUI_EXPORT EntityGUI_4Spin_QTD : public QWidget { Q_OBJECT diff --git a/src/EntityGUI/EntityGUI_Dir1_QTD.h b/src/EntityGUI/EntityGUI_Dir1_QTD.h index 8652c68e0..1b9d36e7e 100644 --- a/src/EntityGUI/EntityGUI_Dir1_QTD.h +++ b/src/EntityGUI/EntityGUI_Dir1_QTD.h @@ -28,6 +28,8 @@ #ifndef ENTITYGUI_DIR1_QTD_H #define ENTITYGUI_DIR1_QTD_H +#include "GEOM_EntityGUI.hxx" + #include #include class QVBoxLayout; @@ -36,7 +38,7 @@ class QGridLayout; class QButtonGroup; class QRadioButton; -class EntityGUI_Dir1_QTD : public QWidget +class GEOM_ENTITYGUI_EXPORT EntityGUI_Dir1_QTD : public QWidget { Q_OBJECT diff --git a/src/EntityGUI/EntityGUI_Dir2_QTD.h b/src/EntityGUI/EntityGUI_Dir2_QTD.h index 55dae2004..3a98f26a7 100644 --- a/src/EntityGUI/EntityGUI_Dir2_QTD.h +++ b/src/EntityGUI/EntityGUI_Dir2_QTD.h @@ -28,6 +28,8 @@ #ifndef ENTITYGUI_DIR2_QTD_H #define ENTITYGUI_DIR2_QTD_H +#include "GEOM_EntityGUI.hxx" + #include #include class QVBoxLayout; @@ -36,7 +38,7 @@ class QGridLayout; class QButtonGroup; class QRadioButton; -class EntityGUI_Dir2_QTD : public QWidget +class GEOM_ENTITYGUI_EXPORT EntityGUI_Dir2_QTD : public QWidget { Q_OBJECT diff --git a/src/EntityGUI/EntityGUI_Point_QTD.h b/src/EntityGUI/EntityGUI_Point_QTD.h index 14e7b37d6..eafa3d044 100644 --- a/src/EntityGUI/EntityGUI_Point_QTD.h +++ b/src/EntityGUI/EntityGUI_Point_QTD.h @@ -28,6 +28,8 @@ #ifndef ENTITYGUI_POINT_QTD_H #define ENTITYGUI_POINT_QTD_H +#include "GEOM_EntityGUI.hxx" + #include #include class QVBoxLayout; @@ -36,7 +38,7 @@ class QGridLayout; class QButtonGroup; class QRadioButton; -class EntityGUI_Point_QTD : public QWidget +class GEOM_ENTITYGUI_EXPORT EntityGUI_Point_QTD : public QWidget { Q_OBJECT diff --git a/src/EntityGUI/EntityGUI_Skeleton_QTD.h b/src/EntityGUI/EntityGUI_Skeleton_QTD.h index df965cddc..52a3865f4 100644 --- a/src/EntityGUI/EntityGUI_Skeleton_QTD.h +++ b/src/EntityGUI/EntityGUI_Skeleton_QTD.h @@ -28,6 +28,8 @@ #ifndef ENTITYGUI_SKELETON_QTD_H #define ENTITYGUI_SKELETON_QTD_H +#include "GEOM_EntityGUI.hxx" + #include #include class QVBoxLayout; @@ -38,7 +40,7 @@ class QGroupBox; class QPushButton; class QRadioButton; -class EntityGUI_Skeleton_QTD : public QDialog +class GEOM_ENTITYGUI_EXPORT EntityGUI_Skeleton_QTD : public QDialog { Q_OBJECT diff --git a/src/EntityGUI/EntityGUI_SketcherDlg.h b/src/EntityGUI/EntityGUI_SketcherDlg.h index 2546a5fe2..4a5c04b3a 100644 --- a/src/EntityGUI/EntityGUI_SketcherDlg.h +++ b/src/EntityGUI/EntityGUI_SketcherDlg.h @@ -29,6 +29,8 @@ #ifndef ENTITYGUI_SKETCHERDLG_H #define ENTITYGUI_SKETCHERDLG_H +#include "GEOM_EntityGUI.hxx" + #include "GEOMBase_Helper.h" #include "EntityGUI_Skeleton_QTD.h" @@ -58,7 +60,7 @@ // class : EntityGUI_Dlg // purpose : //================================================================================= -class EntityGUI_SketcherDlg : public EntityGUI_Skeleton_QTD, public GEOMBase_Helper +class GEOM_ENTITYGUI_EXPORT EntityGUI_SketcherDlg : public EntityGUI_Skeleton_QTD, public GEOMBase_Helper { Q_OBJECT diff --git a/src/EntityGUI/EntityGUI_SubShapeDlg.h b/src/EntityGUI/EntityGUI_SubShapeDlg.h index 59fa1e016..b04ebbaa2 100644 --- a/src/EntityGUI/EntityGUI_SubShapeDlg.h +++ b/src/EntityGUI/EntityGUI_SubShapeDlg.h @@ -29,6 +29,8 @@ #ifndef DIALOGBOX_SUBSHAPE_H #define DIALOGBOX_SUBSHAPE_H +#include "GEOM_EntityGUI.hxx" + #include "GEOMBase_Skeleton.h" #include "DlgRef_1Sel1Check1List_QTD.h" @@ -37,7 +39,7 @@ // class : EntityGUI_SubShapeDlg // purpose : //================================================================================= -class EntityGUI_SubShapeDlg : public GEOMBase_Skeleton +class GEOM_ENTITYGUI_EXPORT EntityGUI_SubShapeDlg : public GEOMBase_Skeleton { Q_OBJECT diff --git a/src/EntityGUI/GEOM_EntityGUI.hxx b/src/EntityGUI/GEOM_EntityGUI.hxx new file mode 100755 index 000000000..2a42f3423 --- /dev/null +++ b/src/EntityGUI/GEOM_EntityGUI.hxx @@ -0,0 +1,47 @@ +// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// +// +// +// File : GEOM_EntityGUI.hxx +// Author : Alexander A. BORODIN +// Module : GEOM + +#ifndef _GEOM_EntityGUI_HXX_ +#define _GEOM_EntityGUI_HXX_ + +#ifdef WNT + #if defined ENTITYGUI_EXPORTS + #if defined WIN32 + #define GEOM_ENTITYGUI_EXPORT __declspec( dllexport ) + #else + #define GEOM_ENTITYGUI_EXPORT + #endif + #else + #if defined WIN32 + #define GEOM_ENTITYGUI_EXPORT __declspec( dllimport ) + #else + #define GEOM_ENTITYGUI_EXPORT + #endif + #endif +#else + #define GEOM_ENTITYGUI_EXPORT +#endif + +#endif diff --git a/src/EntityGUI/Makefile.in b/src/EntityGUI/Makefile.in index 720b6f7e9..afe156786 100644 --- a/src/EntityGUI/Makefile.in +++ b/src/EntityGUI/Makefile.in @@ -38,7 +38,7 @@ VPATH=.:@srcdir@:@top_srcdir@/idl LIB = libEntityGUI.la # header files -EXPORT_HEADERS= +EXPORT_HEADERS= GEOM_EntityGUI.hxx LIB_SRC = EntityGUI.cxx \ EntityGUI_Skeleton_QTD.cxx \ diff --git a/src/GEOMAlgo/GEOMAlgo_FinderShapeOnQuad.hxx b/src/GEOMAlgo/GEOMAlgo_FinderShapeOnQuad.hxx index 6f00989de..d3fbbe30b 100644 --- a/src/GEOMAlgo/GEOMAlgo_FinderShapeOnQuad.hxx +++ b/src/GEOMAlgo/GEOMAlgo_FinderShapeOnQuad.hxx @@ -37,6 +37,7 @@ class GEOMAlgo_FinderShapeOnQuad: public GEOMAlgo_FinderShapeOn1 { public: + Standard_EXPORT GEOMAlgo_FinderShapeOnQuad(const gp_Pnt & theTopLeftPoint, const gp_Pnt & theTopRigthPoint, const gp_Pnt & theBottomLeftPoint, diff --git a/src/GEOMBase/GEOMBase.h b/src/GEOMBase/GEOMBase.h index c118ac737..36b52c508 100644 --- a/src/GEOMBase/GEOMBase.h +++ b/src/GEOMBase/GEOMBase.h @@ -29,6 +29,8 @@ #ifndef GEOMBASE_H #define GEOMBASE_H +#include "GEOM_GEOMBase.hxx" + // SALOME Includes #include "GEOM_AISShape.hxx" @@ -40,17 +42,6 @@ // QT Includes #include -//#if defined WNT -//#include -//#else -//#define SALOME_WNT_EXPORT -//#endif - -#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS -#define GEOMBASE_WNT_EXPORT __declspec( dllexport ) -#else -#define GEOMBASE_WNT_EXPORT -#endif class GEOM_Actor; class SALOME_ListIO; @@ -62,7 +53,7 @@ class QWidget; // class : GEOMBase // purpose : //================================================================================= -class GEOMBASE_WNT_EXPORT GEOMBase +class GEOMBASE_EXPORT GEOMBase { public : GEOMBase(); diff --git a/src/GEOMBase/GEOMBase_Helper.h b/src/GEOMBase/GEOMBase_Helper.h index 1cf601cb4..a5d21facb 100755 --- a/src/GEOMBase/GEOMBase_Helper.h +++ b/src/GEOMBase/GEOMBase_Helper.h @@ -29,6 +29,8 @@ #ifndef GEOMBASE_HELPER_H #define GEOMBASE_HELPER_H +#include "GEOM_GEOMBase.hxx" + #include "GEOM_Displayer.h" #include "SALOME_Prs.h" #include "SALOME_ListIO.hxx" @@ -38,16 +40,7 @@ #include #include -//#if defined WNT -//#include -//#else -//#define SALOME_WNT_EXPORT -//#endif -#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS -#define GEOMBASE_WNT_EXPORT __declspec( dllexport ) -#else -#define GEOMBASE_WNT_EXPORT -#endif + typedef std::list ObjectList; class SalomeApp_Study; @@ -64,7 +57,7 @@ class TColStd_MapOfInteger; // performing common operations (display/erase, selection activation, // publication in a study, transaction management) //================================================================ -class GEOMBASE_WNT_EXPORT GEOMBase_Helper +class GEOMBASE_EXPORT GEOMBase_Helper { public: GEOMBase_Helper( SUIT_Desktop* ); diff --git a/src/GEOMBase/GEOMBase_Skeleton.h b/src/GEOMBase/GEOMBase_Skeleton.h index 1d3144cc3..31674a723 100644 --- a/src/GEOMBase/GEOMBase_Skeleton.h +++ b/src/GEOMBase/GEOMBase_Skeleton.h @@ -29,6 +29,8 @@ #ifndef GEOMBASE_SKELETON_H #define GEOMBASE_SKELETON_H +#include "GEOM_GEOMBase.hxx" + #include "DlgRef_Skeleton_QTD.h" #include "GEOMBase.h" @@ -42,18 +44,8 @@ #include #include #include -//#if defined WNT -//#include -//#else -//#define SALOME_WNT_EXPORT -//#endif -#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS -#define GEOMBASE_WNT_EXPORT __declspec( dllexport ) -#else -#define GEOMBASE_WNT_EXPORT -#endif -class GEOMBASE_WNT_EXPORT GEOMBase_Skeleton : public DlgRef_Skeleton_QTD, public GEOMBase_Helper +class GEOMBASE_EXPORT GEOMBase_Skeleton : public DlgRef_Skeleton_QTD, public GEOMBase_Helper { Q_OBJECT diff --git a/src/GEOMBase/GEOMBase_aParameterDlg.h b/src/GEOMBase/GEOMBase_aParameterDlg.h index 1e5c529b5..9da286375 100644 --- a/src/GEOMBase/GEOMBase_aParameterDlg.h +++ b/src/GEOMBase/GEOMBase_aParameterDlg.h @@ -29,6 +29,8 @@ #ifndef GEOMBase_aParameterDLG_H #define GEOMBase_aParameterDLG_H +#include "GEOM_GEOMBase.hxx" + #include class QPushButton; @@ -38,7 +40,7 @@ class QtxDblSpinBox; // class : GEOMBase_aParameterDlg // purpose : //================================================================================= -class GEOMBase_aParameterDlg : public QDialog +class GEOMBASE_EXPORT GEOMBase_aParameterDlg : public QDialog { Q_OBJECT diff --git a/src/GEOMBase/GEOM_GEOMBase.hxx b/src/GEOMBase/GEOM_GEOMBase.hxx new file mode 100755 index 000000000..99b371671 --- /dev/null +++ b/src/GEOMBase/GEOM_GEOMBase.hxx @@ -0,0 +1,47 @@ +// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// +// +// +// File : GEOM_GEOMBase.hxx +// Author : Alexander A. BORODIN +// Module : GEOM + +#ifndef _GEOM_GEOMBase_HXX_ +#define _GEOM_GEOMBase_HXX_ + +#ifdef WNT + #if defined GEOMBASE_EXPORTS + #if defined WIN32 + #define GEOMBASE_EXPORT __declspec( dllexport ) + #else + #define GEOMBASE_EXPORT + #endif + #else + #if defined WIN32 + #define GEOMBASE_EXPORT __declspec( dllimport ) + #else + #define GEOMBASE_EXPORT + #endif + #endif +#else + #define GEOMBASE_EXPORT +#endif + +#endif diff --git a/src/GEOMBase/GEOM_Operation.h b/src/GEOMBase/GEOM_Operation.h index 426de887d..b4b753bcc 100644 --- a/src/GEOMBase/GEOM_Operation.h +++ b/src/GEOMBase/GEOM_Operation.h @@ -29,13 +29,14 @@ #ifndef GEOM_OPERATION_H #define GEOM_OPERATION_H +#include "GEOM_GEOMBase.hxx" + #include "SUIT_Operation.h" #include -#include #include CORBA_CLIENT_HEADER(GEOM_Gen) -class Standard_EXPORT GEOM_Operation : public SUIT_Operation +class GEOMBASE_EXPORT GEOM_Operation : public SUIT_Operation { public: GEOM_Operation( SUIT_Application*, GEOM::GEOM_IOperations_ptr ); diff --git a/src/GEOMClient/GEOM_Client.hxx b/src/GEOMClient/GEOM_Client.hxx index fd6087b93..41a3a20fa 100644 --- a/src/GEOMClient/GEOM_Client.hxx +++ b/src/GEOMClient/GEOM_Client.hxx @@ -51,16 +51,29 @@ class TopoDS_Shape; #ifndef _Standard_Macro_HeaderFile #include #endif -#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS -#define GEOMCLIENT_WNT_EXPORT __declspec( dllexport ) + +#ifdef WNT + #if defined GEOMCLIENT_EXPORTS + #if defined WIN32 + #define GEOMCLIENT_EXPORT __declspec( dllexport ) + #else + #define GEOMCLIENT_EXPORT + #endif + #else + #if defined WIN32 + #define GEOMCLIENT_EXPORT __declspec( dllimport ) + #else + #define GEOMCLIENT_EXPORT + #endif + #endif #else -#define GEOMCLIENT_WNT_EXPORT + #define GEOMCLIENT_EXPORT #endif //===================================================================== // GEOM_Client : class definition //===================================================================== -class GEOMCLIENT_WNT_EXPORT GEOM_Client { +class GEOMCLIENT_EXPORT GEOM_Client { public: diff --git a/src/GEOMContext/GEOMContext.h b/src/GEOMContext/GEOMContext.h index e83a93288..cff8b74e7 100644 --- a/src/GEOMContext/GEOMContext.h +++ b/src/GEOMContext/GEOMContext.h @@ -34,11 +34,29 @@ #include #include +#ifdef WNT + #if defined GEOMCONTEXT_EXPORTS + #if defined WIN32 + #define GEOM_CONTEXT_EXPORT __declspec( dllexport ) + #else + #define GEOM_CONTEXT_EXPORT + #endif + #else + #if defined WIN32 + #define GEOM_CONTEXT_EXPORT __declspec( dllimport ) + #else + #define GEOM_CONTEXT_EXPORT + #endif + #endif +#else + #define GEOM_CONTEXT_EXPORT +#endif + //================================================================================= // class : GEOMContext // purpose : //================================================================================= -class GEOMContext : public QObject +class GEOM_CONTEXT_EXPORT GEOMContext : public QObject { Q_OBJECT /* for QT compatibility */ diff --git a/src/GEOMGUI/GEOMGUI.h b/src/GEOMGUI/GEOMGUI.h index 69a9bb663..3ec371fb9 100644 --- a/src/GEOMGUI/GEOMGUI.h +++ b/src/GEOMGUI/GEOMGUI.h @@ -29,6 +29,8 @@ #if !defined( __GEOMGUI_H ) #define __GEOMGUI_H +#include "GEOM_GEOMGUI.hxx" + #include class SUIT_Desktop; @@ -37,21 +39,11 @@ class QMouseEvent; class QKeyEvent; class GeometryGUI; -//#ifdef WNT -//#include -//#else -//#define SALOME_WNT_EXPORT -//#endif -#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS -#define GEOMGUI_WNT_EXPORT __declspec( dllexport ) -#else -#define GEOMGUI_WNT_EXPORT -#endif //================================================================================= // class : GEOMGUI // purpose : Base class for all geometry GUI subclasses //================================================================================= -class GEOMGUI_WNT_EXPORT GEOMGUI : public QObject +class GEOMGUI_EXPORT GEOMGUI : public QObject { public : // Constructor diff --git a/src/GEOMGUI/GEOMGUI_OCCSelector.h b/src/GEOMGUI/GEOMGUI_OCCSelector.h index e891c60ad..4b4a9b54a 100644 --- a/src/GEOMGUI/GEOMGUI_OCCSelector.h +++ b/src/GEOMGUI/GEOMGUI_OCCSelector.h @@ -20,9 +20,11 @@ #ifndef GEOMGUI_OCCSELECTOR_H #define GEOMGUI_OCCSELECTOR_H +#include "GEOM_GEOMGUI.hxx" + #include -class GEOMGUI_OCCSelector : public LightApp_OCCSelector +class GEOMGUI_EXPORT GEOMGUI_OCCSelector : public LightApp_OCCSelector { public: GEOMGUI_OCCSelector( OCCViewer_Viewer*, SUIT_SelectionMgr* ); diff --git a/src/GEOMGUI/GEOMGUI_Selection.h b/src/GEOMGUI/GEOMGUI_Selection.h index fe7a6bc9a..c5ce368d7 100644 --- a/src/GEOMGUI/GEOMGUI_Selection.h +++ b/src/GEOMGUI/GEOMGUI_Selection.h @@ -29,12 +29,14 @@ #ifndef GEOMGUI_SELECTION_HeaderFile #define GEOMGUI_SELECTION_HeaderFile +#include "GEOM_GEOMGUI.hxx" + #include #include #include CORBA_SERVER_HEADER(GEOM_Gen) -class GEOMGUI_Selection : public LightApp_Selection +class GEOMGUI_EXPORT GEOMGUI_Selection : public LightApp_Selection { public: GEOMGUI_Selection(); diff --git a/src/GEOMGUI/GEOM_Displayer.h b/src/GEOMGUI/GEOM_Displayer.h index d1af6d1f0..bb16ba3a0 100644 --- a/src/GEOMGUI/GEOM_Displayer.h +++ b/src/GEOMGUI/GEOM_Displayer.h @@ -29,6 +29,8 @@ #if !defined (__GEOM_DISPLAYER_H) #define __GEOM_DISPLAYER_H +#include "GEOM_GEOMGUI.hxx" + #include "SALOME_Prs.h" #include "SALOME_InteractiveObject.hxx" #include "SALOME_ListIO.hxx" @@ -55,18 +57,7 @@ class SalomeApp_Application; class SUIT_SelectionFilter; //class SALOME_Selection; -//#ifdef WNT -//#include -//#else -//#define SALOME_WNT_EXPORT -//#endif -#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS -#define GEOMGUI_WNT_EXPORT __declspec( dllexport ) -#else -#define GEOMGUI_WNT_EXPORT -#endif - -class GEOMGUI_WNT_EXPORT GEOM_Displayer : public LightApp_Displayer +class GEOMGUI_EXPORT GEOM_Displayer : public LightApp_Displayer { public: diff --git a/src/GEOMGUI/GEOM_GEOMGUI.hxx b/src/GEOMGUI/GEOM_GEOMGUI.hxx new file mode 100755 index 000000000..9508b0d19 --- /dev/null +++ b/src/GEOMGUI/GEOM_GEOMGUI.hxx @@ -0,0 +1,47 @@ +// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// +// +// +// File : GEOM_GEOMGUI.hxx +// Author : Alexander A. BORODIN +// Module : GEOM + +#ifndef _GEOM_GEOMGUI_HXX_ +#define _GEOM_GEOMGUI_HXX_ + +#ifdef WNT + #if defined GEOMGUI_EXPORTS + #if defined WIN32 + #define GEOMGUI_EXPORT __declspec( dllexport ) + #else + #define GEOMGUI_EXPORT + #endif + #else + #if defined WIN32 + #define GEOMGUI_EXPORT __declspec( dllimport ) + #else + #define GEOMGUI_EXPORT + #endif + #endif +#else + #define GEOMGUI_EXPORT +#endif + +#endif diff --git a/src/GEOMGUI/GeometryGUI.h b/src/GEOMGUI/GeometryGUI.h index 57f0d6542..6efd5c234 100644 --- a/src/GEOMGUI/GeometryGUI.h +++ b/src/GEOMGUI/GeometryGUI.h @@ -29,6 +29,8 @@ #ifndef GEOMETRYGUI_H #define GEOMETRYGUI_H +#include "GEOM_GEOMGUI.hxx" + #include "SalomeApp_Module.h" #include "GEOMGUI.h" @@ -47,24 +49,6 @@ #include "SALOMEconfig.h" #include CORBA_CLIENT_HEADER(SALOMEDS) -#ifdef WNT -#include -#else -#define SALOME_WNT_EXPORT -#endif - -//#if defined WNT -//#include -//#else -//#define SALOME_WNT_EXPORT -//#endif - -#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS -#define GEOMGUI_WNT_EXPORT __declspec( dllexport ) -#else -#define GEOMGUI_WNT_EXPORT -#endif - typedef QMap GUIMap; class QDialog; @@ -78,7 +62,7 @@ class SUIT_ViewManager; // class : GeometryGUI // purpose : //================================================================================= -class GEOMGUI_WNT_EXPORT GeometryGUI : public SalomeApp_Module +class GEOMGUI_EXPORT GeometryGUI : public SalomeApp_Module { Q_OBJECT; diff --git a/src/GEOMGUI/GeometryGUI_Swig.hxx b/src/GEOMGUI/GeometryGUI_Swig.hxx index 02489d402..67e0b9e68 100644 --- a/src/GEOMGUI/GeometryGUI_Swig.hxx +++ b/src/GEOMGUI/GeometryGUI_Swig.hxx @@ -29,21 +29,17 @@ #ifndef _GeometryGUI_SWIG_HXX_ #define _GeometryGUI_SWIG_HXX_ +#include "GEOM_GEOMGUI.hxx" + // IDL Headers #include #include CORBA_SERVER_HEADER(GEOM_Gen) #include CORBA_SERVER_HEADER(SALOMEDS) #include CORBA_SERVER_HEADER(SALOMEDS_Attributes) -#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS -#define GEOMGUI_WNT_EXPORT __declspec( dllexport ) -#else -#define GEOMGUI_WNT_EXPORT -#endif - class GEOM_Client; -class GEOMGUI_WNT_EXPORT GEOM_Swig +class GEOMGUI_EXPORT GEOM_Swig { public: GEOM_Swig(); diff --git a/src/GEOMImpl/GEOMImpl_Gen.hxx b/src/GEOMImpl/GEOMImpl_Gen.hxx index 5a303d8b3..0a7cd3673 100644 --- a/src/GEOMImpl/GEOMImpl_Gen.hxx +++ b/src/GEOMImpl/GEOMImpl_Gen.hxx @@ -21,6 +21,8 @@ #ifndef _GEOMImpl_GEN_HXX_ #define _GEOMImpl_GEN_HXX_ +#include + #include #include "GEOMImpl_IBasicOperations.hxx" @@ -37,13 +39,7 @@ #include "GEOMImpl_IGroupOperations.hxx" #include "GEOM_Engine.hxx" -#ifdef WNT -#include -#else -#define SALOME_WNT_EXPORT -#endif - -class SALOME_WNT_EXPORT GEOMImpl_Gen : public GEOM_Engine +class GEOMIMPL_EXPORT GEOMImpl_Gen : public GEOM_Engine { public: GEOMImpl_Gen(); diff --git a/src/GEOMImpl/GEOM_GEOMImpl.hxx b/src/GEOMImpl/GEOM_GEOMImpl.hxx new file mode 100755 index 000000000..a8f4a439f --- /dev/null +++ b/src/GEOMImpl/GEOM_GEOMImpl.hxx @@ -0,0 +1,47 @@ +// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// +// +// +// File : GEOM_GEOMImpl.hxx +// Author : Alexander A. BORODIN +// Module : GEOM + +#ifndef _GEOM_GEOMImpl_HXX_ +#define _GEOM_GEOMImpl_HXX_ + +#ifdef WNT + #if defined GEOMIMPL_EXPORTS + #if defined WIN32 + #define GEOMIMPL_EXPORT __declspec( dllexport ) + #else + #define GEOMIMPL_EXPORT + #endif + #else + #if defined WIN32 + #define GEOMIMPL_EXPORT __declspec( dllimport ) + #else + #define GEOMIMPL_EXPORT + #endif + #endif +#else + #define GEOMIMPL_EXPORT +#endif + +#endif diff --git a/src/GEOMToolsGUI/GEOMToolsGUI.cxx b/src/GEOMToolsGUI/GEOMToolsGUI.cxx index 03d857168..6fbf935f8 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI.cxx +++ b/src/GEOMToolsGUI/GEOMToolsGUI.cxx @@ -643,9 +643,7 @@ QString GEOMToolsGUI::getParentComponent( _PTR( SObject ) obj ) //===================================================================================== extern "C" { -#ifdef WNT - __declspec( dllexport ) -#endif +GEOMTOOLSGUI_EXPORT GEOMGUI* GetLibGUI( GeometryGUI* parent ) { return new GEOMToolsGUI( parent ); diff --git a/src/GEOMToolsGUI/GEOMToolsGUI.h b/src/GEOMToolsGUI/GEOMToolsGUI.h index 0ac29240b..dd4cc3935 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI.h +++ b/src/GEOMToolsGUI/GEOMToolsGUI.h @@ -29,22 +29,20 @@ #ifndef GEOMTOOLSGUI_H #define GEOMTOOLSGUI_H +#include "GEOM_ToolsGUI.hxx" + #include "GEOMGUI.h" #include #include #include -#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS -#define GEOMTOOLSGUI_WNT_EXPORT __declspec( dllexport ) -#else -#define GEOMTOOLSGUI_WNT_EXPORT -#endif + //================================================================================= // class : GEOMToolsGUI // purpose : //================================================================================= -class GEOMTOOLSGUI_WNT_EXPORT GEOMToolsGUI : public GEOMGUI +class GEOMTOOLSGUI_EXPORT GEOMToolsGUI : public GEOMGUI { public : GEOMToolsGUI( GeometryGUI* ); // hide constructor to avoid direct creation diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_NameDlg.h b/src/GEOMToolsGUI/GEOMToolsGUI_NameDlg.h index e9071d6f4..050806d8a 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI_NameDlg.h +++ b/src/GEOMToolsGUI/GEOMToolsGUI_NameDlg.h @@ -12,6 +12,8 @@ #ifndef GEOMToolsGUI_NAMEDLG_H #define GEOMToolsGUI_NAMEDLG_H +#include "GEOM_ToolsGUI.hxx" + #include class QLineEdit; @@ -21,7 +23,7 @@ class QPushButton; // class : GEOMToolsGUI_NameDlg // purpose : Common dialog box class //================================================================================= -class GEOMToolsGUI_NameDlg : public QDialog +class GEOMTOOLSGUI_EXPORT GEOMToolsGUI_NameDlg : public QDialog { Q_OBJECT diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_NbIsosDlg.h b/src/GEOMToolsGUI/GEOMToolsGUI_NbIsosDlg.h index 943dbdcde..a558708e8 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI_NbIsosDlg.h +++ b/src/GEOMToolsGUI/GEOMToolsGUI_NbIsosDlg.h @@ -29,6 +29,8 @@ #ifndef GEOMTOOLSGUI_NBISOSDLG_H #define GEOMTOOLSGUI_NBISOSDLG_H +#include "GEOM_ToolsGUI.hxx" + #include class QSpinBox; @@ -37,7 +39,7 @@ class QSpinBox; // class : GEOMToolsGUI_NbIsosDlg // purpose : //================================================================================= -class GEOMToolsGUI_NbIsosDlg : public QDialog +class GEOMTOOLSGUI_EXPORT GEOMToolsGUI_NbIsosDlg : public QDialog { Q_OBJECT diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.h b/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.h index a63b514b6..482df760e 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.h +++ b/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.h @@ -29,12 +29,10 @@ #ifndef DIALOGBOX_TRANSPARENCYDLG_H #define DIALOGBOX_TRANSPARENCYDLG_H +#include "GEOM_ToolsGUI.hxx" + #include -#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS -#define GEOMTOOLSGUI_WNT_EXPORT __declspec( dllexport ) -#else -#define GEOMTOOLSGUI_WNT_EXPORT -#endif + class QSlider; //================================================================================= @@ -42,7 +40,7 @@ class QSlider; // purpose : // : WARNING : that is a MODAL dialog. //================================================================================= -class GEOMTOOLSGUI_WNT_EXPORT GEOMToolsGUI_TransparencyDlg : public QDialog +class GEOMTOOLSGUI_EXPORT GEOMToolsGUI_TransparencyDlg : public QDialog { Q_OBJECT diff --git a/src/GEOMToolsGUI/GEOM_ToolsGUI.hxx b/src/GEOMToolsGUI/GEOM_ToolsGUI.hxx new file mode 100755 index 000000000..db2c0ed56 --- /dev/null +++ b/src/GEOMToolsGUI/GEOM_ToolsGUI.hxx @@ -0,0 +1,47 @@ +// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// +// +// +// File : GEOM_ToolsGUI.hxx +// Author : Alexander A. BORODIN +// Module : GEOM + +#ifndef _GEOM_ToolsGUI_HXX_ +#define _GEOM_ToolsGUI_HXX_ + +#ifdef WNT + #if defined GEOMTOOLSGUI_EXPORTS + #if defined WIN32 + #define GEOMTOOLSGUI_EXPORT __declspec( dllexport ) + #else + #define GEOMTOOLSGUI_EXPORT + #endif + #else + #if defined WIN32 + #define GEOMTOOLSGUI_EXPORT __declspec( dllimport ) + #else + #define GEOMTOOLSGUI_EXPORT + #endif + #endif +#else + #define GEOMTOOLSGUI_EXPORT +#endif + +#endif diff --git a/src/GenerationGUI/GenerationGUI.cxx b/src/GenerationGUI/GenerationGUI.cxx index 4d52198f5..9d757a6c9 100644 --- a/src/GenerationGUI/GenerationGUI.cxx +++ b/src/GenerationGUI/GenerationGUI.cxx @@ -102,9 +102,7 @@ bool GenerationGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent ) //===================================================================================== extern "C" { -#ifdef WNT - __declspec( dllexport ) -#endif +GENERATIONGUI_EXPORT GEOMGUI* GetLibGUI(GeometryGUI* parent) { return GenerationGUI::GetGenerationGUI(parent); diff --git a/src/GenerationGUI/GenerationGUI.h b/src/GenerationGUI/GenerationGUI.h index eb5562848..99dc49a26 100644 --- a/src/GenerationGUI/GenerationGUI.h +++ b/src/GenerationGUI/GenerationGUI.h @@ -29,13 +29,31 @@ #ifndef GENERATIONGUI_H #define GENERATIONGUI_H +#ifdef WNT + #if defined GENERATIONGUI_EXPORTS + #if defined WIN32 + #define GENERATIONGUI_EXPORT __declspec( dllexport ) + #else + #define GENERATIONGUI_EXPORT + #endif + #else + #if defined WIN32 + #define GENERATIONGUI_EXPORT __declspec( dllimport ) + #else + #define GENERATIONGUI_EXPORT + #endif + #endif +#else + #define GENERATIONGUI_EXPORT +#endif + #include "GEOMGUI.h" //================================================================================= // class : GenerationGUI // purpose : //================================================================================= -class GenerationGUI : public GEOMGUI +class GENERATIONGUI_EXPORT GenerationGUI : public GEOMGUI { protected: GenerationGUI(GeometryGUI* parent); // hide constructor to avoid direct creation diff --git a/src/GenerationGUI/GenerationGUI_FillingDlg.h b/src/GenerationGUI/GenerationGUI_FillingDlg.h index d562c5275..6f8baf3a0 100644 --- a/src/GenerationGUI/GenerationGUI_FillingDlg.h +++ b/src/GenerationGUI/GenerationGUI_FillingDlg.h @@ -29,6 +29,8 @@ #ifndef DIALOGBOX_FILLING_H #define DIALOGBOX_FILLING_H +#include "GenerationGUI.h" + #include "GEOMBase_Skeleton.h" #include "DlgRef_1Sel5Spin.h" @@ -36,7 +38,7 @@ // class : GenerationGUI_FillingDlg // purpose : //================================================================================= -class GenerationGUI_FillingDlg : public GEOMBase_Skeleton +class GENERATIONGUI_EXPORT GenerationGUI_FillingDlg : public GEOMBase_Skeleton { Q_OBJECT diff --git a/src/GenerationGUI/GenerationGUI_PipeDlg.h b/src/GenerationGUI/GenerationGUI_PipeDlg.h index 4f525f343..a39145e4e 100644 --- a/src/GenerationGUI/GenerationGUI_PipeDlg.h +++ b/src/GenerationGUI/GenerationGUI_PipeDlg.h @@ -29,6 +29,8 @@ #ifndef DIALOGBOX_PIPE_H #define DIALOGBOX_PIPE_H +#include "GenerationGUI.h" + #include "GEOMBase_Skeleton.h" #include "DlgRef_2Sel_QTD.h" @@ -36,7 +38,7 @@ // class : GenerationGUI_PipeDlg // purpose : //================================================================================= -class GenerationGUI_PipeDlg : public GEOMBase_Skeleton +class GENERATIONGUI_EXPORT GenerationGUI_PipeDlg : public GEOMBase_Skeleton { Q_OBJECT diff --git a/src/GenerationGUI/GenerationGUI_PrismDlg.h b/src/GenerationGUI/GenerationGUI_PrismDlg.h index ee946ae77..528f1cdda 100644 --- a/src/GenerationGUI/GenerationGUI_PrismDlg.h +++ b/src/GenerationGUI/GenerationGUI_PrismDlg.h @@ -29,6 +29,8 @@ #ifndef DIALOGBOX_PRISM_H #define DIALOGBOX_PRISM_H +#include "GenerationGUI.h" + #include "GEOMBase_Skeleton.h" #include "DlgRef_2Sel1Spin2Check.h" @@ -36,7 +38,7 @@ // class : GenerationGUI_PrismDlg // purpose : //================================================================================= -class GenerationGUI_PrismDlg : public GEOMBase_Skeleton +class GENERATIONGUI_EXPORT GenerationGUI_PrismDlg : public GEOMBase_Skeleton { Q_OBJECT diff --git a/src/GenerationGUI/GenerationGUI_RevolDlg.h b/src/GenerationGUI/GenerationGUI_RevolDlg.h index f5d7637f3..6e393db3f 100644 --- a/src/GenerationGUI/GenerationGUI_RevolDlg.h +++ b/src/GenerationGUI/GenerationGUI_RevolDlg.h @@ -29,6 +29,8 @@ #ifndef DIALOGBOX_REVOLUTION_H #define DIALOGBOX_REVOLUTION_H +#include "GenerationGUI.h" + #include "GEOMBase_Skeleton.h" #include "DlgRef_2Sel1Spin2Check.h" @@ -38,7 +40,7 @@ // class : GenerationGUI_RevolDlg // purpose : //================================================================================= -class GenerationGUI_RevolDlg : public GEOMBase_Skeleton +class GENERATIONGUI_EXPORT GenerationGUI_RevolDlg : public GEOMBase_Skeleton { Q_OBJECT diff --git a/src/IGESExport/IGESExport.cxx b/src/IGESExport/IGESExport.cxx index 591016460..b48bd2221 100644 --- a/src/IGESExport/IGESExport.cxx +++ b/src/IGESExport/IGESExport.cxx @@ -32,9 +32,21 @@ #include #ifdef WNT -#include + #if defined IGESEXPORT_EXPORTS + #if defined WIN32 + #define IGESEXPORT_EXPORT __declspec( dllexport ) + #else + #define IGESEXPORT_EXPORT + #endif + #else + #if defined WIN32 + #define IGESEXPORT_EXPORT __declspec( dllimport ) + #else + #define IGESEXPORT_EXPORT + #endif + #endif #else -#define SALOME_WNT_EXPORT + #define IGESEXPORT_EXPORT #endif //============================================================================= @@ -45,7 +57,7 @@ extern "C" { -SALOME_WNT_EXPORT +IGESEXPORT_EXPORT int Export(const TopoDS_Shape& theShape, const TCollection_AsciiString& theFileName) { MESSAGE("Export IGES into file " << theFileName.ToCString()); diff --git a/src/IGESImport/IGESImport.cxx b/src/IGESImport/IGESImport.cxx index 3a59922c9..1622e34cc 100644 --- a/src/IGESImport/IGESImport.cxx +++ b/src/IGESImport/IGESImport.cxx @@ -31,9 +31,21 @@ #include #ifdef WNT -#include + #if defined IGESIMPORT_EXPORTS + #if defined WIN32 + #define IGESIMPORT_EXPORT __declspec( dllexport ) + #else + #define IGESIMPORT_EXPORT + #endif + #else + #if defined WIN32 + #define IGESIMPORT_EXPORT __declspec( dllimport ) + #else + #define IGESIMPORT_EXPORT + #endif + #endif #else -#define SALOME_WNT_EXPORT + #define IGESIMPORT_EXPORT #endif //============================================================================= @@ -44,7 +56,7 @@ extern "C" { -SALOME_WNT_EXPORT +IGESIMPORT_EXPORT TopoDS_Shape Import (const TCollection_AsciiString& theFileName, TCollection_AsciiString& theError) { diff --git a/src/MeasureGUI/GEOM_MeasureGUI.hxx b/src/MeasureGUI/GEOM_MeasureGUI.hxx new file mode 100755 index 000000000..fd447a276 --- /dev/null +++ b/src/MeasureGUI/GEOM_MeasureGUI.hxx @@ -0,0 +1,47 @@ +// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// +// +// +// File : GEOM_MeasureGUI.hxx +// Author : Alexander A. BORODIN +// Module : GEOM + +#ifndef _GEOM_MeasureGUI_HXX_ +#define _GEOM_MeasureGUI_HXX_ + +#ifdef WNT + #if defined MEASUREGUI_EXPORTS + #if defined WIN32 + #define GEOM_MEASUREGUI_EXPORT __declspec( dllexport ) + #else + #define GEOM_MEASUREGUI_EXPORT + #endif + #else + #if defined WIN32 + #define GEOM_MEASUREGUI_EXPORT __declspec( dllimport ) + #else + #define GEOM_MEASUREGUI_EXPORT + #endif + #endif +#else + #define GEOM_MEASUREGUI_EXPORT +#endif + +#endif diff --git a/src/MeasureGUI/MeasureGUI.cxx b/src/MeasureGUI/MeasureGUI.cxx index b49f9eed5..ac38d28f3 100644 --- a/src/MeasureGUI/MeasureGUI.cxx +++ b/src/MeasureGUI/MeasureGUI.cxx @@ -138,9 +138,7 @@ bool MeasureGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent ) //===================================================================================== extern "C" { -#ifdef WNT - __declspec( dllexport ) -#endif +GEOM_MEASUREGUI_EXPORT GEOMGUI* GetLibGUI( GeometryGUI* parent ) { return MeasureGUI::GetMeasureGUI( parent ); diff --git a/src/MeasureGUI/MeasureGUI.h b/src/MeasureGUI/MeasureGUI.h index 2a34e5e7a..0354fb6b3 100644 --- a/src/MeasureGUI/MeasureGUI.h +++ b/src/MeasureGUI/MeasureGUI.h @@ -29,13 +29,15 @@ #ifndef MEASUREGUI_H #define MEASUREGUI_H +#include "GEOM_MeasureGUI.hxx" + #include "GEOMGUI.h" //================================================================================= // class : MeasureGUI // purpose : //================================================================================= -class MeasureGUI : public GEOMGUI +class GEOM_MEASUREGUI_EXPORT MeasureGUI : public GEOMGUI { protected: MeasureGUI( GeometryGUI* parent ); diff --git a/src/MeasureGUI/MeasureGUI_1Sel12LineEdit_QTD.h b/src/MeasureGUI/MeasureGUI_1Sel12LineEdit_QTD.h index 0c930fc2c..dbdc20bff 100644 --- a/src/MeasureGUI/MeasureGUI_1Sel12LineEdit_QTD.h +++ b/src/MeasureGUI/MeasureGUI_1Sel12LineEdit_QTD.h @@ -28,6 +28,8 @@ #ifndef MEASUREGUI_1SEL12LINEEDIT_QTD_H #define MEASUREGUI_1SEL12LINEEDIT_QTD_H +#include "GEOM_MeasureGUI.hxx" + #include #include class QVBoxLayout; @@ -38,7 +40,7 @@ class QLabel; class QLineEdit; class QPushButton; -class MeasureGUI_1Sel12LineEdit_QTD : public QWidget +class GEOM_MEASUREGUI_EXPORT MeasureGUI_1Sel12LineEdit_QTD : public QWidget { Q_OBJECT diff --git a/src/MeasureGUI/MeasureGUI_1Sel1TextView_QTD.h b/src/MeasureGUI/MeasureGUI_1Sel1TextView_QTD.h index 7d6ea600d..9d17a3422 100644 --- a/src/MeasureGUI/MeasureGUI_1Sel1TextView_QTD.h +++ b/src/MeasureGUI/MeasureGUI_1Sel1TextView_QTD.h @@ -28,6 +28,8 @@ #ifndef MEASUREGUI_1SEL1TEXTVIEW_QTD_H #define MEASUREGUI_1SEL1TEXTVIEW_QTD_H +#include "GEOM_MeasureGUI.hxx" + #include #include class QVBoxLayout; @@ -39,7 +41,7 @@ class QLineEdit; class QPushButton; class QTextEdit; -class MeasureGUI_1Sel1TextView_QTD : public QWidget +class GEOM_MEASUREGUI_EXPORT MeasureGUI_1Sel1TextView_QTD : public QWidget { Q_OBJECT diff --git a/src/MeasureGUI/MeasureGUI_1Sel3LineEdit_QTD.h b/src/MeasureGUI/MeasureGUI_1Sel3LineEdit_QTD.h index 379b7da32..1ce61aacc 100644 --- a/src/MeasureGUI/MeasureGUI_1Sel3LineEdit_QTD.h +++ b/src/MeasureGUI/MeasureGUI_1Sel3LineEdit_QTD.h @@ -28,6 +28,8 @@ #ifndef MEASUREGUI_1SEL3LINEEDIT_QTD_H #define MEASUREGUI_1SEL3LINEEDIT_QTD_H +#include "GEOM_MeasureGUI.hxx" + #include #include class QVBoxLayout; @@ -38,7 +40,7 @@ class QLabel; class QLineEdit; class QPushButton; -class MeasureGUI_1Sel3LineEdit_QTD : public QWidget +class GEOM_MEASUREGUI_EXPORT MeasureGUI_1Sel3LineEdit_QTD : public QWidget { Q_OBJECT diff --git a/src/MeasureGUI/MeasureGUI_1Sel6LineEdit_QTD.h b/src/MeasureGUI/MeasureGUI_1Sel6LineEdit_QTD.h index f222e6380..a9126a9a8 100644 --- a/src/MeasureGUI/MeasureGUI_1Sel6LineEdit_QTD.h +++ b/src/MeasureGUI/MeasureGUI_1Sel6LineEdit_QTD.h @@ -28,6 +28,8 @@ #ifndef MEASUREGUI_1SEL6LINEEDIT_QTD_H #define MEASUREGUI_1SEL6LINEEDIT_QTD_H +#include "GEOM_MeasureGUI.hxx" + #include #include class QVBoxLayout; @@ -38,7 +40,7 @@ class QLabel; class QLineEdit; class QPushButton; -class MeasureGUI_1Sel6LineEdit_QTD : public QWidget +class GEOM_MEASUREGUI_EXPORT MeasureGUI_1Sel6LineEdit_QTD : public QWidget { Q_OBJECT diff --git a/src/MeasureGUI/MeasureGUI_2Sel1LineEdit_QTD.h b/src/MeasureGUI/MeasureGUI_2Sel1LineEdit_QTD.h index eae9b2701..05ea48057 100644 --- a/src/MeasureGUI/MeasureGUI_2Sel1LineEdit_QTD.h +++ b/src/MeasureGUI/MeasureGUI_2Sel1LineEdit_QTD.h @@ -28,6 +28,8 @@ #ifndef MEASUREGUI_2SEL1LINEEDIT_QTD_H #define MEASUREGUI_2SEL1LINEEDIT_QTD_H +#include "GEOM_MeasureGUI.hxx" + #include #include class QVBoxLayout; @@ -38,7 +40,7 @@ class QLabel; class QLineEdit; class QPushButton; -class MeasureGUI_2Sel1LineEdit_QTD : public QWidget +class GEOM_MEASUREGUI_EXPORT MeasureGUI_2Sel1LineEdit_QTD : public QWidget { Q_OBJECT diff --git a/src/MeasureGUI/MeasureGUI_BndBoxDlg.h b/src/MeasureGUI/MeasureGUI_BndBoxDlg.h index a4da9046c..fa9a6a282 100644 --- a/src/MeasureGUI/MeasureGUI_BndBoxDlg.h +++ b/src/MeasureGUI/MeasureGUI_BndBoxDlg.h @@ -29,21 +29,17 @@ #ifndef DIALOGBOX_BNDBOX_H #define DIALOGBOX_BNDBOX_H +#include "GEOM_MeasureGUI.hxx" + #include "MeasureGUI_Skeleton.h" class MeasureGUI_1Sel6LineEdit_QTD; -#if defined WNT && defined MEASUREGUI_EXPORTS -#define MEASUREGUI_EXPORT __declspec( dllexport ) -#else -#define MEASUREGUI_EXPORT -#endif - //================================================================================= // class : DialogBox_PROPERTIES // purpose : //================================================================================= -class MEASUREGUI_EXPORT MeasureGUI_BndBoxDlg : public MeasureGUI_Skeleton +class GEOM_MEASUREGUI_EXPORT MeasureGUI_BndBoxDlg : public MeasureGUI_Skeleton { Q_OBJECT diff --git a/src/MeasureGUI/MeasureGUI_CenterMassDlg.h b/src/MeasureGUI/MeasureGUI_CenterMassDlg.h index 1cee7d357..ae9d877c4 100644 --- a/src/MeasureGUI/MeasureGUI_CenterMassDlg.h +++ b/src/MeasureGUI/MeasureGUI_CenterMassDlg.h @@ -28,21 +28,17 @@ #ifndef DIALOGBOX_CMASS_H #define DIALOGBOX_CMASS_H +#include "GEOM_MeasureGUI.hxx" + #include "GEOMBase_Skeleton.h" class MeasureGUI_1Sel3LineEdit_QTD; -#if defined WNT && defined MEASUREGUI_EXPORTS -#define MEASUREGUI_EXPORT __declspec( dllexport ) -#else -#define MEASUREGUI_EXPORT -#endif - //================================================================================= // class : MeasureGUI_CenterMassDlg // purpose : //================================================================================= -class MEASUREGUI_EXPORT MeasureGUI_CenterMassDlg : public GEOMBase_Skeleton +class GEOM_MEASUREGUI_EXPORT MeasureGUI_CenterMassDlg : public GEOMBase_Skeleton { Q_OBJECT diff --git a/src/MeasureGUI/MeasureGUI_CheckCompoundOfBlocksDlg.h b/src/MeasureGUI/MeasureGUI_CheckCompoundOfBlocksDlg.h index 0038dcb4e..3095ccb4e 100644 --- a/src/MeasureGUI/MeasureGUI_CheckCompoundOfBlocksDlg.h +++ b/src/MeasureGUI/MeasureGUI_CheckCompoundOfBlocksDlg.h @@ -29,23 +29,19 @@ #ifndef DIALOGBOX_CHECKCOMPOUNDOFBLOCKSDLG_H #define DIALOGBOX_CHECKCOMPOUNDOFBLOCKSDLG_H +#include "GEOM_MeasureGUI.hxx" + #include "MeasureGUI_Skeleton.h" class MeasureGUI_1Sel1TextView_QTD; class QListBox; class QLabel; -#if defined WNT && defined MEASUREGUI_EXPORTS -#define MEASUREGUI_EXPORT __declspec( dllexport ) -#else -#define MEASUREGUI_EXPORT -#endif - //================================================================================= // class : MeasureGUI_CheckCompoundOfBlocksDlg // purpose : //================================================================================= -class MEASUREGUI_EXPORT MeasureGUI_CheckCompoundOfBlocksDlg : public MeasureGUI_Skeleton +class GEOM_MEASUREGUI_EXPORT MeasureGUI_CheckCompoundOfBlocksDlg : public MeasureGUI_Skeleton { Q_OBJECT diff --git a/src/MeasureGUI/MeasureGUI_CheckShapeDlg.h b/src/MeasureGUI/MeasureGUI_CheckShapeDlg.h index 60eb49538..53b39c4ab 100644 --- a/src/MeasureGUI/MeasureGUI_CheckShapeDlg.h +++ b/src/MeasureGUI/MeasureGUI_CheckShapeDlg.h @@ -29,21 +29,17 @@ #ifndef DIALOGBOX_CHECKSHAPEDLG_H #define DIALOGBOX_CHECKSHAPEDLG_H +#include "GEOM_MeasureGUI.hxx" + #include "MeasureGUI_Skeleton.h" class MeasureGUI_1Sel1TextView_QTD; -#if defined WNT && defined MEASUREGUI_EXPORTS -#define MEASUREGUI_EXPORT __declspec( dllexport ) -#else -#define MEASUREGUI_EXPORT -#endif - //================================================================================= // class : MeasureGUI_CheckShapeDlg // purpose : //================================================================================= -class MEASUREGUI_EXPORT MeasureGUI_CheckShapeDlg : public MeasureGUI_Skeleton +class GEOM_MEASUREGUI_EXPORT MeasureGUI_CheckShapeDlg : public MeasureGUI_Skeleton { Q_OBJECT diff --git a/src/MeasureGUI/MeasureGUI_DistanceDlg.h b/src/MeasureGUI/MeasureGUI_DistanceDlg.h index 98d382f6f..dd4363bdc 100644 --- a/src/MeasureGUI/MeasureGUI_DistanceDlg.h +++ b/src/MeasureGUI/MeasureGUI_DistanceDlg.h @@ -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 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 diff --git a/src/MeasureGUI/MeasureGUI_InertiaDlg.h b/src/MeasureGUI/MeasureGUI_InertiaDlg.h index 2ccf83203..a63372bda 100644 --- a/src/MeasureGUI/MeasureGUI_InertiaDlg.h +++ b/src/MeasureGUI/MeasureGUI_InertiaDlg.h @@ -29,24 +29,20 @@ #ifndef DIALOGBOX_INERTIA_H #define DIALOGBOX_INERTIA_H +#include "GEOM_MeasureGUI.hxx" + #include "MeasureGUI_Skeleton.h" class MeasureGUI_1Sel12LineEdit_QTD; class gp_XYZ; class gp_Mat; -#if defined WNT && defined MEASUREGUI_EXPORTS -#define MEASUREGUI_EXPORT __declspec( dllexport ) -#else -#define MEASUREGUI_EXPORT -#endif - //================================================================================= // class : MeasureGUI_InertiaDlg // purpose : Dialog for displaying moment of inertia //================================================================================= -class MEASUREGUI_EXPORT MeasureGUI_InertiaDlg : public MeasureGUI_Skeleton +class GEOM_MEASUREGUI_EXPORT MeasureGUI_InertiaDlg : public MeasureGUI_Skeleton { Q_OBJECT diff --git a/src/MeasureGUI/MeasureGUI_MaxToleranceDlg.h b/src/MeasureGUI/MeasureGUI_MaxToleranceDlg.h index 13c0733e1..ba213338e 100644 --- a/src/MeasureGUI/MeasureGUI_MaxToleranceDlg.h +++ b/src/MeasureGUI/MeasureGUI_MaxToleranceDlg.h @@ -29,21 +29,17 @@ #ifndef DIALOGBOX_MAXTOLERANCE_H #define DIALOGBOX_MAXTOLERANCE_H +#include "GEOM_MeasureGUI.hxx" + #include "MeasureGUI_Skeleton.h" class MeasureGUI_1Sel6LineEdit_QTD; -#if defined WNT && defined MEASUREGUI_EXPORTS -#define MEASUREGUI_EXPORT __declspec( dllexport ) -#else -#define MEASUREGUI_EXPORT -#endif - //================================================================================= // class : DialogBox_PROPERTIES // purpose : //================================================================================= -class MEASUREGUI_EXPORT MeasureGUI_MaxToleranceDlg : public MeasureGUI_Skeleton +class GEOM_MEASUREGUI_EXPORT MeasureGUI_MaxToleranceDlg : public MeasureGUI_Skeleton { Q_OBJECT diff --git a/src/MeasureGUI/MeasureGUI_PointDlg.h b/src/MeasureGUI/MeasureGUI_PointDlg.h index f26853b9a..2996e7165 100644 --- a/src/MeasureGUI/MeasureGUI_PointDlg.h +++ b/src/MeasureGUI/MeasureGUI_PointDlg.h @@ -28,22 +28,18 @@ #ifndef MEASUREGUI_POINTDLG_H #define MEASUREGUI_POINTDLG_H +#include "GEOM_MeasureGUI.hxx" + #include "MeasureGUI_Skeleton.h" class QLineEdit; -#if defined WNT && defined MEASUREGUI_EXPORTS -#define MEASUREGUI_EXPORT __declspec( dllexport ) -#else -#define MEASUREGUI_EXPORT -#endif - //================================================================================= // class : MeasureGUI_PointDlg // purpose : Dialog for displaying point coordinates //================================================================================= -class MEASUREGUI_EXPORT MeasureGUI_PointDlg : public MeasureGUI_Skeleton +class GEOM_MEASUREGUI_EXPORT MeasureGUI_PointDlg : public MeasureGUI_Skeleton { Q_OBJECT diff --git a/src/MeasureGUI/MeasureGUI_PropertiesDlg.h b/src/MeasureGUI/MeasureGUI_PropertiesDlg.h index e63a0ef56..420377922 100644 --- a/src/MeasureGUI/MeasureGUI_PropertiesDlg.h +++ b/src/MeasureGUI/MeasureGUI_PropertiesDlg.h @@ -28,21 +28,17 @@ #ifndef DIALOGBOX_PROPERTIES_H #define DIALOGBOX_PROPERTIES_H +#include "GEOM_MeasureGUI.hxx" + #include "MeasureGUI_Skeleton.h" class MeasureGUI_1Sel3LineEdit_QTD; -#if defined WNT && defined MEASUREGUI_EXPORTS -#define MEASUREGUI_EXPORT __declspec( dllexport ) -#else -#define MEASUREGUI_EXPORT -#endif - //================================================================================= // class : MeasureGUI_PropertiesDlg // purpose : Dialog for displaying length, area and volume //================================================================================= -class MEASUREGUI_EXPORT MeasureGUI_PropertiesDlg : public MeasureGUI_Skeleton +class GEOM_MEASUREGUI_EXPORT MeasureGUI_PropertiesDlg : public MeasureGUI_Skeleton { Q_OBJECT diff --git a/src/MeasureGUI/MeasureGUI_Skeleton.h b/src/MeasureGUI/MeasureGUI_Skeleton.h index bcf601a1e..1deab1dce 100644 --- a/src/MeasureGUI/MeasureGUI_Skeleton.h +++ b/src/MeasureGUI/MeasureGUI_Skeleton.h @@ -29,6 +29,8 @@ #ifndef MEASUREGUI_SKELETON_H #define MEASUREGUI_SKELETON_H +#include "GEOM_MeasureGUI.hxx" + #include "MeasureGUI_Skeleton_QTD.h" #include "GEOMBase_Helper.h" @@ -38,8 +40,9 @@ class QLineEdit; class QPushButton; class GEOM_Displayer; -class MeasureGUI_Skeleton : public MeasureGUI_Skeleton_QTD, - public GEOMBase_Helper +class GEOM_MEASUREGUI_EXPORT + MeasureGUI_Skeleton : public MeasureGUI_Skeleton_QTD, + public GEOMBase_Helper { Q_OBJECT diff --git a/src/MeasureGUI/MeasureGUI_Skeleton_QTD.h b/src/MeasureGUI/MeasureGUI_Skeleton_QTD.h index 90145bfaa..d3cb58add 100644 --- a/src/MeasureGUI/MeasureGUI_Skeleton_QTD.h +++ b/src/MeasureGUI/MeasureGUI_Skeleton_QTD.h @@ -28,6 +28,8 @@ #ifndef MEASUREGUI_SKELETON_QTD_H #define MEASUREGUI_SKELETON_QTD_H +#include "GEOM_MeasureGUI.hxx" + #include #include class QVBoxLayout; @@ -38,7 +40,7 @@ class QGroupBox; class QPushButton; class QRadioButton; -class MeasureGUI_Skeleton_QTD : public QDialog +class GEOM_MEASUREGUI_EXPORT MeasureGUI_Skeleton_QTD : public QDialog { Q_OBJECT diff --git a/src/MeasureGUI/MeasureGUI_WhatisDlg.h b/src/MeasureGUI/MeasureGUI_WhatisDlg.h index ebdf84be1..1262762ab 100644 --- a/src/MeasureGUI/MeasureGUI_WhatisDlg.h +++ b/src/MeasureGUI/MeasureGUI_WhatisDlg.h @@ -29,21 +29,17 @@ #ifndef DIALOGBOX_WHATIS_H #define DIALOGBOX_WHATIS_H +#include "GEOM_MeasureGUI.hxx" + #include "MeasureGUI_Skeleton.h" class MeasureGUI_1Sel1TextView_QTD; -#if defined WNT && defined MEASUREGUI_EXPORTS -#define MEASUREGUI_EXPORT __declspec( dllexport ) -#else -#define MEASUREGUI_EXPORT -#endif - //================================================================================= // class : DialogBox_PROPERTIES // purpose : //================================================================================= -class MEASUREGUI_EXPORT MeasureGUI_WhatisDlg : public MeasureGUI_Skeleton +class GEOM_MEASUREGUI_EXPORT MeasureGUI_WhatisDlg : public MeasureGUI_Skeleton { Q_OBJECT diff --git a/src/OBJECT/GEOM_AISShape.hxx b/src/OBJECT/GEOM_AISShape.hxx index 96ae886ba..a9e12142d 100644 --- a/src/OBJECT/GEOM_AISShape.hxx +++ b/src/OBJECT/GEOM_AISShape.hxx @@ -27,6 +27,8 @@ #ifndef _GEOM_AISShape_HeaderFile #define _GEOM_AISShape_HeaderFile +#include "GEOM_OBJECT_defs.hxx" + #ifndef _Standard_HeaderFile #include #endif @@ -58,12 +60,7 @@ class Prs3d_Presentation; class SALOME_InteractiveObject; class TopoDS_Shape; -#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS -#define OBJECT_WNT_EXPORT __declspec( dllexport ) -#else -#define OBJECT_WNT_EXPORT -#endif -class OBJECT_WNT_EXPORT GEOM_AISShape : public SALOME_AISShape { +class GEOM_OBJECT_EXPORT GEOM_AISShape : public SALOME_AISShape { public: diff --git a/src/OBJECT/GEOM_Actor.h b/src/OBJECT/GEOM_Actor.h index 7229b9e2b..fff44b8b2 100644 --- a/src/OBJECT/GEOM_Actor.h +++ b/src/OBJECT/GEOM_Actor.h @@ -29,6 +29,8 @@ #ifndef GEOM_ACTOR_H #define GEOM_ACTOR_H +#include "GEOM_OBJECT_defs.hxx" + #include "SALOME_Actor.h" //OpenCASCADE @@ -38,13 +40,7 @@ class vtkCamera; class TopoDS_Shape; -#ifdef WNT -#include -#else -#define SALOME_WNT_EXPORT -#endif - -class SALOME_WNT_EXPORT GEOM_Actor : public SALOME_Actor { +class GEOM_OBJECT_EXPORT GEOM_Actor : public SALOME_Actor { public: vtkTypeMacro(GEOM_Actor,SALOME_Actor); diff --git a/src/OBJECT/GEOM_AssemblyBuilder.h b/src/OBJECT/GEOM_AssemblyBuilder.h index 4436b0b01..a9d1a27f7 100644 --- a/src/OBJECT/GEOM_AssemblyBuilder.h +++ b/src/OBJECT/GEOM_AssemblyBuilder.h @@ -26,6 +26,8 @@ // Module : GEOM // $Header$ +#include "GEOM_OBJECT_defs.hxx" + #include #include #include @@ -34,13 +36,7 @@ #include #include -#ifdef WNT -#include -#else -#define SALOME_WNT_EXPORT -#endif - -class SALOME_WNT_EXPORT GEOM_AssemblyBuilder { +class GEOM_OBJECT_EXPORT GEOM_AssemblyBuilder { private: diff --git a/src/OBJECT/GEOM_OBJECT_defs.hxx b/src/OBJECT/GEOM_OBJECT_defs.hxx new file mode 100755 index 000000000..3377ce908 --- /dev/null +++ b/src/OBJECT/GEOM_OBJECT_defs.hxx @@ -0,0 +1,47 @@ +// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// +// +// +// File : GEOM_OBJECT_defs.hxx +// Author : Alexander A. BORODIN +// Module : GEOM + +#ifndef _GEOM_OBJECT_defs_HXX_ +#define _GEOM_OBJECT_defs_HXX_ + +#ifdef WNT + #if defined OBJECT_EXPORTS + #if defined WIN32 + #define GEOM_OBJECT_EXPORT __declspec( dllexport ) + #else + #define GEOM_OBJECT_EXPORT + #endif + #else + #if defined WIN32 + #define GEOM_OBJECT_EXPORT __declspec( dllimport ) + #else + #define GEOM_OBJECT_EXPORT + #endif + #endif +#else + #define GEOM_OBJECT_EXPORT +#endif + +#endif diff --git a/src/OBJECT/GEOM_OCCReader.h b/src/OBJECT/GEOM_OCCReader.h index e10ce3cda..c82a84dd0 100644 --- a/src/OBJECT/GEOM_OCCReader.h +++ b/src/OBJECT/GEOM_OCCReader.h @@ -34,6 +34,8 @@ #ifndef GEOM_OCCREADER_H #define GEOM_OCCREADER_H +#include "GEOM_OBJECT_defs.hxx" + #include class vtkPoints; @@ -47,13 +49,7 @@ class vtkCellArray; #include #include -#ifdef _WIN_32 -#define VTKOCC_EXPORT __declspec (dllexport) -#else -#define VTKOCC_EXPORT -#endif - -class VTKOCC_EXPORT GEOM_OCCReader : public vtkPolyDataSource { +class GEOM_OBJECT_EXPORT GEOM_OCCReader : public vtkPolyDataSource { // methods diff --git a/src/OBJECT/GEOM_VTKTrihedron.hxx b/src/OBJECT/GEOM_VTKTrihedron.hxx index b67ad3fbb..cb1877828 100644 --- a/src/OBJECT/GEOM_VTKTrihedron.hxx +++ b/src/OBJECT/GEOM_VTKTrihedron.hxx @@ -29,17 +29,12 @@ #ifndef GEOM_VTKTrihedron_H #define GEOM_VTKTrihedron_H +#include "GEOM_OBJECT_defs.hxx" + #include #include "SALOME_Actor.h" #include "VTKViewer_Trihedron.h" -#ifdef WNT -#include -#else -#define SALOME_WNT_EXPORT -#endif - - class vtkActorCollection; class vtkRenderer; class vtkPolyDataMapper; @@ -50,7 +45,7 @@ class vtkPolyDataMapper; Placement of trihedron is chahged with SetPlacement() method */ -class SALOME_WNT_EXPORT GEOM_VTKTrihedron : public SALOME_Actor +class GEOM_OBJECT_EXPORT GEOM_VTKTrihedron : public SALOME_Actor { protected: diff --git a/src/OBJECT/Makefile.in b/src/OBJECT/Makefile.in index 589469a87..dc3bcca0d 100644 --- a/src/OBJECT/Makefile.in +++ b/src/OBJECT/Makefile.in @@ -39,7 +39,8 @@ EXPORT_HEADERS = GEOM_Actor.h \ GEOM_InteractiveObject.hxx \ Handle_GEOM_InteractiveObject.hxx \ GEOM_AISTrihedron.hxx \ - GEOM_VTKTrihedron.hxx + GEOM_VTKTrihedron.hxx \ + GEOM_OBJECT.hxx # Libraries targets diff --git a/src/PARTITION/Partition_Inter2d.cxx b/src/PARTITION/Partition_Inter2d.cxx index 54a270e44..ab62aaadf 100644 --- a/src/PARTITION/Partition_Inter2d.cxx +++ b/src/PARTITION/Partition_Inter2d.cxx @@ -26,7 +26,6 @@ // Module : GEOM // $Header$ -using namespace std; #include "Partition_Inter2d.ixx" #include "utilities.h" @@ -58,6 +57,8 @@ static Standard_Integer NbF2d = 0; static Standard_Integer NbE2d = 0; #endif +using namespace std; + //======================================================================= //function : getOtherShape //purpose : diff --git a/src/PARTITION/Partition_Inter3d.cxx b/src/PARTITION/Partition_Inter3d.cxx index e9bf649ce..2c22d6ea6 100644 --- a/src/PARTITION/Partition_Inter3d.cxx +++ b/src/PARTITION/Partition_Inter3d.cxx @@ -26,7 +26,6 @@ // Module : GEOM // $Header$ -using namespace std; #include "Partition_Inter2d.hxx" #include "Partition_Inter3d.ixx" #include "utilities.h" @@ -84,6 +83,8 @@ using namespace std; #include #include +using namespace std; + //======================================================================= //function : Partition_Inter3d //purpose : diff --git a/src/PARTITION/Partition_Loop.cxx b/src/PARTITION/Partition_Loop.cxx index 29386de22..0ab037805 100644 --- a/src/PARTITION/Partition_Loop.cxx +++ b/src/PARTITION/Partition_Loop.cxx @@ -26,7 +26,6 @@ // Module : GEOM // $Header$ -using namespace std; #include #include "Partition_Loop.ixx" @@ -63,6 +62,8 @@ using namespace std; #include #include +using namespace std; + static char* name = new char[100]; static int nbe = 0; diff --git a/src/PARTITION/Partition_Loop2d.cxx b/src/PARTITION/Partition_Loop2d.cxx index 05e01771a..d280a7858 100644 --- a/src/PARTITION/Partition_Loop2d.cxx +++ b/src/PARTITION/Partition_Loop2d.cxx @@ -9,7 +9,6 @@ // Module : GEOM // $Header$ -using namespace std; #include "Partition_Loop2d.ixx" #include "utilities.h" @@ -48,6 +47,8 @@ using namespace std; #include #include +using namespace std; + //======================================================================= //function : Partition_Loop2d //purpose : diff --git a/src/PARTITION/Partition_Loop3d.cxx b/src/PARTITION/Partition_Loop3d.cxx index cb5ecff04..c93a75108 100644 --- a/src/PARTITION/Partition_Loop3d.cxx +++ b/src/PARTITION/Partition_Loop3d.cxx @@ -7,7 +7,6 @@ // File : Partition_Loop3d.cxx // Module : GEOM -using namespace std; #include "Partition_Loop3d.ixx" #include @@ -29,6 +28,8 @@ using namespace std; #include #include +using namespace std; + //======================================================================= //function : Partition_Loop3d //purpose : diff --git a/src/PARTITION/Partition_Spliter.cxx b/src/PARTITION/Partition_Spliter.cxx index 8f4793909..4c79bf922 100644 --- a/src/PARTITION/Partition_Spliter.cxx +++ b/src/PARTITION/Partition_Spliter.cxx @@ -26,7 +26,6 @@ // Module : GEOM // $Header$ -using namespace std; #include "Partition_Inter2d.hxx" #include "Partition_Inter3d.hxx" #include "Partition_Loop2d.hxx" @@ -84,6 +83,8 @@ using namespace std; # include #endif +using namespace std; + //======================================================================= //function : isClosed //purpose : check id a shape is closed, ie is a solid or a closed shell diff --git a/src/STEPExport/STEPExport.cxx b/src/STEPExport/STEPExport.cxx index d7ed96b6f..7317e6d2b 100644 --- a/src/STEPExport/STEPExport.cxx +++ b/src/STEPExport/STEPExport.cxx @@ -32,9 +32,21 @@ #include #ifdef WNT -#include + #if defined STEPEXPORT_EXPORTS + #if defined WIN32 + #define STEPEXPORT_EXPORT __declspec( dllexport ) + #else + #define STEPEXPORT_EXPORT + #endif + #else + #if defined WIN32 + #define STEPEXPORT_EXPORT __declspec( dllimport ) + #else + #define STEPEXPORT_EXPORT + #endif + #endif #else -#define SALOME_WNT_EXPORT + #define STEPEXPORT_EXPORT #endif //============================================================================= @@ -45,7 +57,7 @@ extern "C" { -SALOME_WNT_EXPORT +STEPEXPORT_EXPORT int Export(const TopoDS_Shape& theShape, const TCollection_AsciiString& theFileName) { MESSAGE("Export STEP into file " << theFileName.ToCString()); diff --git a/src/STEPImport/STEPImport.cxx b/src/STEPImport/STEPImport.cxx index 3fb9cc511..e07fee764 100644 --- a/src/STEPImport/STEPImport.cxx +++ b/src/STEPImport/STEPImport.cxx @@ -37,9 +37,21 @@ #include // CAREFUL ! position of this file is critic : see Lucien PIGNOLONI / OCC #ifdef WNT -#include + #if defined STEPEXPORT_IMPORTS + #if defined WIN32 + #define STEPEXPORT_IMPORT __declspec( dllexport ) + #else + #define STEPEXPORT_IMPORT + #endif + #else + #if defined WIN32 + #define STEPEXPORT_IMPORT __declspec( dllimport ) + #else + #define STEPEXPORT_IMPORT + #endif + #endif #else -#define SALOME_WNT_EXPORT + #define STEPEXPORT_IMPORT #endif //============================================================================= @@ -50,7 +62,7 @@ extern "C" { -SALOME_WNT_EXPORT +STEPEXPORT_IMPORT TopoDS_Shape Import (const TCollection_AsciiString& theFileName, TCollection_AsciiString& theError) {