X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGEOMClient%2FGEOM_Client.hxx;h=161fcc1051ae5ca61dc1822d7cf644e7f04a2d8f;hb=8999793a64e88dc19aba9ae983ee3c8848cd20d1;hp=09d4351b7d4782709bef7eae208dfd7103009bd4;hpb=0f1369c27fd6a84ba1149c3c5f3ed181acc055f1;p=modules%2Fgeom.git

diff --git a/src/GEOMClient/GEOM_Client.hxx b/src/GEOMClient/GEOM_Client.hxx
index 09d4351b7..161fcc105 100644
--- a/src/GEOMClient/GEOM_Client.hxx
+++ b/src/GEOMClient/GEOM_Client.hxx
@@ -17,7 +17,7 @@
 //  License along with this library; if not, write to the Free Software 
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
 // 
-//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //
 //
@@ -30,7 +30,6 @@
 #define _GEOM_Client_HeaderFile
 
 #include <SALOMEconfig.h>
-#include CORBA_SERVER_HEADER(GEOM_Shape)
 #include CORBA_SERVER_HEADER(GEOM_Gen)
 #
 #ifndef _TColStd_SequenceOfAsciiString_HeaderFile
@@ -53,10 +52,28 @@ class TopoDS_Shape;
 #include <Standard_Macro.hxx>
 #endif
 
+#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_EXPORT
+#endif
+
 //=====================================================================
 // GEOM_Client : class definition
 //=====================================================================
-class GEOM_Client  {
+class GEOMCLIENT_EXPORT GEOM_Client  {
 
 public:
   
@@ -74,19 +91,32 @@ public:
   }
   // Methods PUBLIC
   // 
-  Standard_EXPORT   GEOM_Client();
-  Standard_EXPORT   Standard_Integer Find( const TCollection_AsciiString& ShapeIOR, TopoDS_Shape& S ) ;
-  Standard_EXPORT   void Bind( const TCollection_AsciiString& ShapeIOR, const TopoDS_Shape& S ) ;
-  Standard_EXPORT   TopoDS_Shape GetShape( GEOM::GEOM_Gen_ptr geom, GEOM::GEOM_Shape_ptr aShape );
-  Standard_EXPORT   void RemoveShapeFromBuffer( const TCollection_AsciiString& shapeIOR ) ;
-  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: 
   // Fields PRIVATE
   //
   TColStd_SequenceOfAsciiString myIORs ;
   TopTools_SequenceOfShape myShapes ;
+  long  pid_client;
 };