Windows porting

diff --git a/src/BasicGUI/BasicGUI.cxx b/src/BasicGUI/BasicGUI.cxx
index b7ffcbf1854606d6dfd25ceddd192a80ceb738d9..31217bc6476f47676dc1c780803c8c91f36d474d 100644 (file)
--- a/src/BasicGUI/BasicGUI.cxx
+++ b/src/BasicGUI/BasicGUI.cxx
@@ -26,7 +26,6 @@
 //  Module : GEOM
 //  $Header$
 
-using namespace std;
 #include "BasicGUI.h"
 #include "GeometryGUI.h"
 
@@ -56,6 +55,8 @@ using namespace std;
 #include "BasicGUI_WorkingPlaneDlg.h" // Method WORKING PLANE
 #include "BasicGUI_MarkerDlg.h"       // Method REPAIR
 
+using namespace std;
+
 BasicGUI* BasicGUI::myGUIObject = 0;
 
 //=======================================================================

diff --git a/src/BasicGUI/BasicGUI.h b/src/BasicGUI/BasicGUI.h
index 29fbf1fe3ec13f223f228b7e295784b63ff3a5d1..a2cd25a6f430036f18e84312ae33a2f1b8dbd321 100644 (file)
--- a/src/BasicGUI/BasicGUI.h
+++ b/src/BasicGUI/BasicGUI.h
@@ -34,6 +34,11 @@
 #include <V3d_View.hxx>
 
 
+#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS
+#define BASICGUI_WNT_EXPORT __declspec( dllexport )
+#else
+#define BASICGUI_WNT_EXPORT
+#endif
 //=================================================================================
 // class    : BasicGUI
 // purpose  :

diff --git a/src/BasicGUI/BasicGUI_ArcDlg.h b/src/BasicGUI/BasicGUI_ArcDlg.h
index f57313872df35a2e71fe75fd155e39cc2e67e4c7..42b1a454b6399b85be5bde250b086b1b6857b42d 100644 (file)
--- a/src/BasicGUI/BasicGUI_ArcDlg.h
+++ b/src/BasicGUI/BasicGUI_ArcDlg.h
@@ -31,7 +31,11 @@
 
 #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  : 

diff --git a/src/BasicGUI/BasicGUI_CircleDlg.h b/src/BasicGUI/BasicGUI_CircleDlg.h
index 69fc638b1d54e93617a9bd5bc082963b4a8e73d8..3a61f7edfb35942929e98d69dd6f65c752cc277e 100644 (file)
--- a/src/BasicGUI/BasicGUI_CircleDlg.h
+++ b/src/BasicGUI/BasicGUI_CircleDlg.h
@@ -38,7 +38,11 @@
 //#include "GEOM_EdgeFilter.hxx"
 //#include "GEOM_ShapeTypeFilter.hxx"
 #include <gp_Dir.hxx>
-
+#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS
+#define BASICGUI_WNT_EXPORT __declspec( dllexport )
+#else
+#define BASICGUI_WNT_EXPORT
+#endif
 
 //=================================================================================
 // class    : BasicGUI_CircleDlg

diff --git a/src/BasicGUI/BasicGUI_CurveDlg.h b/src/BasicGUI/BasicGUI_CurveDlg.h
index a54e07dd4c69a50ba745e38fbdb8b70bf0d143c2..623d35570467205899af17a5c00b40fe2ea7279b 100644 (file)
--- a/src/BasicGUI/BasicGUI_CurveDlg.h
+++ b/src/BasicGUI/BasicGUI_CurveDlg.h
@@ -32,7 +32,11 @@
 #include "DlgRef_1Sel_QTD.h"
 
 #include "BasicGUI.h"
-
+#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"
 
 //=================================================================================

diff --git a/src/BasicGUI/BasicGUI_EllipseDlg.h b/src/BasicGUI/BasicGUI_EllipseDlg.h
index 8a1dcf8412bfb78490c681f40d7a682a2e3deac9..86f2cb33e6587af781cc41df2be593b7210d4396 100644 (file)
--- a/src/BasicGUI/BasicGUI_EllipseDlg.h
+++ b/src/BasicGUI/BasicGUI_EllipseDlg.h
@@ -36,7 +36,11 @@
 //#include "GEOM_ShapeTypeFilter.hxx"
 //#include "GEOM_EdgeFilter.hxx"
 #include <gp_Dir.hxx>
