diff options
| -rw-r--r-- | src/bltGrPSOutput.C | 11 | ||||
| -rw-r--r-- | src/bltGrPSOutput.h | 27 | ||||
| -rw-r--r-- | src/bltGrPostscriptOp.C | 2 | ||||
| -rw-r--r-- | src/bltGrPostscriptOp.h | 2 | ||||
| -rw-r--r-- | src/bltGraphOp.C | 2 |
5 files changed, 4 insertions, 40 deletions
diff --git a/src/bltGrPSOutput.C b/src/bltGrPSOutput.C index 653b453..405fc05 100644 --- a/src/bltGrPSOutput.C +++ b/src/bltGrPSOutput.C @@ -28,17 +28,9 @@ * */ -#include <stdarg.h> - extern "C" { #include <tkPort.h> -#include <tkInt.h> #include <tk3d.h> -}; - -#include "bltMath.h" - -extern "C" { #include "bltInt.h" }; @@ -52,9 +44,6 @@ extern "C" { # define HAVE_UTF 0 #endif -#define FONT_ITALIC (1<<0) -#define FONT_BOLD (1<<1) - #define PS_MAXPATH 1500 /* Maximum number of components in a * PostScript (level 1) path. */ diff --git a/src/bltGrPSOutput.h b/src/bltGrPSOutput.h index b4eb285..263c4ed 100644 --- a/src/bltGrPSOutput.h +++ b/src/bltGrPSOutput.h @@ -31,6 +31,7 @@ #define _BLT_PS_H #include "bltConfig.h" +#include "bltText.h" #define POSTSCRIPT_BUFSIZ ((BUFSIZ*2)-1) struct _Blt_Ps { @@ -44,12 +45,6 @@ typedef struct _Blt_Ps PostScript; #define PS_MAXPECT (1<<4) -#define PS_FMT_NONE 0 -#define PS_FMT_MASK (PS_FMT_WMF|PS_FMT_EPSI|PS_FMT_TIFF) -#define PS_FMT_WMF (1<<8) -#define PS_FMT_EPSI (1<<9) -#define PS_FMT_TIFF (1<<10) - typedef struct _Blt_Ps *Blt_Ps; extern Blt_Ps Blt_Ps_Create(Tcl_Interp* interp, PageSetup *setupPtr); @@ -58,18 +53,10 @@ extern void Blt_Ps_Free(Blt_Ps ps); extern const char *Blt_Ps_GetValue(Blt_Ps ps, int *lengthPtr); -extern Tcl_Interp *Blt_Ps_GetInterp(Blt_Ps ps); - -extern Tcl_DString *Blt_Ps_GetDString(Blt_Ps ps); - extern char *Blt_Ps_GetScratchBuffer(Blt_Ps ps); -extern void Blt_Ps_SetInterp(Blt_Ps ps, Tcl_Interp* interp); - extern void Blt_Ps_Append(Blt_Ps ps, const char *string); -extern void Blt_Ps_AppendBytes(Blt_Ps ps, const char *string, int nBytes); - extern void Blt_Ps_VarAppend TCL_VARARGS(Blt_Ps, ps); extern void Blt_Ps_Format TCL_VARARGS(Blt_Ps, ps); @@ -84,12 +71,6 @@ extern int Blt_Ps_ComputeBoundingBox(PageSetup *setupPtr, int w, int h); extern void Blt_Ps_Rectangle(Blt_Ps ps, int x, int y, int w, int h); -extern int Blt_Ps_SaveFile(Tcl_Interp* interp, Blt_Ps ps, - const char *fileName); - -#ifdef _TK - -#include "bltText.h" extern void Blt_Ps_XSetLineWidth(Blt_Ps ps, int lineWidth); @@ -156,11 +137,5 @@ extern void Blt_Ps_PolylineFromXPoints(Blt_Ps ps, XPoint *points, int n); extern void Blt_Ps_Polygon(Blt_Ps ps, Point2d *screenPts, int nScreenPts); extern void Blt_Ps_SetPrinting(Blt_Ps ps, int value); -extern int Blt_Ps_IsPrinting(void); - -extern void Blt_Ps_FontName(const char *family, int flags, - Tcl_DString *resultPtr); - -#endif /* _TK */ #endif /* BLT_PS_H */ diff --git a/src/bltGrPostscriptOp.C b/src/bltGrPostscriptOp.C index 2c81984..ba81d46 100644 --- a/src/bltGrPostscriptOp.C +++ b/src/bltGrPostscriptOp.C @@ -178,7 +178,7 @@ static int nPsOps = sizeof(psOps) / sizeof(Blt_OpSpec); typedef int (GraphPsProc)(Graph* graphPtr, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[]); -int Blt_PsOp(Graph* graphPtr, Tcl_Interp* interp, int objc, +int Blt_PageSetupOp(Graph* graphPtr, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[]) { GraphPsProc* proc = (GraphPsProc*)Blt_GetOpFromObj(interp, nPsOps, psOps, BLT_OP_ARG2, objc, objv, 0); diff --git a/src/bltGrPostscriptOp.h b/src/bltGrPostscriptOp.h index 02abee5..cb2d866 100644 --- a/src/bltGrPostscriptOp.h +++ b/src/bltGrPostscriptOp.h @@ -37,6 +37,6 @@ using namespace std; extern int PageSetupObjConfigure(Tcl_Interp* interp, Graph* graphPtr, int objc, Tcl_Obj* const objv[]); -extern int Blt_PsOp(Graph* graphPtr, Tcl_Interp* interp, int objc, +extern int Blt_PageSetupOp(Graph* graphPtr, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[]); #endif diff --git a/src/bltGraphOp.C b/src/bltGraphOp.C index db05fd4..2229da8 100644 --- a/src/bltGraphOp.C +++ b/src/bltGraphOp.C @@ -399,7 +399,7 @@ static Blt_OpSpec graphOps[] = {"line", 2, (void*)ElementOp, 2, 0, "oper ?args?",}, {"marker", 2, (void*)Blt::MarkerOp, 2, 0, "oper ?args?",}, {"pen", 2, (void*)Blt_PenOp, 2, 0, "oper ?args?",}, - {"postscript", 2, (void*)Blt_PsOp, 2, 0, "oper ?args?",}, + {"postscript", 2, (void*)Blt_PageSetupOp, 2, 0, "oper ?args?",}, {"transform", 1, (void*)TransformOp, 4, 4, "x y",}, {"x2axis", 2, (void*)X2AxisOp, 2, 0, "oper ?args?",}, {"xaxis", 2, (void*)XAxisOp, 2, 0, "oper ?args?",}, |