Import Tk 8.6.11
This commit is contained in:
@@ -149,7 +149,7 @@ static const Tcl_ObjType windowObjType = {
|
||||
static ThreadSpecificData *
|
||||
GetTypeCache(void)
|
||||
{
|
||||
ThreadSpecificData *tsdPtr =
|
||||
ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
|
||||
Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
|
||||
|
||||
if (tsdPtr->doubleTypePtr == NULL) {
|
||||
@@ -408,8 +408,8 @@ FreePixelInternalRep(
|
||||
|
||||
static void
|
||||
DupPixelInternalRep(
|
||||
register Tcl_Obj *srcPtr, /* Object with internal rep to copy. */
|
||||
register Tcl_Obj *copyPtr) /* Object with internal rep to set. */
|
||||
Tcl_Obj *srcPtr, /* Object with internal rep to copy. */
|
||||
Tcl_Obj *copyPtr) /* Object with internal rep to set. */
|
||||
{
|
||||
copyPtr->typePtr = srcPtr->typePtr;
|
||||
|
||||
@@ -419,7 +419,7 @@ DupPixelInternalRep(
|
||||
PixelRep *oldPtr, *newPtr;
|
||||
|
||||
oldPtr = GET_COMPLEXPIXEL(srcPtr);
|
||||
newPtr = ckalloc(sizeof(PixelRep));
|
||||
newPtr = (PixelRep *)ckalloc(sizeof(PixelRep));
|
||||
newPtr->value = oldPtr->value;
|
||||
newPtr->units = oldPtr->units;
|
||||
newPtr->tkwin = oldPtr->tkwin;
|
||||
@@ -503,7 +503,7 @@ SetPixelFromAny(
|
||||
if ((units < 0) && (i == d)) {
|
||||
SET_SIMPLEPIXEL(objPtr, i);
|
||||
} else {
|
||||
PixelRep *pixelPtr = ckalloc(sizeof(PixelRep));
|
||||
PixelRep *pixelPtr = (PixelRep *)ckalloc(sizeof(PixelRep));
|
||||
|
||||
pixelPtr->value = d;
|
||||
pixelPtr->units = units;
|
||||
@@ -564,7 +564,7 @@ Tk_GetMMFromObj(
|
||||
}
|
||||
}
|
||||
|
||||
mmPtr = objPtr->internalRep.twoPtrValue.ptr1;
|
||||
mmPtr = (MMRep *)objPtr->internalRep.twoPtrValue.ptr1;
|
||||
if (mmPtr->tkwin != tkwin) {
|
||||
d = mmPtr->value;
|
||||
if (mmPtr->units == -1) {
|
||||
@@ -628,14 +628,14 @@ FreeMMInternalRep(
|
||||
|
||||
static void
|
||||
DupMMInternalRep(
|
||||
register Tcl_Obj *srcPtr, /* Object with internal rep to copy. */
|
||||
register Tcl_Obj *copyPtr) /* Object with internal rep to set. */
|
||||
Tcl_Obj *srcPtr, /* Object with internal rep to copy. */
|
||||
Tcl_Obj *copyPtr) /* Object with internal rep to set. */
|
||||
{
|
||||
MMRep *oldPtr, *newPtr;
|
||||
|
||||
copyPtr->typePtr = srcPtr->typePtr;
|
||||
oldPtr = srcPtr->internalRep.twoPtrValue.ptr1;
|
||||
newPtr = ckalloc(sizeof(MMRep));
|
||||
oldPtr = (MMRep *)srcPtr->internalRep.twoPtrValue.ptr1;
|
||||
newPtr = (MMRep *)ckalloc(sizeof(MMRep));
|
||||
newPtr->value = oldPtr->value;
|
||||
newPtr->units = oldPtr->units;
|
||||
newPtr->tkwin = oldPtr->tkwin;
|
||||
@@ -664,13 +664,13 @@ DupMMInternalRep(
|
||||
|
||||
static void
|
||||
UpdateStringOfMM(
|
||||
register Tcl_Obj *objPtr) /* pixel obj with string rep to update. */
|
||||
Tcl_Obj *objPtr) /* pixel obj with string rep to update. */
|
||||
{
|
||||
MMRep *mmPtr;
|
||||
char buffer[TCL_DOUBLE_SPACE];
|
||||
size_t len;
|
||||
|
||||
mmPtr = objPtr->internalRep.twoPtrValue.ptr1;
|
||||
mmPtr = (MMRep *)objPtr->internalRep.twoPtrValue.ptr1;
|
||||
/* assert( mmPtr->units == -1 && objPtr->bytes == NULL ); */
|
||||
if ((mmPtr->units != -1) || (objPtr->bytes != NULL)) {
|
||||
Tcl_Panic("UpdateStringOfMM: false precondition");
|
||||
@@ -679,7 +679,7 @@ UpdateStringOfMM(
|
||||
Tcl_PrintDouble(NULL, mmPtr->value, buffer);
|
||||
len = strlen(buffer);
|
||||
|
||||
objPtr->bytes = ckalloc(len + 1);
|
||||
objPtr->bytes = (char *)ckalloc(len + 1);
|
||||
strcpy(objPtr->bytes, buffer);
|
||||
objPtr->length = len;
|
||||
}
|
||||
@@ -787,7 +787,7 @@ SetMMFromAny(
|
||||
|
||||
objPtr->typePtr = &mmObjType;
|
||||
|
||||
mmPtr = ckalloc(sizeof(MMRep));
|
||||
mmPtr = (MMRep *)ckalloc(sizeof(MMRep));
|
||||
mmPtr->value = d;
|
||||
mmPtr->units = units;
|
||||
mmPtr->tkwin = NULL;
|
||||
@@ -827,7 +827,7 @@ TkGetWindowFromObj(
|
||||
Tk_Window *windowPtr) /* Place to store resulting window. */
|
||||
{
|
||||
TkMainInfo *mainPtr = ((TkWindow *) tkwin)->mainPtr;
|
||||
register WindowRep *winPtr;
|
||||
WindowRep *winPtr;
|
||||
|
||||
if (objPtr->typePtr != &windowObjType) {
|
||||
int result = SetWindowFromAny(interp, objPtr);
|
||||
@@ -836,7 +836,7 @@ TkGetWindowFromObj(
|
||||
}
|
||||
}
|
||||
|
||||
winPtr = objPtr->internalRep.twoPtrValue.ptr1;
|
||||
winPtr = (WindowRep *)objPtr->internalRep.twoPtrValue.ptr1;
|
||||
if (winPtr->tkwin == NULL
|
||||
|| winPtr->mainPtr == NULL
|
||||
|| winPtr->mainPtr != mainPtr
|
||||
@@ -882,8 +882,8 @@ TkGetWindowFromObj(
|
||||
|
||||
static int
|
||||
SetWindowFromAny(
|
||||
Tcl_Interp *interp, /* Used for error reporting if not NULL. */
|
||||
register Tcl_Obj *objPtr) /* The object to convert. */
|
||||
TCL_UNUSED(Tcl_Interp *),
|
||||
Tcl_Obj *objPtr) /* The object to convert. */
|
||||
{
|
||||
const Tcl_ObjType *typePtr;
|
||||
WindowRep *winPtr;
|
||||
@@ -898,7 +898,7 @@ SetWindowFromAny(
|
||||
typePtr->freeIntRepProc(objPtr);
|
||||
}
|
||||
|
||||
winPtr = ckalloc(sizeof(WindowRep));
|
||||
winPtr = (WindowRep *)ckalloc(sizeof(WindowRep));
|
||||
winPtr->tkwin = NULL;
|
||||
winPtr->mainPtr = NULL;
|
||||
winPtr->epoch = 0;
|
||||
@@ -993,7 +993,7 @@ TkNewWindowObj(
|
||||
{
|
||||
Tcl_Obj *objPtr = Tcl_NewStringObj(Tk_PathName(tkwin), -1);
|
||||
TkMainInfo *mainPtr = ((TkWindow *) tkwin)->mainPtr;
|
||||
register WindowRep *winPtr;
|
||||
WindowRep *winPtr;
|
||||
|
||||
SetWindowFromAny(NULL, objPtr);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user