0031221: Visualization - selection filter in context

diff --git a/src/AIS/AIS_Selection.cxx b/src/AIS/AIS_Selection.cxx
index 8569e8a2b72d210ec50c37b393ad398b8e3acd39..b5eeb8c09fce2de3e0d39e0e2219f4769d741d38 100644 (file)
--- a/src/AIS/AIS_Selection.cxx
+++ b/src/AIS/AIS_Selection.cxx
@@ -180,7 +180,7 @@ AIS_SelectStatus AIS_Selection::selectOwner (const Handle(SelectMgr_EntityOwner)
                                              const int theSelScheme,
                                              const Handle(SelectMgr_Filter)& theFilter)
 {
-  if (theOwner.IsNull() || !theOwner->HasSelectable() || !theFilter->IsOk (theOwner))
+  if (theOwner.IsNull() || !theOwner->HasSelectable() || !theFilter->IsOk (theOwner, SelectMgr_FilterReaction_Select))
     return AIS_SS_NotDone;
 
   if (theSelScheme & AIS_SelectionScheme_Add)

diff --git a/src/SelectMgr/SelectMgr_AndFilter.hxx b/src/SelectMgr/SelectMgr_AndFilter.hxx
index 540605673879711da75d8791e933c619b666b11a..8b106746c37bfeb4befd74c6ae53d7f3e21cbc4c 100644 (file)
--- a/src/SelectMgr/SelectMgr_AndFilter.hxx
+++ b/src/SelectMgr/SelectMgr_AndFilter.hxx
@@ -40,11 +40,11 @@ public:
   //! more types of entity.
   Standard_EXPORT SelectMgr_AndFilter();
   
-  Standard_EXPORT Standard_Boolean IsOk (const Handle(SelectMgr_EntityOwner)& anobj) const Standard_OVERRIDE 
-  { return Standard_False; }
+  Standard_EXPORT Standard_Boolean IsOk (const Handle(SelectMgr_EntityOwner)& theObj) const Standard_OVERRIDE
+  { (void)theObj; return Standard_False; }
 
   Standard_EXPORT virtual Standard_Boolean IsOk (const Handle(SelectMgr_EntityOwner)& theObj,
-                                                 const SelectMgr_FilterReaction& theReaction) const;
+                                                 const SelectMgr_FilterReaction& theReaction) const Standard_OVERRIDE;
 
 
   DEFINE_STANDARD_RTTIEXT(SelectMgr_AndFilter,SelectMgr_CompositionFilter)

diff --git a/src/SelectMgr/SelectMgr_Filter.hxx b/src/SelectMgr/SelectMgr_Filter.hxx
index be2a82bf0d3a143aa7d7ad8377072053e227f0b7..8fdc714bb3a0ac132a71a8f7fe0a0a81abb2f2e0 100644 (file)
--- a/src/SelectMgr/SelectMgr_Filter.hxx
+++ b/src/SelectMgr/SelectMgr_Filter.hxx
@@ -76,8 +76,8 @@ public:
   //! an AIS local context, you will need to implement the
   //! virtual function ActsOn.
   Standard_EXPORT virtual Standard_Boolean IsOk (const Handle(SelectMgr_EntityOwner)& theObj,
-                                                 const SelectMgr_FilterReaction& theReaction) 
-  { return IsOk (theObj); }
+                                                 const SelectMgr_FilterReaction& theReaction) const
+  { (void)theReaction; return IsOk (theObj); }
 
   //! Returns true in an AIS local context, if this filter
   //! operates on a type of subshape defined in a filter