rnv: Prepare SALOME-6.4.0 version for windows platform.

diff --git a/src/GuiHelpers/Makefile.am b/src/GuiHelpers/Makefile.am
index a59a8258efa21fe5c9122a0d27ea34acff840ed3..782839856a26fd058c91c4909cfed533da35e439 100644 (file)
--- a/src/GuiHelpers/Makefile.am
+++ b/src/GuiHelpers/Makefile.am
@@ -44,6 +44,7 @@ CAS_CXXFLAGS=@CAS_CPPFLAGS@ @CAS_CXXFLAGS@
 BOOST_CPPFLAGS=@BOOST_CPPFLAGS@
 BOOST_LIBS=@BOOST_LIBS@
 CORBA_CXXFLAGS=@OMNIORB_CXXFLAGS@ @OMNIORB_INCLUDES@
+CORBA_LIBS=@OMNIORB_LIBS@
 
 libSalomeGuiHelpers_la_CPPFLAGS =   \
        $(QT_CXXFLAGS)              \
@@ -60,8 +61,9 @@ libSalomeGuiHelpers_la_CPPFLAGS =   \
        -I$(srcdir)/../OBJECT
 
 libSalomeGuiHelpers_la_LDFLAGS  = \
-       $(KERNEL_LDFLAGS) -lSalomeKernelHelpers
-       $(builddir)/../SalomeApp/libSalomeApp.la
+       $(KERNEL_LDFLAGS) -lSalomeKernelHelpers \
+       $(builddir)/../SalomeApp/libSalomeApp.la \
+       $(CORBA_LIBS)
 
 #
 # =======================================================

diff --git a/src/TreeData/DataModel.hxx b/src/TreeData/DataModel.hxx
index 4321451377d3f57b5ade7439800e450f4a16e143..7dd6d3b76316af3dabce54109e419c03578ab857 100644 (file)
--- a/src/TreeData/DataModel.hxx
+++ b/src/TreeData/DataModel.hxx
@@ -23,10 +23,12 @@
 #ifndef DATAMODEL_H
 #define DATAMODEL_H
 
+#include "TreeData.hxx"
+
 #include <map>
 #include "DataObject.hxx"
 
