diff options
| author | joye <joye> | 2013-09-12 17:33:06 (GMT) |
|---|---|---|
| committer | joye <joye> | 2013-09-12 17:33:06 (GMT) |
| commit | d9a385b17f6bd6cc2bfadba2ed35017acadcbc97 (patch) | |
| tree | 0c524046681e709cfdd4ab43f35ecab28cbff4e6 | |
| parent | 3343899d0c32bf41791f31175b622e5b992a1659 (diff) | |
| download | blt-d9a385b17f6bd6cc2bfadba2ed35017acadcbc97.zip blt-d9a385b17f6bd6cc2bfadba2ed35017acadcbc97.tar.gz blt-d9a385b17f6bd6cc2bfadba2ed35017acadcbc97.tar.bz2 | |
*** empty log message ***
| -rw-r--r-- | src/bltGrLegd.C | 2 | ||||
| -rw-r--r-- | src/bltGrPSOutput.C | 3 | ||||
| -rw-r--r-- | src/bltGrText.C | 3 | ||||
| -rw-r--r-- | src/bltInt.C | 2 | ||||
| -rw-r--r-- | src/bltNsUtil.C | 3 |
5 files changed, 2 insertions, 11 deletions
diff --git a/src/bltGrLegd.C b/src/bltGrLegd.C index cceab8c..23205f2 100644 --- a/src/bltGrLegd.C +++ b/src/bltGrLegd.C @@ -2416,7 +2416,7 @@ IconOp(Graph *graphPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) if (isPicture) { Blt_ResetPicture(interp, imageName, picture); } else { - Blt_PictureToPhoto(picture, photo); + Blt_PictureToPhoto(interp, picture, photo); Blt_FreePicture(picture); } return TCL_OK; diff --git a/src/bltGrPSOutput.C b/src/bltGrPSOutput.C index 3bd5a66..1aff502 100644 --- a/src/bltGrPSOutput.C +++ b/src/bltGrPSOutput.C @@ -34,10 +34,7 @@ #include <tkInt.h> #include <tk3d.h> -#define FOOBAR #include "bltInt.h" -#undef FOOBAR - #include "bltMath.h" #include "bltDBuffer.h" #include "bltPicture.h" diff --git a/src/bltGrText.C b/src/bltGrText.C index 7b974fc..eff55e8 100644 --- a/src/bltGrText.C +++ b/src/bltGrText.C @@ -32,10 +32,7 @@ #include <tkInt.h> #include <tk3d.h> -#define FOOBAR #include "bltInt.h" -#undef FOOBAR - #include "bltMath.h" #include "bltHash.h" #include "bltImage.h" diff --git a/src/bltInt.C b/src/bltInt.C index f395378..41ad000 100644 --- a/src/bltInt.C +++ b/src/bltInt.C @@ -46,7 +46,7 @@ int Tlt_Init(Tcl_Interp *interp) } if( -#ifdef USE_TCL_STUBS +#ifdef USE_TK_STUBS Tk_InitStubs(interp, TK_PATCH_LEVEL, 0) #else Tcl_PkgRequire(interp, "Tk", TK_PATCH_LEVEL, 0) diff --git a/src/bltNsUtil.C b/src/bltNsUtil.C index 7be8363..bc7a9b9 100644 --- a/src/bltNsUtil.C +++ b/src/bltNsUtil.C @@ -29,10 +29,7 @@ #include <tclPort.h> #include <tclInt.h> -#define FOOBAR #include "bltInt.h" -#undef FOOBAR - #include "bltNsUtil.h" /*ARGSUSED*/ |