*** empty log message ***

17 files changed, 63 insertions, 49 deletions

diff --git a/src/bltGrAxisOp.C b/src/bltGrAxisOp.C
index 7a3c99f..594e735 100644
--- a/src/bltGrAxisOp.C
+++ b/src/bltGrAxisOp.C
@@ -50,8 +50,8 @@ static double Clamp(double x)
   return (x < 0.0) ? 0.0 : (x > 1.0) ? 1.0 : x;
 }
 
-int AxisObjConfigure(Axis* axisPtr, Tcl_Interp* interp,
-		     int objc, Tcl_Obj* const objv[])
+int Blt::AxisObjConfigure(Axis* axisPtr, Tcl_Interp* interp,
+			  int objc, Tcl_Obj* const objv[])
 {
   Graph* graphPtr = axisPtr->graphPtr_;
   Tk_SavedOptions savedOptions;
@@ -303,7 +303,7 @@ static int ViewOp(ClientData clientData, Tcl_Interp* interp,
   return AxisViewOp(axisPtr, interp, objc-1, objv+1);
 }
 
-const Ensemble axisEnsemble[] = {
+const Ensemble Blt::axisEnsemble[] = {
   {"activate",     ActivateOp, 0},
   {"bind",         BindOp, 0},
   {"cget", 	   CgetOp,0 },
diff --git a/src/bltGrAxisOp.h b/src/bltGrAxisOp.h
index 6850ddc..f2ef45c 100644
--- a/src/bltGrAxisOp.h
+++ b/src/bltGrAxisOp.h
@@ -32,10 +32,11 @@
 
 #include "bltGraph.h"
 
-extern const Ensemble axisEnsemble[];
-
-extern int AxisObjConfigure(Blt::Axis* axisPtr, Tcl_Interp* interp,
-			    int objc, Tcl_Obj* const objv[]);
+namespace Blt {
+  extern const Ensemble axisEnsemble[];
+  extern int AxisObjConfigure(Blt::Axis* axisPtr, Tcl_Interp* interp,
+			      int objc, Tcl_Obj* const objv[]);
+};
 
 extern int AxisCgetOp(Blt::Axis* axisPtr, Tcl_Interp* interp, 
 		      int objc, Tcl_Obj* const objv[]);
diff --git a/src/bltGrElemOp.C b/src/bltGrElemOp.C
index b381707..1d42e1f 100644
--- a/src/bltGrElemOp.C
+++ b/src/bltGrElemOp.C
@@ -42,8 +42,8 @@ static int GetIndex(Tcl_Interp* interp, Element* elemPtr,
 		    Tcl_Obj *objPtr, int *indexPtr);
 static Tcl_Obj *DisplayListObj(Graph* graphPtr);
 
-int ElementObjConfigure(Element* elemPtr, Tcl_Interp* interp,
-			int objc, Tcl_Obj* const objv[])
+int Blt::ElementObjConfigure(Element* elemPtr, Tcl_Interp* interp,
+			     int objc, Tcl_Obj* const objv[])
 {
   Graph* graphPtr = elemPtr->graphPtr_;
   Tk_SavedOptions savedOptions;
@@ -510,7 +510,7 @@ static int TypeOp(ClientData clientData, Tcl_Interp* interp,
   return TCL_OK;
 }
 
-const Ensemble elementEnsemble[] = {
+const Ensemble Blt::elementEnsemble[] = {
   {"activate",   ActivateOp, 0},
   {"bind",       BindOp, 0},
   {"cget",       CgetOp, 0},
diff --git a/src/bltGrElemOp.h b/src/bltGrElemOp.h
index 0c8116c..3301d92 100644
--- a/src/bltGrElemOp.h
+++ b/src/bltGrElemOp.h
@@ -32,8 +32,10 @@
 
 #include "bltGraph.h"
 
-extern const Ensemble elementEnsemble[];
+namespace Blt {
+  extern const Ensemble elementEnsemble[];
+  extern int ElementObjConfigure(Blt::Element* elemPtr, Tcl_Interp* interp,
+				 int objc, Tcl_Obj* const objv[]);
+};
 
-extern int ElementObjConfigure(Blt::Element* elemPtr, Tcl_Interp* interp,
-			       int objc, Tcl_Obj* const objv[]);
 #endif
diff --git a/src/bltGrHairsOp.C b/src/bltGrHairsOp.C
index 96a6df1..f5a250f 100644
--- a/src/bltGrHairsOp.C
+++ b/src/bltGrHairsOp.C
@@ -154,7 +154,7 @@ static int ToggleOp(ClientData clientData, Tcl_Interp* interp,
   return TCL_OK;
 }
 
-const Ensemble crosshairsEnsemble[] = {
+const Ensemble Blt::crosshairsEnsemble[] = {
   {"cget", 	CgetOp, 0},
   {"configure",	ConfigureOp, 0},
   {"off",       OffOp, 0},
diff --git a/src/bltGrHairsOp.h b/src/bltGrHairsOp.h
index 8306af8..287bbe9 100644
--- a/src/bltGrHairsOp.h
+++ b/src/bltGrHairsOp.h
@@ -35,6 +35,8 @@
 
 #include "bltGraph.h"
 
-extern const Ensemble crosshairsEnsemble[];
+namespace Blt {
+  extern const Ensemble crosshairsEnsemble[];
+};
 
 #endif
diff --git a/src/bltGrLegdOp.C b/src/bltGrLegdOp.C
index 6a4d8de..5c1e0d5 100644
--- a/src/bltGrLegdOp.C
+++ b/src/bltGrLegdOp.C
@@ -280,7 +280,7 @@ static int GetOp(ClientData clientData, Tcl_Interp* interp,
   return TCL_OK;
 }
 
-const Ensemble legendEnsemble[] = {
+const Ensemble Blt::legendEnsemble[] = {
   {"activate",     ActivateOp, 0},
   {"bind",         BindOp, 0},
   {"cget",         CgetOp, 0},
@@ -466,7 +466,7 @@ static int SelectionSetOp(ClientData clientData, Tcl_Interp* interp,
   return TCL_OK;
 }
 
-const Ensemble selectionEnsemble[] = {
+const Ensemble Blt::selectionEnsemble[] = {
   {"anchor",   SelectionAnchorOp, 0},
   {"clear",    SelectionSetOp, 0},
   {"clearall", SelectionClearallOp, 0},
diff --git a/src/bltGrLegdOp.h b/src/bltGrLegdOp.h
index 1aa3c6e..aa6a1cb 100644
--- a/src/bltGrLegdOp.h
+++ b/src/bltGrLegdOp.h
@@ -32,7 +32,9 @@
 
 #include "bltGraph.h"
 
-extern const Ensemble legendEnsemble[];
-extern const Ensemble selectionEnsemble[];
+namespace Blt {
+  extern const Ensemble legendEnsemble[];
+  extern const Ensemble selectionEnsemble[];
+};
 
 #endif
diff --git a/src/bltGrMarkerOp.C b/src/bltGrMarkerOp.C
index 43bf61c..4189ea8 100644
--- a/src/bltGrMarkerOp.C
+++ b/src/bltGrMarkerOp.C
@@ -422,7 +422,7 @@ static int TypeOp(ClientData clientData, Tcl_Interp* interp,
   return TCL_OK;
 }
 
-const Ensemble markerEnsemble[] = {
+const Ensemble Blt::markerEnsemble[] = {
   {"bind",      BindOp, 0},
   {"cget",      CgetOp, 0},
   {"configure", ConfigureOp, 0},
diff --git a/src/bltGrMarkerOp.h b/src/bltGrMarkerOp.h
index 39ba808..6051882 100644
--- a/src/bltGrMarkerOp.h
+++ b/src/bltGrMarkerOp.h
@@ -32,6 +32,8 @@
 
 #include "bltGraph.h"
 
-extern const Ensemble markerEnsemble[];
+namespace Blt {
+  extern const Ensemble markerEnsemble[];
+};
 
 #endif
diff --git a/src/bltGrPenOp.C b/src/bltGrPenOp.C
index c9da794..e4e7eb9 100644
--- a/src/bltGrPenOp.C
+++ b/src/bltGrPenOp.C
@@ -35,9 +35,9 @@
 
 using namespace Blt;
 
-int PenObjConfigure(Graph* graphPtr, Pen* penPtr, 
-		    Tcl_Interp* interp, 
-		    int objc, Tcl_Obj* const objv[])
+int Blt::PenObjConfigure(Graph* graphPtr, Pen* penPtr, 
+			 Tcl_Interp* interp, 
+			 int objc, Tcl_Obj* const objv[])
 {
   Tk_SavedOptions savedOptions;
   int mask =0;
@@ -205,7 +205,7 @@ static int TypeOp(ClientData clientData, Tcl_Interp* interp,
   return TCL_OK;
 }
 
-const Ensemble penEnsemble[] = {
+const Ensemble Blt::penEnsemble[] = {
   {"cget",      CgetOp, 0},
   {"configure", ConfigureOp, 0},
   {"create",    CreateOp, 0},
diff --git a/src/bltGrPenOp.h b/src/bltGrPenOp.h
index f376cb1..e345d17 100644
--- a/src/bltGrPenOp.h
+++ b/src/bltGrPenOp.h
@@ -32,9 +32,11 @@
 
 #include "bltGraph.h"
 
-extern const Ensemble penEnsemble[];
+namespace Blt {
+  extern const Ensemble penEnsemble[];
+  extern int PenObjConfigure(Blt::Graph* graphPtr, Blt::Pen* penPtr, 
+			     Tcl_Interp* interp,
+			     int objc, Tcl_Obj* const objv[]);
+};
 
-extern int PenObjConfigure(Blt::Graph* graphPtr, Blt::Pen* penPtr, 
-			   Tcl_Interp* interp,
-			   int objc, Tcl_Obj* const objv[]);
 #endif
diff --git a/src/bltGrPostscriptOp.C b/src/bltGrPostscriptOp.C
index adeb8f2..e007b0a 100644
--- a/src/bltGrPostscriptOp.C
+++ b/src/bltGrPostscriptOp.C
@@ -39,8 +39,8 @@
 
 using namespace Blt;
 
-int PostscriptObjConfigure(Graph* graphPtr, Tcl_Interp* interp, 
-			  int objc, Tcl_Obj* const objv[])
+int Blt::PostscriptObjConfigure(Graph* graphPtr, Tcl_Interp* interp, 
+				int objc, Tcl_Obj* const objv[])
 {
   Postscript* setupPtr = graphPtr->postscript_;
   Tk_SavedOptions savedOptions;
@@ -178,7 +178,7 @@ static int OutputOp(ClientData clientData, Tcl_Interp* interp,
   return TCL_OK;
 }
 
-const Ensemble postscriptEnsemble[] = {
+const Ensemble Blt::postscriptEnsemble[] = {
   {"cget",      CgetOp, 0},
   {"configure", ConfigureOp, 0},
   {"output",    OutputOp, 0},
diff --git a/src/bltGrPostscriptOp.h b/src/bltGrPostscriptOp.h
index d2cafcb..2be79fd 100644
--- a/src/bltGrPostscriptOp.h
+++ b/src/bltGrPostscriptOp.h
@@ -32,9 +32,10 @@
 
 #include "bltGraph.h"
 
-extern const Ensemble postscriptEnsemble[];
-
-extern int PostscriptObjConfigure(Blt::Graph* graphPtr, Tcl_Interp* interp, 
-				  int objc, Tcl_Obj* const objv[]);
+namespace Blt {
+  extern const Ensemble postscriptEnsemble[];
+  extern int PostscriptObjConfigure(Blt::Graph* graphPtr, Tcl_Interp* interp, 
+				    int objc, Tcl_Obj* const objv[]);
+};
 
 #endif
diff --git a/src/bltGrXAxisOp.C b/src/bltGrXAxisOp.C
index 16187a1..aa8edbd 100644
--- a/src/bltGrXAxisOp.C
+++ b/src/bltGrXAxisOp.C
@@ -207,7 +207,7 @@ static int ViewOp(ClientData clientData, Tcl_Interp* interp,
   return AxisViewOp(axisPtr, interp, objc, objv);
 }
 
-const Ensemble xaxisEnsemble[] = {
+const Ensemble Blt::xaxisEnsemble[] = {
   {"activate",     ActivateOp, 0},
   {"bind",         BindOp, 0},
   {"cget",         CgetOp, 0},
diff --git a/src/bltGrXAxisOp.h b/src/bltGrXAxisOp.h
index c4318ab..c586d23 100644
--- a/src/bltGrXAxisOp.h
+++ b/src/bltGrXAxisOp.h
@@ -32,6 +32,8 @@
 
 #include "bltGraph.h"
 
-extern const Ensemble xaxisEnsemble[];
+namespace Blt {
+  extern const Ensemble xaxisEnsemble[];
+};
 
 #endif
diff --git a/src/bltGraphOp.C b/src/bltGraphOp.C
index 85538c0..4451e2c 100644
--- a/src/bltGraphOp.C
+++ b/src/bltGraphOp.C
@@ -302,25 +302,25 @@ static int TransformOp(ClientData clientData, Tcl_Interp* interp, int objc,
 }
 
 static const Ensemble graphEnsemble[] = {
-  {"axis",        0, axisEnsemble},
-  {"bar",         0, elementEnsemble},
+  {"axis",        0, Blt::axisEnsemble},
+  {"bar",         0, Blt::elementEnsemble},
   {"cget", 	  CgetOp, 0},
   {"configure",   ConfigureOp, 0},
   {"crosshairs",  0, Blt::crosshairsEnsemble},
-  {"element",     0, elementEnsemble},
+  {"element",     0, Blt::elementEnsemble},
   {"extents",     ExtentsOp, 0},
   {"inside",      InsideOp, 0},
   {"invtransform",InvtransformOp, 0},
   {"legend",      0, Blt::legendEnsemble},
-  {"line",        0, elementEnsemble},
-  {"marker",      0, markerEnsemble},
-  {"pen",         0, penEnsemble},
-  {"postscript",  0, postscriptEnsemble},
+  {"line",        0, Blt::elementEnsemble},
+  {"marker",      0, Blt::markerEnsemble},
+  {"pen",         0, Blt::penEnsemble},
+  {"postscript",  0, Blt::postscriptEnsemble},
   {"transform",   TransformOp, 0},
-  {"xaxis",       0, xaxisEnsemble},
-  {"yaxis",       0, xaxisEnsemble},
-  {"x2axis",      0, xaxisEnsemble},
-  {"y2axis",      0, xaxisEnsemble},
+  {"xaxis",       0, Blt::xaxisEnsemble},
+  {"yaxis",       0, Blt::xaxisEnsemble},
+  {"x2axis",      0, Blt::xaxisEnsemble},
+  {"y2axis",      0, Blt::xaxisEnsemble},
   { 0,0,0 }
 };