refs #585: flag in merge operations

[modules/hydro.git] / src / HYDROGUI / HYDROGUI_Module.h

diff --git a/src/HYDROGUI/HYDROGUI_Module.h b/src/HYDROGUI/HYDROGUI_Module.h
index 3798c08d62a01fea7729a6b25c898e1291286927..381bf95da8ebd3bd44de8fc2d573aabb79239fef 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_Module.h
+++ b/src/HYDROGUI/HYDROGUI_Module.h
@@ -21,13 +21,19 @@
 
 #include <HYDROData_Entity.h>
 
-#include <LightApp_Module.h>
+#ifdef WIN32
+  #pragma warning ( disable: 4251 )
+#endif
 
+#include <LightApp_Module.h>
 #include <QEvent>
 #include <QStack>
 
-class QGraphicsSceneMouseEvent;
+#ifdef WIN32
+  #pragma warning ( default: 4251 )
+#endif
 
+class QGraphicsSceneMouseEvent;
 class GraphicsView_Viewer;
 class OCCViewer_Viewer;
 class SVTK_Viewer;
@@ -236,6 +242,12 @@ public:
    */
   bool                             isLandCoversScalarMapModeOn( const int theViewId ) const;
 
+  /**
+   * Set object as removed.
+   * @param theObject the removed object
+   */
+  void                            setObjectRemoved( const Handle(HYDROData_Entity)& theObject );
+
 protected:
   CAM_DataModel*                  createDataModel();