-
+#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  :

diff --git a/src/BasicGUI/BasicGUI_LineDlg.h b/src/BasicGUI/BasicGUI_LineDlg.h
index 92d373c998f4fd51558571d4971cc0a3d04f54d2..7afed3c4ee63508cf5deabbd402c6a30024b992b 100644 (file)
--- a/src/BasicGUI/BasicGUI_LineDlg.h
+++ b/src/BasicGUI/BasicGUI_LineDlg.h
@@ -32,6 +32,11 @@
 #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

diff --git a/src/BasicGUI/BasicGUI_MarkerDlg.h b/src/BasicGUI/BasicGUI_MarkerDlg.h
index 2f76d8063528dd0d8fc33cbcb01c01bb1aa7b5ca..7b3cf3bde3beb15a052166684d689325460801fe 100644 (file)
--- a/src/BasicGUI/BasicGUI_MarkerDlg.h
+++ b/src/BasicGUI/BasicGUI_MarkerDlg.h
@@ -37,6 +37,12 @@
 
 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
 {
   Q_OBJECT

diff --git a/src/BasicGUI/BasicGUI_PlaneDlg.h b/src/BasicGUI/BasicGUI_PlaneDlg.h
index ba4f50f053693c67f113374dec305d6ba353cc02..cf3c65c4b8a750ecad31c56bb4210af7f3914562 100644 (file)
--- a/src/BasicGUI/BasicGUI_PlaneDlg.h
+++ b/src/BasicGUI/BasicGUI_PlaneDlg.h
@@ -34,6 +34,11 @@
 #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

diff --git a/src/BasicGUI/BasicGUI_PointDlg.cxx b/src/BasicGUI/BasicGUI_PointDlg.cxx
index 97f3f71d8b9d3674ad09e17cf661387e64caa387..29b7bf62e30dc7057753ddd0e8932d5728409c85 100644 (file)
--- a/src/BasicGUI/BasicGUI_PointDlg.cxx
+++ b/src/BasicGUI/BasicGUI_PointDlg.cxx
@@ -26,7 +26,6 @@
 //  Module : GEOM
 //  $Header$
 
-using namespace std;
 #include "BasicGUI_PointDlg.h"
 
 #include "SUIT_Session.h"
@@ -47,7 +46,7 @@ using namespace std;
 #include <BRep_Tool.hxx>
 
 #include <qapplication.h>
-
+using namespace std;
 //=================================================================================
 // class    : BasicGUI_PointDlg()
 // purpose  : Constructs a BasicGUI_PointDlg which is a child of 'parent', with the 

diff --git a/src/BasicGUI/BasicGUI_PointDlg.h b/src/BasicGUI/BasicGUI_PointDlg.h
index f149f816aa4ba8ef3ac45d777f1956d18c4d84ba..d053672031343eab2224ab1c5bd167ca44714fe8 100644 (file)
--- a/src/BasicGUI/BasicGUI_PointDlg.h
+++ b/src/BasicGUI/BasicGUI_PointDlg.h
@@ -37,6 +37,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  :

diff --git a/src/BasicGUI/BasicGUI_VectorDlg.cxx b/src/BasicGUI/BasicGUI_VectorDlg.cxx
index 2dc5bd6e1dc981efcc368bccd2de0e024f881092..3581fca1a88cd9b8d5da165cba2fe2a585d8b570 100644 (file)
--- a/src/BasicGUI/BasicGUI_VectorDlg.cxx
+++ b/src/BasicGUI/BasicGUI_VectorDlg.cxx
@@ -26,7 +26,6 @@
 //  Module : GEOM
 //  $Header$
 
-using namespace std;
 #include "BasicGUI_VectorDlg.h"
 
 #include "SUIT_Desktop.h"
@@ -40,6 +39,8 @@ using namespace std;
 
 #include "utilities.h"
 
+using namespace std;
+
 //=================================================================================
 // class    : BasicGUI_VectorDlg()
 // purpose  : Constructs a BasicGUI_VectorDlg which is a child of 'parent', with the 

diff --git a/src/BasicGUI/BasicGUI_VectorDlg.h b/src/BasicGUI/BasicGUI_VectorDlg.h
index 76bd9b8be9fc7b71283df06ad07489575673976d..8e87f2b84011117756d6025344579bda7c796ff3 100644 (file)
--- a/src/BasicGUI/BasicGUI_VectorDlg.h
+++ b/src/BasicGUI/BasicGUI_VectorDlg.h
@@ -36,6 +36,11 @@
 #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  :

diff --git a/src/BasicGUI/BasicGUI_WorkingPlaneDlg.cxx b/src/BasicGUI/BasicGUI_WorkingPlaneDlg.cxx
index 7aa6b1a309ed13aec90baf66771ec6d6927f395a..cf56ed78cce9c73e67cde46bbc99ac4eafcc63d5 100644 (file)
--- a/src/BasicGUI/BasicGUI_WorkingPlaneDlg.cxx
+++ b/src/BasicGUI/BasicGUI_WorkingPlaneDlg.cxx
@@ -25,7 +25,6 @@
 //  Author : Lucien PIGNOLONI
 //  Module : GEOM
 
-using namespace std;
 #include "BasicGUI_WorkingPlaneDlg.h"
 
 #include "GEOMBase.h"
@@ -53,6 +52,8 @@ using namespace std;
 #include <qcheckbox.h>
 #include <qlabel.h>
 
+using namespace std;
+
 //=================================================================================
 // class    : BasicGUI_WorkingPlaneDlg()
 // purpose  : Constructs a BasicGUI_WorkingPlaneDlg which is a child of 'parent', with the

diff --git a/src/BasicGUI/BasicGUI_WorkingPlaneDlg.h b/src/BasicGUI/BasicGUI_WorkingPlaneDlg.h
index 522631f57a3f1dc4fe707218983234b3e8f318f2..4ee7a785dbbe0e1995664908aafd35699b358843 100644 (file)
--- a/src/BasicGUI/BasicGUI_WorkingPlaneDlg.h
+++ b/src/BasicGUI/BasicGUI_WorkingPlaneDlg.h
@@ -33,19 +33,22 @@
 #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_WorkingPlaneDlg : public GEOMBase_Skeleton
+class BASICGUI_WNT_EXPORT BasicGUI_WorkingPlaneDlg : public GEOMBase_Skeleton
 { 
     Q_OBJECT
 
 public:
     BasicGUI_WorkingPlaneDlg( GeometryGUI* theGeometryGUI, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
     ~BasicGUI_WorkingPlaneDlg();
-    
     virtual void closeEvent( QCloseEvent* e );
 
 private:

diff --git a/src/DisplayGUI/DisplayGUI.h b/src/DisplayGUI/DisplayGUI.h
index 7c96393f2e77f6edcc150fbe5cbe93a74c2576c3..64bfd1e1f3e8f9613f93366fe7c1089d1d7dbf4e 100644 (file)
--- a/src/DisplayGUI/DisplayGUI.h
+++ b/src/DisplayGUI/DisplayGUI.h
@@ -31,10 +31,15 @@
 
 #include "GEOMGUI.h"
 #include "GEOMBase.h"
-#ifdef WNT
-#include <SALOME_WNT.hxx>
+//#ifdef WNT
+//#include <SALOME_WNT.hxx>
+//#else
+//#define SALOME_WNT_EXPORT
+//#endif
+#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS
+#define DISPLAYGUI_WNT_EXPORT __declspec( dllexport )
 #else
-#define SALOME_WNT_EXPORT
+#define DISPLAYGUI_WNT_EXPORT
 #endif
 //=================================================================================
 // class    : GEOMBase_Display

diff --git a/src/GEOMBase/GEOMBase.h b/src/GEOMBase/GEOMBase.h
index e26eacab1e1bb96c6d2b185d6aa32321c8524345..c118ac7370cc11de203d6c794e422db481af11ad 100644 (file)
--- a/src/GEOMBase/GEOMBase.h
+++ b/src/GEOMBase/GEOMBase.h
@@ -40,6 +40,17 @@
 
 // QT Includes
 #include <qstring.h>
+//#if defined WNT
+//#include <SALOME_WNT.hxx>
+//#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;
@@ -51,7 +62,7 @@ class QWidget;
 // class    : GEOMBase
 // purpose  :
 //=================================================================================
-class GEOMBase
+class GEOMBASE_WNT_EXPORT GEOMBase
 {
 public :
   GEOMBase();

diff --git a/src/GEOMBase/GEOMBase_Helper.h b/src/GEOMBase/GEOMBase_Helper.h
index ac07a3ede14c0a5a6c8708f786f0624e610968e8..1cf601cb432ea97bca86bb6e648a166800bb725c 100755 (executable)
--- a/src/GEOMBase/GEOMBase_Helper.h
+++ b/src/GEOMBase/GEOMBase_Helper.h
@@ -38,7 +38,16 @@
 #include <qstring.h>
 
 #include <list>
-
+//#if defined WNT 
+//#include <SALOME_WNT.hxx>
+//#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<GEOM::GEOM_Object_ptr> ObjectList;
 
 class SalomeApp_Study;
@@ -55,7 +64,7 @@ class TColStd_MapOfInteger;
 //               performing common operations (display/erase, selection activation,
 //               publication in a study, transaction management)
 //================================================================
-class GEOMBase_Helper
+class GEOMBASE_WNT_EXPORT GEOMBase_Helper
 {
 public:
   GEOMBase_Helper( SUIT_Desktop* );

diff --git a/src/GEOMBase/GEOMBase_Skeleton.h b/src/GEOMBase/GEOMBase_Skeleton.h
index a4ae0b4dae3c58eb5c3b493ccc9395b2169df869..1d3144cc389a6f79fc24243a99c7a7484f082b38 100644 (file)
--- a/src/GEOMBase/GEOMBase_Skeleton.h
+++ b/src/GEOMBase/GEOMBase_Skeleton.h
@@ -42,14 +42,25 @@
 #include <qpushbutton.h>
 #include <qradiobutton.h>
 #include <qbuttongroup.h>
+//#if defined WNT
+//#include <SALOME_WNT.hxx>
+//#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_Skeleton : public DlgRef_Skeleton_QTD, public GEOMBase_Helper
+class GEOMBASE_WNT_EXPORT GEOMBase_Skeleton : public DlgRef_Skeleton_QTD, public GEOMBase_Helper
 { 
     Q_OBJECT
 
 public:
     GEOMBase_Skeleton(QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0);
     ~GEOMBase_Skeleton();
+//    int getConstructorId() const; // returns id of a selected "constructor" radio button or '-1' in case of error
 
 private :
     void Init();

diff --git a/src/GEOMBase/GEOM_Operation.h b/src/GEOMBase/GEOM_Operation.h
index 6145a31d4a9432cefc10119201b5a6ae78a8f19b..426de887d7bc87dbb9f62affcfe9e983a128c860 100644 (file)
--- a/src/GEOMBase/GEOM_Operation.h
+++ b/src/GEOMBase/GEOM_Operation.h
@@ -31,9 +31,11 @@
 
 #include "SUIT_Operation.h"
 #include <SALOMEconfig.h>
+#include <Standard_Macro.hxx>
 #include CORBA_CLIENT_HEADER(GEOM_Gen)
 
-class GEOM_Operation : public SUIT_Operation
+
+class Standard_EXPORT GEOM_Operation : public SUIT_Operation
 {
 public:
   GEOM_Operation( SUIT_Application*, GEOM::GEOM_IOperations_ptr );

diff --git a/src/GEOMClient/GEOM_Client.cxx b/src/GEOMClient/GEOM_Client.cxx
index 208f52e0eb08251f1375ac7cda09da63359b7854..1bdf7482c72a253d6669ac7dc826d65ab615011a 100644 (file)
--- a/src/GEOMClient/GEOM_Client.cxx
+++ b/src/GEOMClient/GEOM_Client.cxx
@@ -28,6 +28,8 @@
 
 #include <Standard_Stream.hxx>
 
+#include <Standard_Stream.hxx>
+
 #include <strstream>
 
 #include "GEOM_Client.hxx"

diff --git a/src/GEOMClient/GEOM_Client.hxx b/src/GEOMClient/GEOM_Client.hxx
index 0dd255d35edf0106d4440fd4a0529f9080b40d43..fd6087b93489c28ff466fbf97326a41d4ad11da1 100644 (file)
--- a/src/GEOMClient/GEOM_Client.hxx
+++ b/src/GEOMClient/GEOM_Client.hxx
@@ -51,11 +51,16 @@ class TopoDS_Shape;
 #ifndef _Standard_Macro_HeaderFile
 #include <Standard_Macro.hxx>
 #endif
+#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS
+#define GEOMCLIENT_WNT_EXPORT __declspec( dllexport )
+#else
+#define GEOMCLIENT_WNT_EXPORT
+#endif
 
 //=====================================================================
 // GEOM_Client : class definition
 //=====================================================================
-class GEOM_Client  {
+class GEOMCLIENT_WNT_EXPORT GEOM_Client  {
 
 public:
   
@@ -73,15 +78,24 @@ public:
   }
   // Methods PUBLIC
   // 
-  Standard_EXPORT   GEOM_Client();
-  Standard_EXPORT   GEOM_Client(Engines::Container_ptr client);
-  Standard_EXPORT   Standard_Integer Find( const TCollection_AsciiString& IOR, TopoDS_Shape& S ) ;
-  Standard_EXPORT   Standard_Integer Find( const TopoDS_Shape& S, TCollection_AsciiString& IOR ) ;
-  Standard_EXPORT   void Bind( const TCollection_AsciiString& IOR, const TopoDS_Shape& S ) ;
-  Standard_EXPORT   TopoDS_Shape GetShape( GEOM::GEOM_Gen_ptr geom, GEOM::GEOM_Object_ptr aShape );
-  Standard_EXPORT   void RemoveShapeFromBuffer( const TCollection_AsciiString& IOR ) ;
-  Standard_EXPORT   void ClearClientBuffer() ;
-  Standard_EXPORT   unsigned int BufferLength() ;
+   //Standard_EXPORT   
+  GEOM_Client();
+  //Standard_EXPORT   
+  GEOM_Client(Engines::Container_ptr client);
+  //Standard_EXPORT   
+  Standard_Integer Find( const TCollection_AsciiString& IOR, TopoDS_Shape& S ) ;
+  //Standard_EXPORT   
+  Standard_Integer Find( const TopoDS_Shape& S, TCollection_AsciiString& IOR ) ;
+  //Standard_EXPORT   
+  void Bind( const TCollection_AsciiString& IOR, const TopoDS_Shape& S ) ;
+  //Standard_EXPORT   
+  TopoDS_Shape GetShape( GEOM::GEOM_Gen_ptr geom, GEOM::GEOM_Object_ptr aShape );
+  //Standard_EXPORT   
+  void RemoveShapeFromBuffer( const TCollection_AsciiString& IOR ) ;
+  //Standard_EXPORT   
+  void ClearClientBuffer() ;
+  //Standard_EXPORT   
+  unsigned int BufferLength() ;
   TopoDS_Shape Load( GEOM::GEOM_Gen_ptr geom, GEOM::GEOM_Object_ptr aShape);
 
 private: 

diff --git a/src/GEOMGUI/GEOMGUI.h b/src/GEOMGUI/GEOMGUI.h
index d0a740f4be363cdf05f316d7bd6883f6e6e5338f..69a9bb66340fa7544d2df41314c4bcf0d30349ab 100644 (file)
--- a/src/GEOMGUI/GEOMGUI.h
+++ b/src/GEOMGUI/GEOMGUI.h
@@ -37,11 +37,21 @@ class QMouseEvent;
 class QKeyEvent;
 class GeometryGUI;
 
+//#ifdef WNT
+//#include <SALOME_WNT.hxx>
+//#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 : public QObject
+class GEOMGUI_WNT_EXPORT GEOMGUI : public QObject
 {
 public :
   // Constructor

diff --git a/src/GEOMGUI/GEOM_Displayer.h b/src/GEOMGUI/GEOM_Displayer.h
index ea2958a01072ad51788b747be0d5064336746a6c..18be72e3114b7e6b31d3724fe454822f30bfd420 100644 (file)
--- a/src/GEOMGUI/GEOM_Displayer.h
+++ b/src/GEOMGUI/GEOM_Displayer.h
@@ -52,14 +52,18 @@ class SalomeApp_SelectionMgr;
 class SalomeApp_Study;
 class SUIT_SelectionFilter;
 //class SALOME_Selection;
-
-#ifdef WNT
-#include <SALOME_WNT.hxx>
+//#ifdef WNT
+//#include <SALOME_WNT.hxx>
+//#else
+//#define SALOME_WNT_EXPORT
+//#endif
+#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS
+#define GEOMGUI_WNT_EXPORT __declspec( dllexport )
 #else
-#define SALOME_WNT_EXPORT
+#define GEOMGUI_WNT_EXPORT
 #endif
 
-class SALOME_WNT_EXPORT GEOM_Displayer : public SALOME_Displayer
+class GEOMGUI_WNT_EXPORT GEOM_Displayer : public SALOME_Displayer
 {
     
 public:

diff --git a/src/GEOMGUI/GeometryGUI.cxx b/src/GEOMGUI/GeometryGUI.cxx
index 2e1b295e8546761198e652c33dca561e778c2a63..166e56ab3917745473c156bd6c7f39fb44697805 100644 (file)
--- a/src/GEOMGUI/GeometryGUI.cxx
+++ b/src/GEOMGUI/GeometryGUI.cxx
@@ -67,14 +67,19 @@
 #include <vtkCamera.h>
 #include <vtkRenderer.h>
 
+
 extern "C" {
   Standard_EXPORT CAM_Module* createModule() {
     return new GeometryGUI();
   }
 }
 
+
+
 GEOM::GEOM_Gen_var GeometryGUI::myComponentGeom = GEOM::GEOM_Gen::_nil(); 
 
+GEOM::GEOM_Gen_var   GeometryGUI::GetGeomGen()        { return GeometryGUI::myComponentGeom; }
+
 bool GeometryGUI::InitGeomGen() 
 {
   GeometryGUI aGG;

diff --git a/src/GEOMGUI/GeometryGUI.h b/src/GEOMGUI/GeometryGUI.h
index 860cd795caee3826cbb4169a2cfc78d353104806..854dbc615d018133a7fb06b19d02fd4c88149a4a 100644 (file)
--- a/src/GEOMGUI/GeometryGUI.h
+++ b/src/GEOMGUI/GeometryGUI.h
@@ -53,6 +53,18 @@
 #define SALOME_WNT_EXPORT
 #endif
 
+//#if defined WNT 
+//#include <SALOME_WNT.hxx>
+//#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<QString, GEOMGUI*> GUIMap;
 
 class QDialog;
@@ -61,12 +73,11 @@ class GEOMGUI_OCCSelector;
 class SalomeApp_VTKSelector;
 class SUIT_ViewManager;
 
-
 //=================================================================================
 // class    : GeometryGUI
 // purpose  :
 //=================================================================================
-class SALOME_WNT_EXPORT GeometryGUI : public SalomeApp_Module
+class  GEOMGUI_WNT_EXPORT GeometryGUI : public SalomeApp_Module
 {
   Q_OBJECT;
 
@@ -82,7 +93,7 @@ public:
 
   static bool                 InitGeomGen();   //BugID IPAL9186: SRN: To be called by Python scripts
 
-  static GEOM::GEOM_Gen_var   GetGeomGen()        { return myComponentGeom; }
+  static  GEOM::GEOM_Gen_var  GetGeomGen();//        { return GeometryGUI::myComponentGeom; }
 
   static CORBA::Object_var    ClientSObjectToObject (_PTR(SObject) theSObject);
   static SALOMEDS::Study_var  ClientStudyToStudy (_PTR(Study) theStudy);
@@ -157,9 +168,9 @@ private:
                                               const bool isExpandAll = false, const bool isOCC = false,
                                               const int parentId = -1 );
 
-private:
-  static GEOM::GEOM_Gen_var   myComponentGeom;   // GEOM engine
-
+public:
+  static GEOM::GEOM_Gen_var   myComponentGeom;   // GEOM engine!!!
+private:  
   GUIMap                      myGUIMap;          // GUI libraries map
   QDialog*                    myActiveDialogBox; // active dialog box
   GEOM_Client                 myShapeReader;     // geom shape reader