From: admin <salome-admin@opencascade.com>
Date: Wed, 24 Nov 2004 11:26:23 +0000 (+0000)
Subject: Merge with PAL/SALOME 2.1.0d
X-Git-Tag: OCC-V2_1_0d
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2FPAL_OCC;p=modules%2Fvisu.git

Merge with PAL/SALOME 2.1.0d
---

diff --git a/resources/VISUCatalog.xml b/resources/VISUCatalog.xml
index 46eb84b2..7c59871e 100644
--- a/resources/VISUCatalog.xml
+++ b/resources/VISUCatalog.xml
@@ -16,7 +16,7 @@
 		<component-username>Post-Pro</component-username>
 		<component-type>VISU</component-type>
 		<component-author>NRI</component-author>
-		<component-version> 1.0</component-version>
+		<component-version>2.1.0</component-version>
 		<component-comment>Visu component - Maquette septembre</component-comment>
 		<component-multistudy>1</component-multistudy>
 		<component-icone>ModuleVisu.png</component-icone>
diff --git a/src/ENGINE/Makefile.in b/src/ENGINE/Makefile.in
index 320f6a4b..d26a08ba 100644
--- a/src/ENGINE/Makefile.in
+++ b/src/ENGINE/Makefile.in
@@ -24,7 +24,7 @@ LIB_MOC =
 LIB_SERVER_IDL = VISU_Gen.idl SALOME_Component.idl \
                  SALOME_Exception.idl SALOME_GenericObj.idl \
                  SALOME_Session.idl MED.idl
-LIB_CLIENT_IDL = SALOMEDS.idl SALOMEDS_Attributes.idl
+LIB_CLIENT_IDL = SALOMEDS.idl SALOMEDS_Attributes.idl SALOME_Comm.idl
 
 # Executables targets
 BIN = 
diff --git a/src/VISUGUI/Makefile.in b/src/VISUGUI/Makefile.in
index 10727700..cb4b2705 100644
--- a/src/VISUGUI/Makefile.in
+++ b/src/VISUGUI/Makefile.in
@@ -83,7 +83,8 @@ LIB_CLIENT_IDL = SALOME_Exception.idl \
 		 SALOMEDS.idl \
 		 SALOME_ModuleCatalog.idl \
 		 SALOME_Component.idl \
-                 SALOMEDS_Attributes.idl \
+		 SALOMEDS_Attributes.idl \
+		 SALOME_Comm.idl
 
 LIB_SERVER_IDL = 
 
diff --git a/src/VISUGUI/VisuGUI.cxx b/src/VISUGUI/VisuGUI.cxx
index 42f213b3..eb81af8a 100644
--- a/src/VISUGUI/VisuGUI.cxx
+++ b/src/VISUGUI/VisuGUI.cxx
@@ -3140,7 +3140,8 @@ bool VisuGUI::CustomPopup(QAD_Desktop* parent, QPopupMenu* thePopup, const QStri
 //===========================================================================
 // BuildPresentation
 //===========================================================================
-void VisuGUI::BuildPresentation(const Handle(SALOME_InteractiveObject)& theIO)
+void VisuGUI::BuildPresentation( const Handle(SALOME_InteractiveObject)& theIO,
+                                 QAD_ViewFrame* )
 {
   BEGIN_OF("VisuGUI::BuildPresentation");
 
diff --git a/src/VISUGUI/VisuGUI.h b/src/VISUGUI/VisuGUI.h
index 9bed10f8..aa78fe34 100644
--- a/src/VISUGUI/VisuGUI.h
+++ b/src/VISUGUI/VisuGUI.h
@@ -189,7 +189,8 @@ class VisuGUI : public SALOMEGUI{
 					  const QString & theContext,
 					  const QString & theParent,
 					  const QString & theObject);
-  virtual void BuildPresentation(const Handle(SALOME_InteractiveObject)&);
+  virtual void BuildPresentation( const Handle(SALOME_InteractiveObject)&,
+                                  QAD_ViewFrame*  = 0 );
   virtual bool OnMousePress(QMouseEvent* pe ,
 					   QAD_Desktop* parent, 
 					   QAD_StudyFrame* studyFrame);
diff --git a/src/VISU_I/Makefile.in b/src/VISU_I/Makefile.in
index 93df0b42..057a12f3 100644
--- a/src/VISU_I/Makefile.in
+++ b/src/VISU_I/Makefile.in
@@ -30,7 +30,8 @@ LIB_MOC = VISU_TimeAnimation.h
 LIB_SERVER_IDL = VISU_Gen.idl SALOME_Component.idl \
                  SALOME_Exception.idl SALOME_GenericObj.idl MED.idl
 
-LIB_CLIENT_IDL = SALOMEDS.idl SALOMEDS_Attributes.idl
+LIB_CLIENT_IDL = SALOMEDS.idl SALOMEDS_Attributes.idl \
+		 SALOME_Comm.idl
 
 # Executables targets
 BIN =