*** empty log message ***

1 files changed, 22 insertions, 52 deletions

diff --git a/src/bltGrPostscript.C b/src/bltGrPostscript.C
index e3397c1..f9d4612 100644
--- a/src/bltGrPostscript.C
+++ b/src/bltGrPostscript.C
@@ -36,32 +36,32 @@ extern "C" {
 
 static Tk_OptionSpec optionSpecs[] = {
   {TK_OPTION_BOOLEAN, "-center", "center", "Center", 
-   "yes", -1, Tk_Offset(PageSetup, center), 0, NULL, 0},
+   "yes", -1, Tk_Offset(PageSetupOptions, center), 0, NULL, 0},
   {TK_OPTION_CUSTOM, "-comments", "comments", "Comments",
-   NULL, -1, Tk_Offset(PageSetup, comments), 
+   NULL, -1, Tk_Offset(PageSetupOptions, comments), 
    TK_OPTION_NULL_OK, &listObjOption, 0},
   {TK_OPTION_BOOLEAN, "-decorations", "decorations", "Decorations",
-   "no", -1, Tk_Offset(PageSetup, decorations), 0, NULL, 0},
+   "no", -1, Tk_Offset(PageSetupOptions, decorations), 0, NULL, 0},
   {TK_OPTION_BOOLEAN, "-footer", "footer", "Footer",
-   "no", -1, Tk_Offset(PageSetup, footer), 0, NULL, 0},
+   "no", -1, Tk_Offset(PageSetupOptions, footer), 0, NULL, 0},
   {TK_OPTION_BOOLEAN, "-greyscale", "greyscale", "Greyscale",
-   "no", -1, Tk_Offset(PageSetup, greyscale), 0, NULL, 0},
+   "no", -1, Tk_Offset(PageSetupOptions, greyscale), 0, NULL, 0},
   {TK_OPTION_PIXELS, "-height", "height", "Height", 
-   "0", -1, Tk_Offset(PageSetup, reqHeight), 0, NULL, 0},
+   "0", -1, Tk_Offset(PageSetupOptions, reqHeight), 0, NULL, 0},
   {TK_OPTION_BOOLEAN, "-landscape", "landscape", "Landscape",
-   "no", -1, Tk_Offset(PageSetup, landscape), 0, NULL, 0},
+   "no", -1, Tk_Offset(PageSetupOptions, landscape), 0, NULL, 0},
   {TK_OPTION_INT, "-level", "level", "Level", 
-   "2", -1, Tk_Offset(PageSetup, level), 0, NULL, 0},
+   "2", -1, Tk_Offset(PageSetupOptions, level), 0, NULL, 0},
   {TK_OPTION_PIXELS, "-padx", "padX", "PadX", 
-   "1.0i", -1, Tk_Offset(PageSetup, xPad), 0, NULL, 0},
+   "1.0i", -1, Tk_Offset(PageSetupOptions, xPad), 0, NULL, 0},
   {TK_OPTION_PIXELS, "-pady", "padY", "PadY", 
-   "1.0i", -1, Tk_Offset(PageSetup, yPad), 0, NULL, 0},
+   "1.0i", -1, Tk_Offset(PageSetupOptions, yPad), 0, NULL, 0},
   {TK_OPTION_PIXELS, "-paperheight", "paperHeight", "PaperHeight",
-   "11.0i", -1, Tk_Offset(PageSetup, reqPaperHeight), 0, NULL, 0},
+   "11.0i", -1, Tk_Offset(PageSetupOptions, reqPaperHeight), 0, NULL, 0},
   {TK_OPTION_PIXELS, "-paperwidth", "paperWidth", "PaperWidth",
-   "8.5i", -1, Tk_Offset(PageSetup, reqPaperWidth), 0, NULL, 0},
+   "8.5i", -1, Tk_Offset(PageSetupOptions, reqPaperWidth), 0, NULL, 0},
   {TK_OPTION_PIXELS, "-width", "width", "Width", 
-   "0", -1, Tk_Offset(PageSetup, reqWidth), 0, NULL, 0},
+   "0", -1, Tk_Offset(PageSetupOptions, reqWidth), 0, NULL, 0},
   {TK_OPTION_END, NULL, NULL, NULL, NULL, -1, 0, 0, NULL, 0}
 };
 
@@ -69,52 +69,22 @@ int Blt_CreatePageSetup(Graph* graphPtr)
 {
   PageSetup* setupPtr = (PageSetup*)calloc(1, sizeof(PageSetup));
   graphPtr->pageSetup_ = setupPtr;
+  setupPtr->ops_ = (PageSetupOptions*)calloc(1, sizeof(PageSetupOptions));
 
-  setupPtr->optionTable =Tk_CreateOptionTable(graphPtr->interp_, optionSpecs);
-  return Tk_InitOptions(graphPtr->interp_, (char*)setupPtr, 
-			setupPtr->optionTable, graphPtr->tkwin_);
+  setupPtr->optionTable_ =Tk_CreateOptionTable(graphPtr->interp_, optionSpecs);
+  return Tk_InitOptions(graphPtr->interp_, (char*)setupPtr->ops_, 
+			setupPtr->optionTable_, graphPtr->tkwin_);
 }
 
 void Blt_DestroyPageSetup(Graph* graphPtr)
 {
   PageSetup* setupPtr = graphPtr->pageSetup_;
-  Tk_FreeConfigOptions((char*)setupPtr, setupPtr->optionTable, graphPtr->tkwin_);
-  free(setupPtr);
-}
+  Tk_FreeConfigOptions((char*)setupPtr->ops_, setupPtr->optionTable_, 
+		       graphPtr->tkwin_);
 
-int PageSetupObjConfigure(Tcl_Interp* interp, Graph* graphPtr,
-			  int objc, Tcl_Obj* const objv[])
-{
-  PageSetup* setupPtr = graphPtr->pageSetup_;
-  Tk_SavedOptions savedOptions;
-  int mask =0;
-  int error;
-  Tcl_Obj* errorResult;
+  if(setupPtr->ops_)
+    free(setupPtr->ops_);
 
-  for (error=0; error<=1; error++) {
-    if (!error) {
-      if (Tk_SetOptions(interp, (char*)setupPtr, setupPtr->optionTable, 
-			objc, objv, graphPtr->tkwin_, &savedOptions, &mask)
-	  != TCL_OK)
-	continue;
-    }
-    else {
-      errorResult = Tcl_GetObjResult(interp);
-      Tcl_IncrRefCount(errorResult);
-      Tk_RestoreSavedOptions(&savedOptions);
-    }
-
-    break; 
-  }
-
-  if (!error) {
-    Tk_FreeSavedOptions(&savedOptions);
-    return TCL_OK;
-  }
-  else {
-    Tcl_SetObjResult(interp, errorResult);
-    Tcl_DecrRefCount(errorResult);
-    return TCL_ERROR;
-  }
+  free(setupPtr);
 }