Firts executable version

diff --git a/src/SVTK/SALOME_Actor.h b/src/SVTK/SALOME_Actor.h
index a44acc9fd35a369ded98aec4110e9889dc4572a3..97a8285301ceedceab67b59711c444c37757c426 100644 (file)
--- a/src/SVTK/SALOME_Actor.h
+++ b/src/SVTK/SALOME_Actor.h
@@ -54,8 +54,8 @@ class SVTK_Actor;
 class SVTK_RectPicker;
 class SVTK_InteractorStyle;
 
-extern int SALOME_POINT_SIZE;
-extern int SALOME_LINE_WIDTH;
+SVTK_EXPORT extern int SALOME_POINT_SIZE;
+SVTK_EXPORT extern int SALOME_LINE_WIDTH;
 
 #ifdef WIN32
 #pragma warning ( disable:4251 )

diff --git a/src/SVTK/SVTK_Extension.cxx b/src/SVTK/SVTK_Extension.cxx
index a26dac111ae3ef985ecb9ee58a914d1587f1b3a2..363fe1d5f9ed7e35154829c87ea6239a75007f0d 100755 (executable)
--- a/src/SVTK/SVTK_Extension.cxx
+++ b/src/SVTK/SVTK_Extension.cxx
@@ -28,6 +28,7 @@
 #include "SVTK_Extension.h"
 
 #ifdef WIN32
+#undef NOGDI
 #include <windows.h>
 #else
 #include <dlfcn.h>

diff --git a/src/SalomeApp/SalomeApp_ExitDlg.h b/src/SalomeApp/SalomeApp_ExitDlg.h
index e046291e10b5c28a93fc2eb0664cf468f3d717c8..06a25195b50b08d00a6e37c5af065a304ea51971 100644 (file)
--- a/src/SalomeApp/SalomeApp_ExitDlg.h
+++ b/src/SalomeApp/SalomeApp_ExitDlg.h
@@ -23,6 +23,7 @@
 #ifndef SALOMEAPP_EXITDLG_H
 #define SALOMEAPP_EXITDLG_H
 
+#include "SalomeApp.h"
 #include <qdialog.h> 
 
 class QCheckBox;
@@ -30,7 +31,7 @@ class QCheckBox;
 /*!\class SalomeApp_ExitDlg
  * \brief Describes a dialog box shown on question about quit application
  */
-class SalomeApp_ExitDlg: public QDialog
+class SALOMEAPP_EXPORT SalomeApp_ExitDlg: public QDialog
 {
   Q_OBJECT
 

diff --git a/src/Session/Session_Session_i.cxx b/src/Session/Session_Session_i.cxx
index 92da744bc6199d5f110926b58b8e4afde38ba8bf..def398b6ccb1a560838aa06722286e4995244b22 100755 (executable)
--- a/src/Session/Session_Session_i.cxx
+++ b/src/Session/Session_Session_i.cxx
@@ -44,6 +44,11 @@
 #include <OSD_LoadMode.hxx>
 #include <OSD_Function.hxx>
 
+#ifdef WNT
+# include <process.h>
+#endif
+
+
 using namespace std;
 
 /*!
@@ -201,6 +206,15 @@ CORBA::Long SALOME_Session_i::GetActiveStudyId()
   return aStudyId;
 }
 
+CORBA::Long SALOME_Session_i::getPID() {
+  return (CORBA::Long)
+#ifndef WNT
+    getpid();
+#else
+    _getpid();
+#endif
+}
+
 bool SALOME_Session_i::restoreVisualState(CORBA::Long theSavePoint)
 {
   class TEvent: public SALOME_Event {

diff --git a/src/Session/Session_Session_i.hxx b/src/Session/Session_Session_i.hxx
index 58f5fdb3126b02665c6e9910147124672fb37964..64f031cfbd4a2eb344b1689e9e2c5f312f50bb0f 100755 (executable)
--- a/src/Session/Session_Session_i.hxx
+++ b/src/Session/Session_Session_i.hxx
@@ -68,7 +68,7 @@ public:
   CORBA::Long GetActiveStudyId();
 
   void ping(){};
-  CORBA::Long getPID() { return (CORBA::Long)getpid(); };
+  CORBA::Long getPID();
 
   //! Restors a visual state of the study at theSavePoint
   bool restoreVisualState(CORBA::Long theSavePoint);

diff --git a/src/VTKViewer/VTKViewer_ViewWindow.cxx b/src/VTKViewer/VTKViewer_ViewWindow.cxx
index 0e1ab38bb3dda6309508810d634f09086bd31211..f28c446b1f0a0e5f5b3f50cf980dc686dc223a81 100755 (executable)
--- a/src/VTKViewer/VTKViewer_ViewWindow.cxx
+++ b/src/VTKViewer/VTKViewer_ViewWindow.cxx
@@ -455,8 +455,8 @@ void VTKViewer_ViewWindow::onAdjustTrihedron(){
                      (bnd[5]-bnd[4])*(bnd[5]-bnd[4]));
     }else{
       aLength = bnd[1]-bnd[0];
-      aLength = max((bnd[3]-bnd[2]),aLength);
-      aLength = max((bnd[5]-bnd[4]),aLength);
+      aLength = QMAX((bnd[3]-bnd[2]),aLength);
+      aLength = QMAX((bnd[5]-bnd[4]),aLength);
     }
    
     static vtkFloatingPointType aSizeInPercents = 105;