-class DataModel {
+class TREEDATA_EXPORT DataModel {
 
 public:
   DataModel();

diff --git a/src/TreeData/DataObject.hxx b/src/TreeData/DataObject.hxx
index f67d67606180c538930427e35bf7775dd8fdcff3..ffee2939e465e7235861ba9a71a06642699534b2 100644 (file)
--- a/src/TreeData/DataObject.hxx
+++ b/src/TreeData/DataObject.hxx
@@ -22,11 +22,13 @@
 #ifndef DATAOBJECT_H
 #define DATAOBJECT_H
 
+#include "TreeData.hxx"
+
 #include <map>
 #include <string>
 using namespace std;
 
-class DataObject {
+class TREEDATA_EXPORT DataObject {
 
 public:
   DataObject();

diff --git a/src/TreeData/DataProcessor.hxx b/src/TreeData/DataProcessor.hxx
index 76b0d111baf83973b0f72543ffaa8800877d52f7..1e914db2865dadffb6bdabd4df418f154ca97efc 100644 (file)
--- a/src/TreeData/DataProcessor.hxx
+++ b/src/TreeData/DataProcessor.hxx
@@ -22,6 +22,8 @@
 #ifndef _DATAPROCESSOR_H_
 #define _DATAPROCESSOR_H_
 
+#include "TreeData.hxx"
+
 #include "DataModel.hxx"
 #include "DataObject.hxx"
 #include <QStringList>
@@ -40,7 +42,7 @@ typedef std::vector<DataObject *> DataObjectVector;
 // =================================================================
 //
 
-class DataProcessor {
+class TREEDATA_EXPORT DataProcessor {
 
 public:
   DataProcessor(DataModel * dataModel);

diff --git a/src/TreeData/DockWidgets.hxx b/src/TreeData/DockWidgets.hxx
index 26487c4f6bb860b7235c39d3f584648837085e68..c374c6722e33f6cfe0f460c2a300d9dbc6461614 100644 (file)
--- a/src/TreeData/DockWidgets.hxx
+++ b/src/TreeData/DockWidgets.hxx
@@ -22,6 +22,8 @@
 #ifndef _DOCKWIDGETS_H_
 #define _DOCKWIDGETS_H_
 
+#include "TreeData.hxx"
+
 // Qt includes
 #include <QDockWidget>
 #include <QTreeView>
@@ -29,11 +31,11 @@
 // SALOME includes
 #include <SalomeApp_Application.h>
 
-class DockWidgets {
+class TREEDATA_EXPORT DockWidgets {
  public:
   DockWidgets(SalomeApp_Application* salomeApp,
-             bool tabify=false,
-             const char * title="Data Model");
+        bool tabify=false,
+        const char * title="Data Model");
 
   void tabify(bool tabify);
   void show(bool isVisible);

diff --git a/src/TreeData/Makefile.am b/src/TreeData/Makefile.am
index 0df8f18bdac55cbca81838d597add28657be3dc4..3ec85867da1be552cb8f8de3adda0844ea5cc436 100644 (file)
--- a/src/TreeData/Makefile.am
+++ b/src/TreeData/Makefile.am
@@ -40,6 +40,7 @@ lib_LTLIBRARIES = libSalomeTreeData.la
 # Generic source files
 #
 salomeinclude_HEADERS = \
+       TreeData.hxx \
        DockWidgets.hxx \
        TreeModel.hxx \
        TreeItem.hxx \

diff --git a/src/TreeData/TreeData.hxx b/src/TreeData/TreeData.hxx
new file mode 100755 (executable)
index 0000000..0934b72
--- /dev/null
+++ b/src/TreeData/TreeData.hxx
@@ -0,0 +1,36 @@
+// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+#ifndef TREEDATA_HXX
+#define TREEDATA_HXX
+
+#ifdef WIN32
+#  if defined SALOMETREEDATA_EXPORTS || defined SalomeTreeData_EXPORTS
+#    define TREEDATA_EXPORT __declspec( dllexport )
+#  else
+#    define TREEDATA_EXPORT __declspec( dllimport )
+#  endif
+#else
+#  define TREEDATA_EXPORT
+#endif
+
+#endif //TREEDATA_HXX
\ No newline at end of file

diff --git a/src/TreeData/TreeGuiManager.hxx b/src/TreeData/TreeGuiManager.hxx
index c27e75011d4ad3fa9d1c9732bb1ba4865168d2ec..c705680c691dd036b22a8ea4f84ad1cf9853d3c2 100644 (file)
--- a/src/TreeData/TreeGuiManager.hxx
+++ b/src/TreeData/TreeGuiManager.hxx
@@ -22,6 +22,8 @@
 #ifndef _TREEGUIMANAGER_H_
 #define _TREEGUIMANAGER_H_
 
+#include "TreeData.hxx"
+
 // SALOME includes
 #include <SalomeApp_Application.h>
 
@@ -32,7 +34,7 @@
 #include "TreeView.hxx"
 #include "TreeObserver.hxx"
 
-class TreeGuiManager : public TreeObserver {
+class TREEDATA_EXPORT TreeGuiManager : public TreeObserver {
   
 public:
   TreeGuiManager(SalomeApp_Application * salomeApp, const char * title="Data Model");

diff --git a/src/TreeData/TreeItem.hxx b/src/TreeData/TreeItem.hxx
index fd34188596916b51c7a698a9897e70872811c0a5..2e813d20263264e936b0efe2e679bc5f9de3e94e 100644 (file)
--- a/src/TreeData/TreeItem.hxx
+++ b/src/TreeData/TreeItem.hxx
@@ -22,6 +22,8 @@
 #ifndef TREEITEM_H
 #define TREEITEM_H
 
+#include "TreeData.hxx"
+
 #include <QList>
 #include <QVariant>
 #include <QVector>
@@ -30,7 +32,7 @@
 #include "DataObject.hxx"
 #include "TreeModel.hxx"
 
-class TreeItem
+class TREEDATA_EXPORT TreeItem
 {
  public:
   TreeItem(const QString &nameId, const QVector<QVariant> &columnValues, TreeItem *parent = 0);

diff --git a/src/TreeData/TreeModel.hxx b/src/TreeData/TreeModel.hxx
index c58823512c68cb658382e720aa05f4efd8f65d75..3cc4fe41aa8b1751808348fc4a944d78860de001 100644 (file)
--- a/src/TreeData/TreeModel.hxx
+++ b/src/TreeData/TreeModel.hxx
@@ -23,6 +23,8 @@
 #ifndef TREEMODEL_H
 #define TREEMODEL_H
 
+#include "TreeData.hxx"
+
 #include <QAbstractItemModel>
 #include <QModelIndex>
 #include <QVariant>
@@ -33,7 +35,7 @@
 class TreeItem;
 class TreeView;
 
-class TreeModel : public QAbstractItemModel
+class TREEDATA_EXPORT TreeModel : public QAbstractItemModel
 {
   Q_OBJECT
 

diff --git a/src/TreeData/TreeObserver.hxx b/src/TreeData/TreeObserver.hxx
index 8d7bf6653c3ec0b63839c67ef226e1a983564306..26aed162300629d6ca6fc4f1d89872a0e44efb3b 100644 (file)
--- a/src/TreeData/TreeObserver.hxx
+++ b/src/TreeData/TreeObserver.hxx
@@ -22,10 +22,12 @@
 #ifndef _TREEOBSERVER_
 #define _TREEOBSERVER_
 
+#include "TreeData.hxx"
+
 #include <QObject>
 #include "TreeView.hxx"
 
-class TreeObserver : public QObject {
+class TREEDATA_EXPORT TreeObserver : public QObject {
 
   Q_OBJECT
 

diff --git a/src/TreeData/TreeView.hxx b/src/TreeData/TreeView.hxx
index 60a4b44180de4dbbff3c16b9c5764ebbc9a47a85..8138dbf9b65f26482194d55c96abd4362292d612 100644 (file)
--- a/src/TreeData/TreeView.hxx
+++ b/src/TreeData/TreeView.hxx
@@ -23,12 +23,14 @@
 #ifndef TREEVIEW_H
 #define TREEVIEW_H
 
+#include "TreeData.hxx"
+
 #include <QTreeView>
 #include <QAction>
 #include <QContextMenuEvent>
 #include <QList>
 
-class TreeView : public QTreeView
+class TREEDATA_EXPORT TreeView : public QTreeView
 {
   Q_OBJECT