Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Use TCL_IO_FAILURE, for more readable TIP #494 compatibility. |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
abe0d3b121cbb12d3b963ce4d5130797 |
| User & Date: | jan.nijtmans 2018-09-06 12:40:33.986 |
Context
|
2018-09-07
| ||
| 20:40 | Fix [05bd7f4da]: vista theme: combobox does not have disabled background. check-in: 0100c2ca user: fvogel tags: trunk | |
|
2018-09-06
| ||
| 12:40 | Use TCL_IO_FAILURE, for more readable TIP #494 compatibility. check-in: abe0d3b1 user: jan.nijtmans tags: trunk | |
| 08:02 | Header include reform: Since "tkInt.h" already contains header files like <stdlib.h>, <string.h> and <ctype.h>, we don't have to include those in every separate C-file. Just depend on tkInt.h to provide it. This mainly affects ttk, since most other files already adhered to this. check-in: d69113b3 user: jan.nijtmans tags: trunk | |
Changes
Changes to generic/tkCanvPs.c.
| ︙ | ︙ | |||
487 488 489 490 491 492 493 |
/*
* Insert the prolog
*/
Tcl_AppendObjToObj(psObj, preambleObj);
if (psInfo.chan != NULL) {
| | | 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 |
/*
* Insert the prolog
*/
Tcl_AppendObjToObj(psObj, preambleObj);
if (psInfo.chan != NULL) {
if (Tcl_WriteObj(psInfo.chan, psObj) == TCL_IO_FAILURE) {
channelWriteFailed:
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"problem writing postscript data to channel: %s",
Tcl_PosixError(interp)));
result = TCL_ERROR;
goto cleanup;
}
|
| ︙ | ︙ | |||
541 542 543 544 545 546 547 |
psInfo.x2, Tk_PostscriptY((double)psInfo.y,
(Tk_PostscriptInfo)psInfoPtr),
psInfo.x2, Tk_PostscriptY((double)psInfo.y2,
(Tk_PostscriptInfo)psInfoPtr),
psInfo.x, Tk_PostscriptY((double)psInfo.y2,
(Tk_PostscriptInfo)psInfoPtr));
if (psInfo.chan != NULL) {
| | | 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 |
psInfo.x2, Tk_PostscriptY((double)psInfo.y,
(Tk_PostscriptInfo)psInfoPtr),
psInfo.x2, Tk_PostscriptY((double)psInfo.y2,
(Tk_PostscriptInfo)psInfoPtr),
psInfo.x, Tk_PostscriptY((double)psInfo.y2,
(Tk_PostscriptInfo)psInfoPtr));
if (psInfo.chan != NULL) {
if (Tcl_WriteObj(psInfo.chan, psObj) == TCL_IO_FAILURE) {
goto channelWriteFailed;
}
Tcl_DecrRefCount(psObj);
psObj = Tcl_NewObj();
}
}
|
| ︙ | ︙ | |||
583 584 585 586 587 588 589 |
}
Tcl_AppendToObj(psObj, "gsave\n", -1);
Tcl_AppendObjToObj(psObj, Tcl_GetObjResult(interp));
Tcl_AppendToObj(psObj, "grestore\n", -1);
if (psInfo.chan != NULL) {
| | | | 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 |
}
Tcl_AppendToObj(psObj, "gsave\n", -1);
Tcl_AppendObjToObj(psObj, Tcl_GetObjResult(interp));
Tcl_AppendToObj(psObj, "grestore\n", -1);
if (psInfo.chan != NULL) {
if (Tcl_WriteObj(psInfo.chan, psObj) == TCL_IO_FAILURE) {
goto channelWriteFailed;
}
Tcl_DecrRefCount(psObj);
psObj = Tcl_NewObj();
}
}
/*
* Output page-end information, such as commands to print the page and
* document trailer stuff.
*/
if (psInfo.prolog) {
Tcl_AppendToObj(psObj,
"restore showpage\n\n"
"%%Trailer\n"
"end\n"
"%%EOF\n", -1);
if (psInfo.chan != NULL) {
if (Tcl_WriteObj(psInfo.chan, psObj) == TCL_IO_FAILURE) {
goto channelWriteFailed;
}
}
}
if (psInfo.chan == NULL) {
Tcl_SetObjResult(interp, psObj);
|
| ︙ | ︙ |
Changes to generic/tkImgPNG.c.
| ︙ | ︙ | |||
2881 2882 2883 2884 2885 2886 2887 | Tcl_SetObjResult(interp, Tcl_NewStringObj( "memory allocation failed", -1)); Tcl_SetErrorCode(interp, "TK", "MALLOC", NULL); return TCL_ERROR; } memcpy(destPtr+objSz, srcPtr, srcSz); | | | 2881 2882 2883 2884 2885 2886 2887 2888 2889 2890 2891 2892 2893 2894 2895 |
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"memory allocation failed", -1));
Tcl_SetErrorCode(interp, "TK", "MALLOC", NULL);
return TCL_ERROR;
}
memcpy(destPtr+objSz, srcPtr, srcSz);
} else if (Tcl_Write(pngPtr->channel, (const char *) srcPtr, srcSz) == TCL_IO_FAILURE) {
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"write to channel failed: %s", Tcl_PosixError(interp)));
return TCL_ERROR;
}
return TCL_OK;
}
|
| ︙ | ︙ |
Changes to generic/tkImgPPM.c.
| ︙ | ︙ | |||
320 321 322 323 324 325 326 |
if ((size_t)Tcl_Write(chan, (char *) pixLinePtr, nBytes) != nBytes) {
goto writeerror;
}
} else {
for (h = blockPtr->height; h > 0; h--) {
pixelPtr = pixLinePtr;
for (w = blockPtr->width; w > 0; w--) {
| | | | | 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 |
if ((size_t)Tcl_Write(chan, (char *) pixLinePtr, nBytes) != nBytes) {
goto writeerror;
}
} else {
for (h = blockPtr->height; h > 0; h--) {
pixelPtr = pixLinePtr;
for (w = blockPtr->width; w > 0; w--) {
if (Tcl_Write(chan,(char *)&pixelPtr[0], 1) == TCL_IO_FAILURE ||
Tcl_Write(chan,(char *)&pixelPtr[greenOffset],1) == TCL_IO_FAILURE ||
Tcl_Write(chan,(char *)&pixelPtr[blueOffset],1) == TCL_IO_FAILURE) {
goto writeerror;
}
pixelPtr += blockPtr->pixelSize;
}
pixLinePtr += blockPtr->pitch;
}
}
|
| ︙ | ︙ |
Changes to generic/tkInt.h.
| ︙ | ︙ | |||
838 839 840 841 842 843 844 845 846 847 848 849 850 851 |
/*
* Flags passed to TkpMakeMenuWindow's 'transient' argument.
*/
#define TK_MAKE_MENU_TEAROFF 0 /* Only non-transient case. */
#define TK_MAKE_MENU_POPUP 1
#define TK_MAKE_MENU_DROPDOWN 2
/*
* The following structure is used with TkMakeEnsemble to create ensemble
* commands and optionally to create sub-ensembles.
*/
typedef struct TkEnsemble {
| > > > > > | 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 |
/*
* Flags passed to TkpMakeMenuWindow's 'transient' argument.
*/
#define TK_MAKE_MENU_TEAROFF 0 /* Only non-transient case. */
#define TK_MAKE_MENU_POPUP 1
#define TK_MAKE_MENU_DROPDOWN 2
/* See TIP #494 */
#ifndef TCL_IO_FAILURE
# define TCL_IO_FAILURE (-1)
#endif
/*
* The following structure is used with TkMakeEnsemble to create ensemble
* commands and optionally to create sub-ensembles.
*/
typedef struct TkEnsemble {
|
| ︙ | ︙ |