From: rnv <rnv@opencascade.com>
Date: Mon, 25 Nov 2013 15:53:01 +0000 (+0000)
Subject: WIN32 compilation.
X-Git-Tag: V7_3_0a1~2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=1b1d2f5174e168e017ddae3a592f13f3e6835d4d;p=modules%2Fgui.git

WIN32 compilation.
---

diff --git a/src/OCCViewer/CMakeLists.txt b/src/OCCViewer/CMakeLists.txt
index 8a8c28b05..2c0c60497 100755
--- a/src/OCCViewer/CMakeLists.txt
+++ b/src/OCCViewer/CMakeLists.txt
@@ -44,7 +44,7 @@ ADD_DEFINITIONS(${QT_DEFINITIONS} ${CAS_DEFINITIONS} ${OGL_DEFINITIONS})
 # libraries to link to
 SET(_link_LIBRARIES
   ${OPENGL_LIBRARIES} ${QT_LIBRARIES} ${CAS_KERNEL} ${CAS_VIEWER}
-  CASCatch qtx suit OpenGLUtils ViewerTools
+  CASCatch qtx suit OpenGLUtils ViewerTools ViewerData
 )
 
 # --- headers ---
diff --git a/src/OCCViewer/OCCViewer_ClipPlane.cxx b/src/OCCViewer/OCCViewer_ClipPlane.cxx
index f94721663..3972a9ff6 100644
--- a/src/OCCViewer/OCCViewer_ClipPlane.cxx
+++ b/src/OCCViewer/OCCViewer_ClipPlane.cxx
@@ -46,6 +46,7 @@ OrientedPlane& OrientedPlane::operator = ( const OrientedPlane& other )
   Distance = other.Distance;
   Rotation1 = other.Rotation1;
   Rotation2 = other.Rotation2;
+  return *this;
 }
 
 OCCViewer_ClipPlane::OCCViewer_ClipPlane() :
@@ -77,4 +78,5 @@ OCCViewer_ClipPlane& OCCViewer_ClipPlane::operator = ( const OCCViewer_ClipPlane
   IsInvert = other.IsInvert;
   PlaneMode = other.PlaneMode;
   IsOn = other.IsOn;
+  return *this;
 }
diff --git a/src/ViewerData/ViewerData_AISShape.hxx b/src/ViewerData/ViewerData_AISShape.hxx
index 1314dda92..4c41366b1 100644
--- a/src/ViewerData/ViewerData_AISShape.hxx
+++ b/src/ViewerData/ViewerData_AISShape.hxx
@@ -30,19 +30,19 @@
 #include <Standard.hxx>
 #include <Standard_DefineHandle.hxx>
 
-class ViewerData_AISShape : public AIS_TexturedShape
+class  ViewerData_AISShape : public AIS_TexturedShape
 {
 public:
   Standard_EXPORT ViewerData_AISShape (const TopoDS_Shape& theShape);
 
   // checks if shape is clippable
-  inline bool IsClippable() const
+  Standard_EXPORT inline bool IsClippable() const
   {
     return myIsClippable;
   }
 
   // makes shape clippable/not clippable
-  inline void SetClippable (bool isClippable)
+  Standard_EXPORT inline void SetClippable (bool isClippable)
   {
     myIsClippable = isClippable;
   }