Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
INT PAL 0052683: Parameter "Color group" in the "Create Group" dialog box is empty
[modules/smesh.git]
/
src
/
SMESHDS
/
SMESH_Controls.hxx
diff --git
a/src/SMESHDS/SMESH_Controls.hxx
b/src/SMESHDS/SMESH_Controls.hxx
index e23cc43e349362cd6d7349285b486a439088d97b..ee7c742f53879cf159d658df899c7b175a50ae38 100644
(file)
--- a/
src/SMESHDS/SMESH_Controls.hxx
+++ b/
src/SMESHDS/SMESH_Controls.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
2
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
5
CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-6,7
+6,7
@@
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License
, or (at your option) any later version
.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-24,13
+24,14
@@
#define _SMESH_CONTROLS_HXX_
// This file is named incosistently with others, i.e. not SMESHDS_Controls.hxx,
#define _SMESH_CONTROLS_HXX_
// This file is named incosistently with others, i.e. not SMESHDS_Controls.hxx,
-// because it was moved from ../Controls/SMESH_Controls.hxx
+// because it was moved from ../Controls/SMESH_Controls.hxx.
+// It was moved here for the sake of SMESHDS_GroupOnFilter
#include "SMDSAbs_ElementType.hxx"
#include <boost/shared_ptr.hpp>
#include "SMDSAbs_ElementType.hxx"
#include <boost/shared_ptr.hpp>
-#ifdef W
NT
+#ifdef W
IN32
#if defined SMESHCONTROLS_EXPORTS || defined SMESHControls_EXPORTS
#define SMESHCONTROLS_EXPORT __declspec( dllexport )
#else
#if defined SMESHCONTROLS_EXPORTS || defined SMESHControls_EXPORTS
#define SMESHCONTROLS_EXPORT __declspec( dllexport )
#else
@@
-47,7
+48,7
@@
namespace SMESH{
/*
Class : Functor
/*
Class : Functor
- Description : Root of all Functors
+ Description : Root of all Functors
defined in ../Controls/SMESH_ControlsDef.hxx
*/
class SMESHCONTROLS_EXPORT Functor
{
*/
class SMESHCONTROLS_EXPORT Functor
{