Merging with BR_WPdev_For_5_0

diff --git a/src/OCCViewer/OCCViewer_ViewPort.cxx b/src/OCCViewer/OCCViewer_ViewPort.cxx
index 166a7bb34c27ea1ae44423febd608734390ab89b..d21fb39f3b87aec145508f42a63abbbfe0dfd4ed 100755 (executable)
--- a/src/OCCViewer/OCCViewer_ViewPort.cxx
+++ b/src/OCCViewer/OCCViewer_ViewPort.cxx
@@ -34,11 +34,11 @@
 #include <QColorDialog>
 #include <QColormap>
 #include <QCoreApplication>
-#include <QX11Info>
 
 #include <stdlib.h>
 
 #if !defined WNT
+#include <QX11Info>
 #include <GL/glx.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>

diff --git a/src/OCCViewer/OCCViewer_ViewWindow.cxx b/src/OCCViewer/OCCViewer_ViewWindow.cxx
index 9347a441a85d26b59a4c31ac8e9c8924c4d86344..b42f2d7968005ca4139de8229cfeeb0006175e95 100755 (executable)
--- a/src/OCCViewer/OCCViewer_ViewWindow.cxx
+++ b/src/OCCViewer/OCCViewer_ViewWindow.cxx
@@ -67,6 +67,10 @@
 
 static QEvent* l_mbPressEvent = 0;
 
+#ifdef WIN32
+# include <QWindowsStyle>
+#endif
+
 const char* imageZoomCursor[] = {
 "32 32 3 1",
 ". c None",
@@ -888,6 +892,9 @@ void OCCViewer_ViewWindow::drawRect()
 {
   if ( !myRectBand ) {
     myRectBand = new QRubberBand( QRubberBand::Rectangle, myViewPort );
+#ifdef WIN32
+    myRectBand->setStyle(new QWindowsStyle);
+#endif
     QPalette palette;
     palette.setColor(myRectBand->foregroundRole(), Qt::white);
     myRectBand->setPalette(palette);

diff --git a/src/SVTK/SALOME_Actor.h b/src/SVTK/SALOME_Actor.h
index db4e2e56e440aa897fbc31799729bf0bb7f7e1e1..4316ef3dc59e31bc397e47e349265a2370c85373 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_RenderWindowInteractor.cxx b/src/SVTK/SVTK_RenderWindowInteractor.cxx
index 56236ad891bf837d568aac88d26873ed1f5efee8..66287bf793afe5f5fed35bef99bf9a5b2d8415c3 100644 (file)
--- a/src/SVTK/SVTK_RenderWindowInteractor.cxx
+++ b/src/SVTK/SVTK_RenderWindowInteractor.cxx
@@ -37,7 +37,9 @@
 // QT Includes
 // Put Qt includes before the X11 includes which #define the symbol None
 // (see SVTK_SpaceMouse.h) to avoid the compilation error.
-#include <QX11Info>
+#ifndef WIN32
+# include <QX11Info>
+#endif
 #include <QMouseEvent>
 
 #include "SVTK_SpaceMouse.h" 
@@ -414,10 +416,10 @@ QVTK_RenderWindowInteractor
 /*!
   To handle native Win32 events (from such devices as SpaceMouse)
 */
-bool QVTK_RenderWindowInteractor::winEvent( MSG* msg )
+bool QVTK_RenderWindowInteractor::winEvent( MSG* msg, long* result )
 {
   // TODO: Implement event handling for SpaceMouse
-  return QWidget::winEvent( msg );
+  return QWidget::winEvent( msg, result);
 }
 
 #else

diff --git a/src/SVTK/SVTK_RenderWindowInteractor.h b/src/SVTK/SVTK_RenderWindowInteractor.h
index 51aa1ec5999cb752c57df896fe3fee3f570bce66..ab5f9c1827be14f456b2a888aa86515084f12308 100644 (file)
--- a/src/SVTK/SVTK_RenderWindowInteractor.h
+++ b/src/SVTK/SVTK_RenderWindowInteractor.h
@@ -122,7 +122,7 @@ class SVTK_EXPORT QVTK_RenderWindowInteractor: public QWidget
 
   //! To handle native events (from such devices as SpaceMouse)
 #ifdef WIN32
-  virtual bool winEvent( MSG* );
+  virtual bool winEvent( MSG*, long* );
 #else
   virtual bool x11Event( XEvent *e );
 #endif

diff --git a/src/Session/SALOME_Session_Server.cxx b/src/Session/SALOME_Session_Server.cxx
index 8032dcce4abf957ed1d97033d500e33873e15880..9f656ddb2a89e68417989c225a95e2496a376f08 100755 (executable)
--- a/src/Session/SALOME_Session_Server.cxx
+++ b/src/Session/SALOME_Session_Server.cxx
@@ -65,6 +65,8 @@
 #include <SUIT_ResourceMgr.h>
 #include <SUIT_ExceptionHandler.h>
 
+#include <Standard_Version.hxx>
+
 /*! - read arguments, define list of server to launch with their arguments.
  * - wait for naming service
  * - create and run a thread for launch of all servers

diff --git a/src/Session/Session_Session_i.cxx b/src/Session/Session_Session_i.cxx
index 88d2b3fadea10539425c9e94f136dd157920e779..089c223f06d0104932f41de3118d214f07407154 100755 (executable)
--- a/src/Session/Session_Session_i.cxx
+++ b/src/Session/Session_Session_i.cxx
@@ -34,11 +34,9 @@
 #include "SALOME_Event.h"
 
 #include "SUIT_Session.h"
-//#include "SUIT_Application.h"
 #include "SUIT_Desktop.h"
 #include "SUIT_Study.h"
 
-//#include <QApplication>
 #include <QMutex>
 #include <QWaitCondition>
 
@@ -46,6 +44,11 @@
 #include <OSD_SharedLibrary.hxx>
 #include <OSD_Function.hxx>
 
+#ifdef WNT
+# include <process.h>
+#endif
+
+
 using namespace std;
 
 /*!
@@ -203,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 efef52f60a3fda705e0e88c56a9af9bb68644eea..fc7a1e56e4f7cb7f55b275ff0231b15c6bd23b47 100755 (executable)
--- a/src/Session/Session_Session_i.hxx
+++ b/src/Session/Session_Session_i.hxx
@@ -69,7 +69,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);