*** empty log message ***

7 files changed, 30 insertions, 16 deletions

diff --git a/src/bltGrAxis.C b/src/bltGrAxis.C
index 1e8a22c..b085768 100644
--- a/src/bltGrAxis.C
+++ b/src/bltGrAxis.C
@@ -516,8 +516,7 @@ static Axis *NewAxis(Graph* graphPtr, const char *name, int margin)
   Blt_Ts_InitStyle(axisPtr->limitsTextStyle);
   axisPtr->tickLabels = Blt_Chain_Create();
 
-  axisPtr->optionTable = 
-    Tk_CreateOptionTable(graphPtr->interp, optionSpecs);
+  axisPtr->optionTable = Tk_CreateOptionTable(graphPtr->interp, optionSpecs);
   return axisPtr;
 }
 
@@ -583,7 +582,8 @@ static int CgetOp(Tcl_Interp* interp, Axis *axisPtr,
     return TCL_ERROR;
   }
 
-  Tcl_Obj* objPtr = Tk_GetOptionValue(interp, (char*)axisPtr, 
+  Tcl_Obj* objPtr = Tk_GetOptionValue(interp, 
+				      (char*)axisPtr, 
 				      axisPtr->optionTable,
 				      objv[3], graphPtr->tkwin);
   if (!objPtr)
@@ -609,7 +609,8 @@ static int ConfigureOp(Tcl_Interp* interp, Axis *axisPtr,
   Graph* graphPtr = axisPtr->obj.graphPtr;
 
   if (objc <= 4) {
-    Tcl_Obj* objPtr = Tk_GetOptionInfo(graphPtr->interp, (char*)axisPtr, 
+    Tcl_Obj* objPtr = Tk_GetOptionInfo(graphPtr->interp, 
+				       (char*)axisPtr, 
 				       axisPtr->optionTable, 
 				       (objc == 4) ? objv[3] : NULL, 
 				       graphPtr->tkwin);
diff --git a/src/bltGrElemOp.C b/src/bltGrElemOp.C
index e7e4329..7d1674e 100644
--- a/src/bltGrElemOp.C
+++ b/src/bltGrElemOp.C
@@ -128,7 +128,8 @@ static int CgetOp(Graph* graphPtr, Tcl_Interp* interp,
   if (Blt_GetElement(interp, graphPtr, objv[3], &elemPtr) != TCL_OK)
     return TCL_ERROR;
 
-  Tcl_Obj* objPtr = Tk_GetOptionValue(interp, (char*)elemPtr, 
+  Tcl_Obj* objPtr = Tk_GetOptionValue(interp, 
+				      (char*)elemPtr->ops(), 
 				      elemPtr->optionTable(),
 				      objv[4], graphPtr->tkwin);
   if (objPtr == NULL)
@@ -146,7 +147,8 @@ static int ConfigureOp(Graph* graphPtr, Tcl_Interp* interp,
     return TCL_ERROR;
 
   if (objc <= 5) {
-    Tcl_Obj* objPtr = Tk_GetOptionInfo(graphPtr->interp, (char*)elemPtr, 
+    Tcl_Obj* objPtr = Tk_GetOptionInfo(graphPtr->interp, 
+				       (char*)elemPtr->ops(), 
 				       elemPtr->optionTable(), 
 				       (objc == 5) ? objv[4] : NULL, 
 				       graphPtr->tkwin);
diff --git a/src/bltGrHairs.C b/src/bltGrHairs.C
index 878e960..c9fe101 100644
--- a/src/bltGrHairs.C
+++ b/src/bltGrHairs.C
@@ -128,7 +128,8 @@ static int CgetOp(Graph* graphPtr, Tcl_Interp* interp,
   }
 
   Crosshairs* chPtr = graphPtr->crosshairs;
-  Tcl_Obj* objPtr = Tk_GetOptionValue(interp, (char*)chPtr, 
+  Tcl_Obj* objPtr = Tk_GetOptionValue(interp, 
+				      (char*)chPtr, 
 				      chPtr->optionTable,
 				      objv[3], graphPtr->tkwin);
   if (objPtr == NULL)
@@ -143,7 +144,8 @@ static int ConfigureOp(Graph* graphPtr, Tcl_Interp* interp,
 {
   Crosshairs* chPtr = graphPtr->crosshairs;
   if (objc <= 4) {
-    Tcl_Obj* objPtr = Tk_GetOptionInfo(graphPtr->interp, (char*)chPtr, 
+    Tcl_Obj* objPtr = Tk_GetOptionInfo(graphPtr->interp, 
+				       (char*)chPtr, 
 				       chPtr->optionTable, 
 				       (objc == 4) ? objv[3] : NULL, 
 				       graphPtr->tkwin);
diff --git a/src/bltGrLegd.C b/src/bltGrLegd.C
index df54a31..d7d2d4b 100644
--- a/src/bltGrLegd.C
+++ b/src/bltGrLegd.C
@@ -561,7 +561,8 @@ static int CgetOp(Graph* graphPtr, Tcl_Interp* interp,
   }
 
   Legend* legendPtr = graphPtr->legend;
-  Tcl_Obj* objPtr = Tk_GetOptionValue(interp, (char*)legendPtr, 
+  Tcl_Obj* objPtr = Tk_GetOptionValue(interp, 
+				      (char*)legendPtr, 
 				      legendPtr->optionTable,
 				      objv[3], graphPtr->tkwin);
   if (objPtr == NULL)
@@ -576,7 +577,8 @@ static int ConfigureOp(Graph* graphPtr, Tcl_Interp* interp,
 {
   Legend* legendPtr = graphPtr->legend;
   if (objc <= 4) {
-    Tcl_Obj* objPtr = Tk_GetOptionInfo(graphPtr->interp, (char*)legendPtr, 
+    Tcl_Obj* objPtr = Tk_GetOptionInfo(graphPtr->interp, 
+				       (char*)legendPtr, 
 				       legendPtr->optionTable, 
 				       (objc == 4) ? objv[3] : NULL, 
 				       graphPtr->tkwin);
diff --git a/src/bltGrMarkerOp.C b/src/bltGrMarkerOp.C
index bc2633b..8f99799 100644
--- a/src/bltGrMarkerOp.C
+++ b/src/bltGrMarkerOp.C
@@ -124,7 +124,8 @@ static int CgetOp(Graph* graphPtr, Tcl_Interp* interp,
   if (GetMarkerFromObj(interp, graphPtr, objv[3], &markerPtr) != TCL_OK)
     return TCL_ERROR;
 
-  Tcl_Obj* objPtr = Tk_GetOptionValue(interp, (char*)markerPtr->ops(), 
+  Tcl_Obj* objPtr = Tk_GetOptionValue(interp, 
+				      (char*)markerPtr->ops(), 
 				      markerPtr->optionTable(),
 				      objv[4], graphPtr->tkwin);
   if (objPtr == NULL)
@@ -168,7 +169,9 @@ static int MarkerObjConfigure( Tcl_Interp* interp, Graph* graphPtr,
 
   for (error=0; error<=1; error++) {
     if (!error) {
-      if (Tk_SetOptions(interp, (char*)markerPtr->ops(), markerPtr->optionTable(), objc, objv, graphPtr->tkwin, &savedOptions, &mask)
+      if (Tk_SetOptions(interp, (char*)markerPtr->ops(), 
+			markerPtr->optionTable(), 
+			objc, objv, graphPtr->tkwin, &savedOptions, &mask)
 	  != TCL_OK)
 	continue;
     }
diff --git a/src/bltGrPenOp.C b/src/bltGrPenOp.C
index 759ed94..786c461 100644
--- a/src/bltGrPenOp.C
+++ b/src/bltGrPenOp.C
@@ -104,7 +104,8 @@ static int CgetOp(Tcl_Interp* interp, Graph* graphPtr,
     return TCL_ERROR;
 
 
-  Tcl_Obj* objPtr = Tk_GetOptionValue(interp, (char*)penPtr, 
+  Tcl_Obj* objPtr = Tk_GetOptionValue(interp, 
+				      (char*)penPtr->ops(), 
 				      penPtr->optionTable(),
 				      objv[4], graphPtr->tkwin);
   if (objPtr == NULL)
@@ -122,7 +123,8 @@ static int ConfigureOp(Tcl_Interp* interp, Graph* graphPtr,
     return TCL_ERROR;
 
   if (objc <= 5) {
-    Tcl_Obj* objPtr = Tk_GetOptionInfo(graphPtr->interp, (char*)penPtr, 
+    Tcl_Obj* objPtr = Tk_GetOptionInfo(graphPtr->interp, 
+				       (char*)penPtr->ops(), 
 				       penPtr->optionTable(), 
 				       (objc == 5) ? objv[4] : NULL, 
 				       graphPtr->tkwin);
diff --git a/src/bltGraph.C b/src/bltGraph.C
index 4e4e79d..6b3c382 100644
--- a/src/bltGraph.C
+++ b/src/bltGraph.C
@@ -428,7 +428,8 @@ static int CgetOp(Graph* graphPtr, Tcl_Interp* interp,
     Tcl_WrongNumArgs(interp, 1, objv, "cget option");
     return TCL_ERROR;
   }
-  Tcl_Obj* objPtr = Tk_GetOptionValue(interp, (char*)graphPtr, 
+  Tcl_Obj* objPtr = Tk_GetOptionValue(interp, 
+				      (char*)graphPtr, 
 				      graphPtr->optionTable,
 				      objv[2], graphPtr->tkwin);
   if (objPtr == NULL)
@@ -442,7 +443,8 @@ static int ConfigureOp(Graph* graphPtr, Tcl_Interp* interp,
 		       int objc, Tcl_Obj* const objv[])
 {
   if (objc <= 3) {
-    Tcl_Obj* objPtr = Tk_GetOptionInfo(interp, (char*)graphPtr, 
+    Tcl_Obj* objPtr = Tk_GetOptionInfo(interp, 
+				       (char*)graphPtr, 
 				       graphPtr->optionTable, 
 				       (objc == 3) ? objv[2] : NULL, 
 				       graphPtr->tkwin);