make COlor and Hide/Show commands work with discrete entities

Geo/CAD.cpp

-// $Id: CAD.cpp,v 1.96 2006-03-08 17:02:50 remacle Exp $
+// $Id: CAD.cpp,v 1.97 2006-04-09 20:14:28 geuzaine Exp $
 //
 // Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
 //
@@ -571,15 +571,18 @@ void ColorShape(int Type, int Num, unsigned int Color)
   case MSH_SEGM_ELLI_INV:
   case MSH_SEGM_NURBS:
   case MSH_SEGM_PARAMETRIC:
+  case MSH_SEGM_DISCRETE:
     ColorCurve(Num, Color);
     break;
   case MSH_SURF_NURBS:
   case MSH_SURF_TRIC:
   case MSH_SURF_REGL:
   case MSH_SURF_PLAN:
+  case MSH_SURF_DISCRETE:
     ColorSurface(Num, Color);
     break;
   case MSH_VOLUME:
+  case MSH_VOLUME_DISCRETE:
     ColorVolume(Num, Color);
     break;
   default:
@@ -603,15 +606,18 @@ void VisibilityShape(int Type, int Num, int Mode)
   case MSH_SEGM_ELLI_INV:
   case MSH_SEGM_NURBS:
   case MSH_SEGM_PARAMETRIC:
+  case MSH_SEGM_DISCRETE:
     SetVisibilityByNumber(Num, 3, Mode);
     break;
   case MSH_SURF_NURBS:
   case MSH_SURF_TRIC:
   case MSH_SURF_REGL:
   case MSH_SURF_PLAN:
+  case MSH_SURF_DISCRETE:
     SetVisibilityByNumber(Num, 4, Mode);
     break;
   case MSH_VOLUME:
+  case MSH_VOLUME_DISCRETE:
     SetVisibilityByNumber(Num, 5, Mode);
     break;
   default:

Geo/Geo.h

@@ -56,7 +56,6 @@
 #define MSH_SEGM_ELLI_INV    7
 #define MSH_SEGM_LOOP        8
 #define MSH_SEGM_PARAMETRIC  888
-#define MSH_SEGM_MERGEDSEGS  889
 #define MSH_SEGM_BSPLN       15
 #define MSH_SEGM_URBS        16
 #define MSH_SEGM_NURBS       17