LightApp_Export added to compile on WNT

diff --git a/src/LightApp/LightApp_DataObject.h b/src/LightApp/LightApp_DataObject.h
index 7cbdef947a48392f250f263bb59a84359c072dfd..0d2e9cd0a76e9d262d599a2c087fbe7dfbf65405 100644 (file)
--- a/src/LightApp/LightApp_DataObject.h
+++ b/src/LightApp/LightApp_DataObject.h
@@ -10,7 +10,7 @@
 class LightApp_Study;
 
 /*!Description : Data Object has empty entry so it's children must redefine metod entry() and return some unique string*/
-
+// to do : decomment virtual inheritance 
 class LIGHTAPP_EXPORT LightApp_DataObject : public virtual CAM_DataObject
 {
   class Key;

diff --git a/src/LightApp/LightApp_DataOwner.h b/src/LightApp/LightApp_DataOwner.h
index f4d63a7e465fdf8db072e3791f2d3a51a0f0dccd..6ec43e08d44d3e2afb270d9673ecc35b2d192eaa 100644 (file)
--- a/src/LightApp/LightApp_DataOwner.h
+++ b/src/LightApp/LightApp_DataOwner.h
@@ -2,13 +2,14 @@
 #ifndef LIGHTAPP_DATAOWNER_H
 #define LIGHTAPP_DATAOWNER_H
 
+#include "LightApp.h"
 #include "SUIT_DataOwner.h"
 #include "SALOME_InteractiveObject.hxx"
 
 /*!
   This class provide data owner objects.
 */
-class LightApp_DataOwner : public SUIT_DataOwner
+class LIGHTAPP_EXPORT LightApp_DataOwner : public SUIT_DataOwner
 {
 public:
     LightApp_DataOwner( const Handle(SALOME_InteractiveObject)& theIO );

diff --git a/src/LightApp/LightApp_DataSubOwner.h b/src/LightApp/LightApp_DataSubOwner.h
index 7090508da70f302c516c46ced4cbcd322a44a38b..1975c86a2668498f530d2a57e694e9f1fc4ee5c9 100644 (file)
--- a/src/LightApp/LightApp_DataSubOwner.h
+++ b/src/LightApp/LightApp_DataSubOwner.h
@@ -2,12 +2,13 @@
 #ifndef LIGHTAPP_DATASUBOWNER_H
 #define LIGHTAPP_DATASUBOWNER_H
 
+#include "LightApp.h"
 #include <LightApp_DataOwner.h>
 
 /*!
   Class provide sub owner.
  */
-class LightApp_DataSubOwner : public LightApp_DataOwner
+class LIGHTAPP_EXPORT LightApp_DataSubOwner : public LightApp_DataOwner
 {
 public:
     LightApp_DataSubOwner( const QString&, const int );

diff --git a/src/LightApp/LightApp_Dialog.h b/src/LightApp/LightApp_Dialog.h
index 1fb0302e1acf001a4c7caac06c405f565766a651..b13a0f83518e0c2ec98afa3e85e8e32a19d31d38 100644 (file)
--- a/src/LightApp/LightApp_Dialog.h
+++ b/src/LightApp/LightApp_Dialog.h
@@ -4,6 +4,7 @@
 #ifndef LIGHTAPP_DIALOG_H
 #define LIGHTAPP_DIALOG_H
 
+#include "LightApp.h"
 #include <QtxDialog.h>
 
 #include <qvaluelist.h>
@@ -20,7 +21,7 @@ class SUIT_ResourceMgr;
   Class       : LightApp_Dialog
   Description : Base class for all LightApp dialogs
 */
-class LightApp_Dialog : public QtxDialog
+class LIGHTAPP_EXPORT LightApp_Dialog : public QtxDialog
 {
   Q_OBJECT
   

diff --git a/src/LightApp/LightApp_Driver.cxx b/src/LightApp/LightApp_Driver.cxx
index 9d407f95d56de645d203941e1943fbde678ee6d6..3ad379ca3178f7abd8929365df2e7770bafa2a30 100644 (file)
--- a/src/LightApp/LightApp_Driver.cxx
+++ b/src/LightApp/LightApp_Driver.cxx
@@ -11,6 +11,10 @@
 #include <OSD_SingleProtection.hxx>
 #include <OSD_FileIterator.hxx>
 
+#ifdef WIN32
+#include <time.h>
+#endif
+
 /*! Constructor.*/
 LightApp_Driver::LightApp_Driver()
 {

diff --git a/src/LightApp/LightApp_Driver.h b/src/LightApp/LightApp_Driver.h
index d556f5c5a139623655651c53bb0a6dce4b30e81c..f58252c0fdec1d8a0112fb38f036b64067d84cfd 100644 (file)
--- a/src/LightApp/LightApp_Driver.h
+++ b/src/LightApp/LightApp_Driver.h
@@ -1,11 +1,11 @@
 #ifndef LIGHTAPP_DRIVER_H
 #define LIGHTAPP_DRIVER_H
 
-#include "LightApp.h"
+#include <LightApp.h>
 
-#include "string.h"
-#include "vector.h"
-#include "map.h"
+#include "string"
+#include "vector"
+#include "map"
 
 #ifdef WIN32
 #pragma warning( disable:4251 )

diff --git a/src/LightApp/LightApp_GLSelector.cxx b/src/LightApp/LightApp_GLSelector.cxx
index e448f70bc410b6e12653107a3bfb90d0909a35ff..b49ce51c1879a5edcc5d69d37741f8f3b01c2b14 100644 (file)
--- a/src/LightApp/LightApp_GLSelector.cxx
+++ b/src/LightApp/LightApp_GLSelector.cxx
@@ -12,7 +12,8 @@ LightApp_GLSelector::LightApp_GLSelector( GLViewer_Viewer2d* viewer, SUIT_Select
   myViewer( viewer )
 {
   if ( myViewer )
-    connect( myViewer, SIGNAL( selectionChanged() ), this, SLOT( onSelectionChanged() ) );
+    connect( myViewer, SIGNAL( selectionChanged( SelectionChangeStatus ) ), 
+             this, SLOT( onSelectionChanged() ) );
 }
 
 /*!Destructor. Do nothing.*/

diff --git a/src/LightApp/LightApp_ModuleDlg.cxx b/src/LightApp/LightApp_ModuleDlg.cxx
index f9f6d7865ce72e00733b38950d9c77508f42688b..1893a2f4930dff93c9d71641603f2788ad1d8409 100644 (file)
--- a/src/LightApp/LightApp_ModuleDlg.cxx
+++ b/src/LightApp/LightApp_ModuleDlg.cxx
@@ -2,14 +2,17 @@
 //  Author : Michael Zorin (mzn)
 //  Module : LightApp
 
-#include "LightApp_ModuleDlg.h"
+#include <LightApp_ModuleDlg.h>
 
 #include <qframe.h>
 #include <qlabel.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
 #include <qpixmap.h>
+
+#ifndef WIN32
 using namespace std;
+#endif
 
 /*!Default icon*/
 static const char* const default_icon[] = { 

diff --git a/src/LightApp/LightApp_ModuleDlg.h b/src/LightApp/LightApp_ModuleDlg.h
index a844e89c94ea6828ad8fc1d74f85d5096aa97b8a..9ac3cbba63f43e301cf4b999430f2e62614f2691 100644 (file)
--- a/src/LightApp/LightApp_ModuleDlg.h
+++ b/src/LightApp/LightApp_ModuleDlg.h
@@ -5,6 +5,7 @@
 #ifndef LIGHTAPP_MODULEDLG_H
 #define LIGHTAPP_MODULEDLG_H
 
+#include "LightApp.h"
 #include <qdialog.h> 
 #include <qpixmap.h>
 
@@ -12,7 +13,7 @@ class QFrame;
 class QLabel;
 class QPushButton;
 
-class LightApp_ModuleDlg : public QDialog
+class LIGHTAPP_EXPORT LightApp_ModuleDlg : public QDialog
 {
   Q_OBJECT
 

diff --git a/src/LightApp/LightApp_NameDlg.cxx b/src/LightApp/LightApp_NameDlg.cxx
index 0b737ad371f025749fa2b0f176903c3aee8210d5..3033cb572fa16f2eb25b6f74ae6f5bb0c4550757 100644 (file)
--- a/src/LightApp/LightApp_NameDlg.cxx
+++ b/src/LightApp/LightApp_NameDlg.cxx
@@ -2,17 +2,20 @@
 //  Author : Vadim SANDLER
 //  $Header$
 
-#include "LightApp_NameDlg.h"
-#include "SUIT_Application.h"
-#include "SUIT_Desktop.h"
-#include "SUIT_Tools.h"
+#include <LightApp_NameDlg.h>
+#include <SUIT_Application.h>
+#include <SUIT_Desktop.h>
+#include <SUIT_Tools.h>
 
 #include <qgroupbox.h>
 #include <qlabel.h>
 #include <qlineedit.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
+
+#ifndef WIN32
 using namespace std;
+#endif
 
 /*!
   Constructor

diff --git a/src/LightApp/LightApp_NameDlg.h b/src/LightApp/LightApp_NameDlg.h
index 6c48c756df571007f7026a50bd0d35e0dcbb5165..90eeca3c36886ee3b6be2c0b896083864e639112 100644 (file)
--- a/src/LightApp/LightApp_NameDlg.h
+++ b/src/LightApp/LightApp_NameDlg.h
@@ -5,6 +5,7 @@
 #ifndef LIGHTAPP_NAMEDLG_H
 #define LIGHTAPP_NAMEDLG_H
 
+#include "LightApp.h"
 #include <qdialog.h>
 
 class QLineEdit;
@@ -14,7 +15,7 @@ class QPushButton;
 // class    : LightApp_NameDlg
 /*! purpose  : Common <Rename> dialog box class*/
 //=================================================================================
-class LightApp_NameDlg : public QDialog
+class LIGHTAPP_EXPORT LightApp_NameDlg : public QDialog
 { 
   Q_OBJECT
 

diff --git a/src/LightApp/LightApp_Operation.h b/src/LightApp/LightApp_Operation.h
index d2ab494771167a7c41a4d1e0de9e1495ee8d5e13..4b07bd7b262e92d1bbc94e3ad060715771450a87 100755 (executable)
--- a/src/LightApp/LightApp_Operation.h
+++ b/src/LightApp/LightApp_Operation.h
@@ -12,6 +12,7 @@
 #ifndef LightApp_Operation_H
 #define LightApp_Operation_H
 
+#include "LightApp.h"
 #include <SUIT_Operation.h>
 
 class LightApp_Module;
@@ -31,7 +32,7 @@ class SUIT_Desktop;
  *
  *  Base class for all operations (see SUIT_Operation for more description)
 */
-class LightApp_Operation : public SUIT_Operation
+class LIGHTAPP_EXPORT LightApp_Operation : public SUIT_Operation
 {
   Q_OBJECT
 

diff --git a/src/LightApp/LightApp_RootObject.h b/src/LightApp/LightApp_RootObject.h
index 2176c0699d3247267f47ec89947778926ddcf644..916030f27597c1aee81f549de740486f4ef74a1b 100644 (file)
--- a/src/LightApp/LightApp_RootObject.h
+++ b/src/LightApp/LightApp_RootObject.h
@@ -17,7 +17,15 @@ class LIGHTAPP_EXPORT LightApp_RootObject : public SUIT_DataObject
 {
 public:
   LightApp_RootObject( LightApp_Study* study )
-    : myStudy( study ) {}
+    : myStudy( study ) 
+  {
+    // to do : to be removed
+    FILE* f = fopen( "d:\\temp\\SUIT.log", "a" );
+    char str[ 255 ];
+    sprintf( str, "LightApp_RootObject 0x%X \n", this );
+    fputs( str, f );
+    fclose( f );
+  }
 
   virtual ~LightApp_RootObject() {}
     

diff --git a/src/LightApp/LightApp_Selection.h b/src/LightApp/LightApp_Selection.h
index a8be43dc9e4b5fa610114ced4a23b6a7402c7ea0..68ff316f7773590a224298e517e3edfd55ae9d06 100644 (file)
--- a/src/LightApp/LightApp_Selection.h
+++ b/src/LightApp/LightApp_Selection.h
@@ -29,6 +29,7 @@
 #ifndef LIGHTAPP_SELECTION_HeaderFile
 #define LIGHTAPP_SELECTION_HeaderFile
 
+#include "LightApp.h"
 #include <QtxPopupMgr.h>
 
 class LightApp_SelectionMgr;
@@ -37,7 +38,7 @@ class LightApp_Study;
 class SUIT_ViewWindow;
 
 
-class LightApp_Selection : public QtxPopupMgr::Selection
+class LIGHTAPP_EXPORT LightApp_Selection : public QtxPopupMgr::Selection
 {
 public:
   LightApp_Selection();

diff --git a/src/LightApp/LightApp_Study.h b/src/LightApp/LightApp_Study.h
index 403b1c2b29a0d953391bf07117c70b633c7fb74e..0465028fb4b1da641e4bd5e82973adc5aaf727a7 100644 (file)
--- a/src/LightApp/LightApp_Study.h
+++ b/src/LightApp/LightApp_Study.h
@@ -1,19 +1,15 @@
 #ifndef LIGHTAPP_STUDY_H
 #define LIGHTAPP_STUDY_H
 
-#include "LightApp.h"
-#include "LightApp_Driver.h"
+#include <LightApp.h>
+#include <LightApp_Driver.h>
 
-#include "CAM_Study.h"
-#include "CAM_DataModel.h"
-#include "SUIT_Study.h"
+#include <CAM_Study.h>
+#include <CAM_DataModel.h>
+#include <SUIT_Study.h>
 
-#include "string.h"
-#include "vector.h"
-
-#ifdef WIN32
-#pragma warning( disable:4251 )
-#endif
+#include "string"
+#include "vector"
 
 class SUIT_Application;
 class CAM_DataModel;

diff --git a/src/LightApp/LightApp_SwitchOp.h b/src/LightApp/LightApp_SwitchOp.h
index ac1850e3024f32d18f1d3e01f0d6703f1e99af95..7c725ebf549a20da262c29702f4e65ea763d0fe8 100755 (executable)
--- a/src/LightApp/LightApp_SwitchOp.h
+++ b/src/LightApp/LightApp_SwitchOp.h
@@ -15,6 +15,7 @@
 #ifndef LightApp_SwitchOp_H
 #define LightApp_SwitchOp_H
 
+#include "LightApp.h"
 #include <qobject.h>
 
 class LightApp_Module;
@@ -38,7 +39,7 @@ class SUIT_Study;
  * operation is suspended and new operation activated. Module contains this class as a
  * field. Then module is created instance of this class created too.
  */
-class LightApp_SwitchOp : public QObject
+class LIGHTAPP_EXPORT LightApp_SwitchOp : public QObject
 {
   Q_OBJECT
 

diff --git a/src/LightApp/LightApp_VTKSelector.h b/src/LightApp/LightApp_VTKSelector.h
index da3edd1705504cef7fa86296bb530f603674ff2b..aab409f26510ee60af16f117a02fe4da23b7d14f 100644 (file)
--- a/src/LightApp/LightApp_VTKSelector.h
+++ b/src/LightApp/LightApp_VTKSelector.h
@@ -19,7 +19,7 @@ class SVTK_Viewer;
 /*!
   Provide salome vtk data owner list.
 */
-class LightApp_SVTKDataOwner : public LightApp_DataOwner
+class LIGHTAPP_EXPORT LightApp_SVTKDataOwner : public LightApp_DataOwner
 {
  public:
     LightApp_SVTKDataOwner( const Handle(SALOME_InteractiveObject)& theIO,