From aa00566cfdd2bb93898a326573631e4a4c181e28 Mon Sep 17 00:00:00 2001 From: abd Date: Thu, 16 Mar 2006 11:25:11 +0000 Subject: [PATCH] First compiled version of GEOM sources --- src/BREPExport/BREPExport.cxx | 18 ++++++++-- src/BREPImport/BREPImport.cxx | 18 ++++++++-- src/BasicGUI/BasicGUI.cxx | 4 +-- src/BasicGUI/BasicGUI.h | 10 ++---- src/BasicGUI/BasicGUI_ArcDlg.h | 10 +++--- src/BasicGUI/BasicGUI_CircleDlg.h | 13 ++----- src/BasicGUI/BasicGUI_CurveDlg.h | 10 ++---- src/BasicGUI/BasicGUI_EllipseDlg.h | 12 ++----- src/BasicGUI/BasicGUI_LineDlg.h | 10 ++---- src/BasicGUI/BasicGUI_MarkerDlg.h | 10 ++---- src/BasicGUI/BasicGUI_PlaneDlg.h | 10 ++---- src/BasicGUI/BasicGUI_PointDlg.h | 9 ++--- src/BasicGUI/BasicGUI_VectorDlg.h | 10 ++---- src/BasicGUI/BasicGUI_WorkingPlaneDlg.h | 9 ++--- src/BasicGUI/GEOM_BasicGUI.hxx | 47 +++++++++++++++++++++++++ src/BasicGUI/Makefile.in | 3 +- src/BlocksGUI/BlocksGUI.cxx | 4 +-- src/BlocksGUI/BlocksGUI.h | 4 ++- src/BlocksGUI/BlocksGUI_BlockDlg.h | 4 ++- src/BlocksGUI/BlocksGUI_ExplodeDlg.h | 4 ++- src/BlocksGUI/BlocksGUI_PropagateDlg.h | 4 ++- src/BlocksGUI/BlocksGUI_QuadFaceDlg.h | 4 ++- src/BlocksGUI/BlocksGUI_TrsfDlg.h | 6 +++- src/BlocksGUI/GEOM_BlocksGUI.hxx | 47 +++++++++++++++++++++++++ src/BlocksGUI/Makefile.in | 3 +- 25 files changed, 184 insertions(+), 99 deletions(-) create mode 100755 src/BasicGUI/GEOM_BasicGUI.hxx create mode 100755 src/BlocksGUI/GEOM_BlocksGUI.hxx diff --git a/src/BREPExport/BREPExport.cxx b/src/BREPExport/BREPExport.cxx index 2580cfac0..6caa7c071 100644 --- a/src/BREPExport/BREPExport.cxx +++ b/src/BREPExport/BREPExport.cxx @@ -30,9 +30,21 @@ #include #ifdef WNT -#include + #if defined BREPEXPORT_EXPORTS + #if defined WIN32 + #define BREPEXPORT_EXPORT __declspec( dllexport ) + #else + #define BREPEXPORT_EXPORT + #endif + #else + #if defined WIN32 + #define BREPEXPORT_EXPORT __declspec( dllimport ) + #else + #define BREPEXPORT_EXPORT + #endif + #endif #else -#define SALOME_WNT_EXPORT + #define BREPEXPORT_EXPORT #endif //============================================================================= @@ -43,7 +55,7 @@ extern "C" { -SALOME_WNT_EXPORT +BREPEXPORT_EXPORT int Export(const TopoDS_Shape& theShape, const TCollection_AsciiString& theFileName) { MESSAGE("Export BREP into file " << theFileName.ToCString()); diff --git a/src/BREPImport/BREPImport.cxx b/src/BREPImport/BREPImport.cxx index 5412fb3e8..d797ec8a0 100644 --- a/src/BREPImport/BREPImport.cxx +++ b/src/BREPImport/BREPImport.cxx @@ -31,9 +31,21 @@ #include #ifdef WNT -#include + #if defined BREPIMPORT_EXPORTS + #if defined WIN32 + #define BREPIMPORT_EXPORT __declspec( dllexport ) + #else + #define BREPIMPORT_EXPORT + #endif + #else + #if defined WIN32 + #define BREPIMPORT_EXPORT __declspec( dllimport ) + #else + #define BREPIMPORT_EXPORT + #endif + #endif #else -#define SALOME_WNT_EXPORT + #define BREPIMPORT_EXPORT #endif //============================================================================= @@ -44,7 +56,7 @@ extern "C" { -SALOME_WNT_EXPORT +BREPIMPORT_EXPORT TopoDS_Shape Import (const TCollection_AsciiString& theFileName, TCollection_AsciiString& theError) { diff --git a/src/BasicGUI/BasicGUI.cxx b/src/BasicGUI/BasicGUI.cxx index 076e0ed3a..e3d0f040e 100644 --- a/src/BasicGUI/BasicGUI.cxx +++ b/src/BasicGUI/BasicGUI.cxx @@ -219,9 +219,7 @@ gp_Pnt BasicGUI::ConvertClickToPoint( int x, int y, Handle(V3d_View) aView) //===================================================================================== extern "C" { -#ifdef WNT - __declspec( dllexport ) -#endif +GEOM_BASICGUI_EXPORT GEOMGUI* GetLibGUI( GeometryGUI* parent ) { return BasicGUI::GetBasicGUI( parent ); diff --git a/src/BasicGUI/BasicGUI.h b/src/BasicGUI/BasicGUI.h index a2cd25a6f..9e086dd2c 100644 --- a/src/BasicGUI/BasicGUI.h +++ b/src/BasicGUI/BasicGUI.h @@ -29,21 +29,17 @@ #ifndef BASICGUI_H #define BASICGUI_H +#include "GEOM_BasicGUI.hxx" + #include "GEOMGUI.h" #include "GEOMBase.h" #include - -#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS -#define BASICGUI_WNT_EXPORT __declspec( dllexport ) -#else -#define BASICGUI_WNT_EXPORT -#endif //================================================================================= // class : BasicGUI // purpose : //================================================================================= -class BasicGUI : public GEOMGUI +class GEOM_BASICGUI_EXPORT BasicGUI : public GEOMGUI { protected: BasicGUI( GeometryGUI* parent ); // hide constructor to avoid direct creation diff --git a/src/BasicGUI/BasicGUI_ArcDlg.h b/src/BasicGUI/BasicGUI_ArcDlg.h index 42b1a454b..824bcf5ae 100644 --- a/src/BasicGUI/BasicGUI_ArcDlg.h +++ b/src/BasicGUI/BasicGUI_ArcDlg.h @@ -29,18 +29,16 @@ #ifndef DIALOGBOX_ARC_H #define DIALOGBOX_ARC_H +#include "GEOM_BasicGUI.hxx" + #include "GEOMBase_Skeleton.h" #include "DlgRef_3Sel_QTD.h" -#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS -#define BASICGUI_WNT_EXPORT __declspec( dllexport ) -#else -#define BASICGUI_WNT_EXPORT -#endif + //================================================================================= // class : BasicGUI_ArcDlg // purpose : //================================================================================= -class BasicGUI_ArcDlg : public GEOMBase_Skeleton +class GEOM_BASICGUI_EXPORT BasicGUI_ArcDlg : public GEOMBase_Skeleton { Q_OBJECT diff --git a/src/BasicGUI/BasicGUI_CircleDlg.h b/src/BasicGUI/BasicGUI_CircleDlg.h index 3a61f7edf..56ec4925a 100644 --- a/src/BasicGUI/BasicGUI_CircleDlg.h +++ b/src/BasicGUI/BasicGUI_CircleDlg.h @@ -29,26 +29,19 @@ #ifndef DIALOGBOX_CIRCLE_H #define DIALOGBOX_CIRCLE_H +#include "GEOM_BasicGUI.hxx" + #include "GEOMBase_Skeleton.h" #include "DlgRef_2Sel1Spin.h" #include "DlgRef_3Sel_QTD.h" #include "BasicGUI.h" -//#include "GEOM_EdgeFilter.hxx" -//#include "GEOM_ShapeTypeFilter.hxx" -#include -#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS -#define BASICGUI_WNT_EXPORT __declspec( dllexport ) -#else -#define BASICGUI_WNT_EXPORT -#endif - //================================================================================= // class : BasicGUI_CircleDlg // purpose : //================================================================================= -class BasicGUI_CircleDlg : public GEOMBase_Skeleton +class GEOM_BASICGUI_EXPORT BasicGUI_CircleDlg : public GEOMBase_Skeleton { Q_OBJECT diff --git a/src/BasicGUI/BasicGUI_CurveDlg.h b/src/BasicGUI/BasicGUI_CurveDlg.h index c8a501251..e09431ae4 100644 --- a/src/BasicGUI/BasicGUI_CurveDlg.h +++ b/src/BasicGUI/BasicGUI_CurveDlg.h @@ -28,23 +28,19 @@ #ifndef BASICGUI_CURVE_H #define BASICGUI_CURVE_H +#include "GEOM_BasicGUI.hxx" + #include "GEOMBase_Skeleton.h" #include "DlgRef_1Sel_QTD.h" #include "BasicGUI.h" #include -#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS -#define BASICGUI_WNT_EXPORT __declspec( dllexport ) -#else -#define BASICGUI_WNT_EXPORT -#endif -//#include "GEOM_ShapeTypeFilter.hxx" //================================================================================= // class : BasicGUI_CurveDlg // purpose : //================================================================================= -class BasicGUI_CurveDlg : public GEOMBase_Skeleton +class GEOM_BASICGUI_EXPORT BasicGUI_CurveDlg : public GEOMBase_Skeleton { Q_OBJECT diff --git a/src/BasicGUI/BasicGUI_EllipseDlg.h b/src/BasicGUI/BasicGUI_EllipseDlg.h index 86f2cb33e..014070aa6 100644 --- a/src/BasicGUI/BasicGUI_EllipseDlg.h +++ b/src/BasicGUI/BasicGUI_EllipseDlg.h @@ -28,24 +28,18 @@ #ifndef BASICGUI_ELLIPSE_H #define BASICGUI_ELLIPSE_H +#include "GEOM_BasicGUI.hxx" + #include "GEOMBase_Skeleton.h" #include "DlgRef_2Sel2Spin.h" #include "BasicGUI.h" -//#include "GEOM_ShapeTypeFilter.hxx" -//#include "GEOM_EdgeFilter.hxx" -#include -#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS -#define BASICGUI_WNT_EXPORT __declspec( dllexport ) -#else -#define BASICGUI_WNT_EXPORT -#endif //================================================================================= // class : BasicGUI_EllipseDlg // purpose : //================================================================================= -class BasicGUI_EllipseDlg : public GEOMBase_Skeleton +class GEOM_BASICGUI_EXPORT BasicGUI_EllipseDlg : public GEOMBase_Skeleton { Q_OBJECT diff --git a/src/BasicGUI/BasicGUI_LineDlg.h b/src/BasicGUI/BasicGUI_LineDlg.h index 7afed3c4e..943053d74 100644 --- a/src/BasicGUI/BasicGUI_LineDlg.h +++ b/src/BasicGUI/BasicGUI_LineDlg.h @@ -29,20 +29,16 @@ #ifndef DIALOGBOX_LINE_H #define DIALOGBOX_LINE_H +#include "GEOM_BasicGUI.hxx" + #include "GEOMBase_Skeleton.h" #include "DlgRef_2Sel_QTD.h" -#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS -#define BASICGUI_WNT_EXPORT __declspec( dllexport ) -#else -#define BASICGUI_WNT_EXPORT -#endif - //================================================================================= // class : BasicGUI_LineDlg // purpose : //================================================================================= -class BasicGUI_LineDlg : public GEOMBase_Skeleton +class GEOM_BASICGUI_EXPORT BasicGUI_LineDlg : public GEOMBase_Skeleton { Q_OBJECT diff --git a/src/BasicGUI/BasicGUI_MarkerDlg.h b/src/BasicGUI/BasicGUI_MarkerDlg.h index 7b3cf3bde..6d096ac4b 100644 --- a/src/BasicGUI/BasicGUI_MarkerDlg.h +++ b/src/BasicGUI/BasicGUI_MarkerDlg.h @@ -29,6 +29,8 @@ #ifndef DIALOGBOX_Marker_H #define DIALOGBOX_Marker_H +#include "GEOM_BasicGUI.hxx" + #include "GEOMBase_Skeleton.h" #include "DlgRef_1Sel_QTD.h" #include "DlgRef_3Sel_QTD.h" @@ -37,13 +39,7 @@ class DlgRef_SpinBox; -#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS -#define BASICGUI_WNT_EXPORT __declspec( dllexport ) -#else -#define BASICGUI_WNT_EXPORT -#endif - -class BasicGUI_MarkerDlg : public GEOMBase_Skeleton +class GEOM_BASICGUI_EXPORT BasicGUI_MarkerDlg : public GEOMBase_Skeleton { Q_OBJECT diff --git a/src/BasicGUI/BasicGUI_PlaneDlg.h b/src/BasicGUI/BasicGUI_PlaneDlg.h index cf3c65c4b..af874bbcc 100644 --- a/src/BasicGUI/BasicGUI_PlaneDlg.h +++ b/src/BasicGUI/BasicGUI_PlaneDlg.h @@ -29,22 +29,18 @@ #ifndef DIALOGBOX_PLANE_H #define DIALOGBOX_PLANE_H +#include "GEOM_BasicGUI.hxx" + #include "GEOMBase_Skeleton.h" #include "DlgRef_1Sel1Spin.h" #include "DlgRef_2Sel1Spin.h" #include "DlgRef_3Sel1Spin.h" -#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS -#define BASICGUI_WNT_EXPORT __declspec( dllexport ) -#else -#define BASICGUI_WNT_EXPORT -#endif - //================================================================================= // class : BasicGUI_PlaneDlg // purpose : //================================================================================= -class BasicGUI_PlaneDlg : public GEOMBase_Skeleton +class GEOM_BASICGUI_EXPORT BasicGUI_PlaneDlg : public GEOMBase_Skeleton { Q_OBJECT diff --git a/src/BasicGUI/BasicGUI_PointDlg.h b/src/BasicGUI/BasicGUI_PointDlg.h index d05367203..4372cff28 100644 --- a/src/BasicGUI/BasicGUI_PointDlg.h +++ b/src/BasicGUI/BasicGUI_PointDlg.h @@ -29,6 +29,8 @@ #ifndef DIALOGBOX_POINT_H #define DIALOGBOX_POINT_H +#include "GEOM_BasicGUI.hxx" + #include "GEOMBase_Skeleton.h" #include "DlgRef_1Sel1Spin.h" #include "DlgRef_3Spin.h" @@ -37,16 +39,11 @@ class QLineEdit; class QGroupBox; -#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS -#define BASICGUI_WNT_EXPORT __declspec( dllexport ) -#else -#define BASICGUI_WNT_EXPORT -#endif //================================================================================= // class : BasicGUI_PointDlg // purpose : //================================================================================= -class BasicGUI_PointDlg : public GEOMBase_Skeleton +class GEOM_BASICGUI_EXPORT BasicGUI_PointDlg : public GEOMBase_Skeleton { Q_OBJECT diff --git a/src/BasicGUI/BasicGUI_VectorDlg.h b/src/BasicGUI/BasicGUI_VectorDlg.h index 8e87f2b84..04f45957c 100644 --- a/src/BasicGUI/BasicGUI_VectorDlg.h +++ b/src/BasicGUI/BasicGUI_VectorDlg.h @@ -29,23 +29,19 @@ #ifndef DIALOGBOX_VECTOR_H #define DIALOGBOX_VECTOR_H +#include "GEOM_BasicGUI.hxx" + #include "GEOMBase_Skeleton.h" #include "DlgRef_2Sel_QTD.h" #include "DlgRef_3Spin1Check.h" #include "BasicGUI.h" -//#include "GEOM_ShapeTypeFilter.hxx" -#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS -#define BASICGUI_WNT_EXPORT __declspec( dllexport ) -#else -#define BASICGUI_WNT_EXPORT -#endif //================================================================================= // class : BasicGUI_VectorDlg // purpose : //================================================================================= -class BasicGUI_VectorDlg : public GEOMBase_Skeleton +class GEOM_BASICGUI_EXPORT BasicGUI_VectorDlg : public GEOMBase_Skeleton { Q_OBJECT diff --git a/src/BasicGUI/BasicGUI_WorkingPlaneDlg.h b/src/BasicGUI/BasicGUI_WorkingPlaneDlg.h index 4ee7a785d..7f5e945cc 100644 --- a/src/BasicGUI/BasicGUI_WorkingPlaneDlg.h +++ b/src/BasicGUI/BasicGUI_WorkingPlaneDlg.h @@ -28,21 +28,18 @@ #ifndef DIALOGBOX_WORKINGPLANE_H #define DIALOGBOX_WORKINGPLANE_H +#include "GEOM_BasicGUI.hxx" + #include "GEOMBase_Skeleton.h" #include "DlgRef_1Sel_QTD.h" #include "DlgRef_2Sel_QTD.h" #include "DlgRef_3Check_QTD.h" -#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS -#define BASICGUI_WNT_EXPORT __declspec( dllexport ) -#else -#define BASICGUI_WNT_EXPORT -#endif //================================================================================= // class : BasicGUI_WorkingPlaneDlg // purpose : //================================================================================= -class BASICGUI_WNT_EXPORT BasicGUI_WorkingPlaneDlg : public GEOMBase_Skeleton +class GEOM_BASICGUI_EXPORT BASICGUI_WNT_EXPORT BasicGUI_WorkingPlaneDlg : public GEOMBase_Skeleton { Q_OBJECT diff --git a/src/BasicGUI/GEOM_BasicGUI.hxx b/src/BasicGUI/GEOM_BasicGUI.hxx new file mode 100755 index 000000000..ba917e55d --- /dev/null +++ b/src/BasicGUI/GEOM_BasicGUI.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_BasicGUI.hxx +// Author : Alexander A. BORODIN +// Module : GEOM + +#ifndef _GEOM_BasicGUI_HXX_ +#define _GEOM_BasicGUI_HXX_ + +#ifdef WNT + #if defined BASICGUI_EXPORTS + #if defined WIN32 + #define GEOM_BASICGUI_EXPORT __declspec( dllexport ) + #else + #define GEOM_BASICGUI_EXPORT + #endif + #else + #if defined WIN32 + #define GEOM_BASICGUI_EXPORT __declspec( dllimport ) + #else + #define GEOM_BASICGUI_EXPORT + #endif + #endif +#else + #define GEOM_BASICGUI_EXPORT +#endif + +#endif diff --git a/src/BasicGUI/Makefile.in b/src/BasicGUI/Makefile.in index 4bbaaa7f6..331c25944 100644 --- a/src/BasicGUI/Makefile.in +++ b/src/BasicGUI/Makefile.in @@ -62,7 +62,8 @@ LIB_MOC = \ BasicGUI_PlaneDlg.h \ BasicGUI_WorkingPlaneDlg.h \ BasicGUI_CurveDlg.h \ - BasicGUI_MarkerDlg.h + BasicGUI_MarkerDlg.h \ + GEOM_BasicGUI.hxx LIB_CLIENT_IDL = SALOME_GenericObj.idl SALOME_Exception.idl SALOME_Component.idl diff --git a/src/BlocksGUI/BlocksGUI.cxx b/src/BlocksGUI/BlocksGUI.cxx index 30abf2a66..e83aa1739 100644 --- a/src/BlocksGUI/BlocksGUI.cxx +++ b/src/BlocksGUI/BlocksGUI.cxx @@ -126,9 +126,7 @@ bool BlocksGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent ) //===================================================================================== extern "C" { -#ifdef WNT - __declspec( dllexport ) -#endif + GEOM_BLOCKSGUI_EXPORT GEOMGUI* GetLibGUI( GeometryGUI* parent ) { return BlocksGUI::GetBlocksGUI( parent ); diff --git a/src/BlocksGUI/BlocksGUI.h b/src/BlocksGUI/BlocksGUI.h index eab79022e..043834d8d 100644 --- a/src/BlocksGUI/BlocksGUI.h +++ b/src/BlocksGUI/BlocksGUI.h @@ -28,13 +28,15 @@ #ifndef BLOCKSGUI_H #define BLOCKSGUI_H +#include "GEOM_BlocksGUI.hxx" + #include "GEOMGUI.h" //================================================================================= // class : BlocksGUI // purpose : //================================================================================= -class BlocksGUI : public GEOMGUI +class GEOM_BLOCKSGUI_EXPORT BlocksGUI : public GEOMGUI { protected: BlocksGUI( GeometryGUI* parent ); // hide constructor to avoid direct creation diff --git a/src/BlocksGUI/BlocksGUI_BlockDlg.h b/src/BlocksGUI/BlocksGUI_BlockDlg.h index 567538c32..eafe79918 100644 --- a/src/BlocksGUI/BlocksGUI_BlockDlg.h +++ b/src/BlocksGUI/BlocksGUI_BlockDlg.h @@ -28,6 +28,8 @@ #ifndef DIALOGBOX_BLOCK_H #define DIALOGBOX_BLOCK_H +#include "GEOM_BlocksGUI.hxx" + #include "GEOMBase_Skeleton.h" #include "DlgRef_2Sel_QTD.h" #include "DlgRef_6Sel_QTD.h" @@ -37,7 +39,7 @@ // class : BlocksGUI_BlockDlg // purpose : //================================================================================= -class BlocksGUI_BlockDlg : public GEOMBase_Skeleton +class GEOM_BLOCKSGUI_EXPORT BlocksGUI_BlockDlg : public GEOMBase_Skeleton { Q_OBJECT diff --git a/src/BlocksGUI/BlocksGUI_ExplodeDlg.h b/src/BlocksGUI/BlocksGUI_ExplodeDlg.h index 7c83e73bf..d8a7993e9 100644 --- a/src/BlocksGUI/BlocksGUI_ExplodeDlg.h +++ b/src/BlocksGUI/BlocksGUI_ExplodeDlg.h @@ -28,6 +28,8 @@ #ifndef DIALOGBOX_BLOCK_EXPLODE_H #define DIALOGBOX_BLOCK_EXPLODE_H +#include "GEOM_BlocksGUI.hxx" + #include "GEOMBase_Skeleton.h" class DlgRef_SpinBox; @@ -38,7 +40,7 @@ class QCheckBox; // class : BlocksGUI_ExplodeDlg // purpose : //================================================================================= -class BlocksGUI_ExplodeDlg : public GEOMBase_Skeleton +class GEOM_BLOCKSGUI_EXPORT BlocksGUI_ExplodeDlg : public GEOMBase_Skeleton { Q_OBJECT diff --git a/src/BlocksGUI/BlocksGUI_PropagateDlg.h b/src/BlocksGUI/BlocksGUI_PropagateDlg.h index db860194b..e0efe4271 100644 --- a/src/BlocksGUI/BlocksGUI_PropagateDlg.h +++ b/src/BlocksGUI/BlocksGUI_PropagateDlg.h @@ -29,6 +29,8 @@ #ifndef DIALOGBOX_BlocksGUI_PropagateDlg_H #define DIALOGBOX_BlocksGUI_PropagateDlg_H +#include "GEOM_BlocksGUI.hxx" + #include "GEOMBase_Skeleton.h" @@ -36,7 +38,7 @@ // class : BlocksGUI_PropagateDlg // purpose : //================================================================================= -class BlocksGUI_PropagateDlg : public GEOMBase_Skeleton +class GEOM_BLOCKSGUI_EXPORT BlocksGUI_PropagateDlg : public GEOMBase_Skeleton { Q_OBJECT diff --git a/src/BlocksGUI/BlocksGUI_QuadFaceDlg.h b/src/BlocksGUI/BlocksGUI_QuadFaceDlg.h index 0df8ae01c..42a8c3944 100644 --- a/src/BlocksGUI/BlocksGUI_QuadFaceDlg.h +++ b/src/BlocksGUI/BlocksGUI_QuadFaceDlg.h @@ -28,13 +28,15 @@ #ifndef DIALOGBOX_QUAD_FACE_H #define DIALOGBOX_QUAD_FACE_H +#include "GEOM_BlocksGUI.hxx" + #include "GEOMBase_Skeleton.h" //================================================================================= // class : BlocksGUI_QuadFaceDlg // purpose : //================================================================================= -class BlocksGUI_QuadFaceDlg : public GEOMBase_Skeleton +class GEOM_BLOCKSGUI_EXPORT BlocksGUI_QuadFaceDlg : public GEOMBase_Skeleton { Q_OBJECT diff --git a/src/BlocksGUI/BlocksGUI_TrsfDlg.h b/src/BlocksGUI/BlocksGUI_TrsfDlg.h index a5bdc30d6..92688039b 100644 --- a/src/BlocksGUI/BlocksGUI_TrsfDlg.h +++ b/src/BlocksGUI/BlocksGUI_TrsfDlg.h @@ -28,6 +28,10 @@ #ifndef DIALOGBOX_BLOCK_MULTITRSF_H #define DIALOGBOX_BLOCK_MULTITRSF_H +#include "GEOM_BlocksGUI.hxx" + +#include "GEOM_BasicGUI.hxx" + #include "GEOMBase_Skeleton.h" class DlgRef_SpinBox; @@ -36,7 +40,7 @@ class DlgRef_SpinBox; // class : BlocksGUI_TrsfDlg // purpose : //================================================================================= -class BlocksGUI_TrsfDlg : public GEOMBase_Skeleton +class GEOM_BLOCKSGUI_EXPORT BlocksGUI_TrsfDlg : public GEOMBase_Skeleton { Q_OBJECT diff --git a/src/BlocksGUI/GEOM_BlocksGUI.hxx b/src/BlocksGUI/GEOM_BlocksGUI.hxx new file mode 100755 index 000000000..4471a8a61 --- /dev/null +++ b/src/BlocksGUI/GEOM_BlocksGUI.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_BlocksGUI.hxx +// Author : Alexander A. BORODIN +// Module : GEOM + +#ifndef _GEOM_BlocksGUI_HXX_ +#define _GEOM_BlocksGUI_HXX_ + +#ifdef WNT + #if defined BLOCKSGUI_EXPORTS + #if defined WIN32 + #define GEOM_BLOCKSGUI_EXPORT __declspec( dllexport ) + #else + #define GEOM_BLOCKSGUI_EXPORT + #endif + #else + #if defined WIN32 + #define GEOM_BLOCKSGUI_EXPORT __declspec( dllimport ) + #else + #define GEOM_BLOCKSGUI_EXPORT + #endif + #endif +#else + #define GEOM_BASICGUI_EXPORT +#endif + +#endif diff --git a/src/BlocksGUI/Makefile.in b/src/BlocksGUI/Makefile.in index 99cbd1e09..d7f2af03f 100644 --- a/src/BlocksGUI/Makefile.in +++ b/src/BlocksGUI/Makefile.in @@ -52,7 +52,8 @@ LIB_MOC = \ BlocksGUI_BlockDlg.h \ BlocksGUI_ExplodeDlg.h \ BlocksGUI_PropagateDlg.h \ - BlocksGUI_TrsfDlg.h + BlocksGUI_TrsfDlg.h \ + GEOM_BlocksGUI.hxx LIB_CLIENT_IDL = SALOME_Exception.idl SALOME_GenericObj.idl SALOME_Component.idl -- 2.39.2