summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--generic/tkConfig.c250
-rw-r--r--generic/tkListbox.c116
-rw-r--r--generic/tkMenu.c120
-rw-r--r--generic/tkObj.c12
-rw-r--r--generic/tkOption.c10
-rw-r--r--generic/tkPanedWindow.c116
-rw-r--r--generic/tkPlace.c8
-rw-r--r--generic/tkSelect.c8
-rw-r--r--generic/tkTextWind.c8
-rw-r--r--win/nmakehlp.c37
10 files changed, 345 insertions, 340 deletions
diff --git a/generic/tkConfig.c b/generic/tkConfig.c
index bbbed91..3336467 100644
--- a/generic/tkConfig.c
+++ b/generic/tkConfig.c
@@ -215,7 +215,7 @@ Tk_CreateOptionTable(
* reuse the existing table.
*/
- hashEntryPtr = Tcl_CreateHashEntry(&tsdPtr->hashTable, (char *) templatePtr,
+ hashEntryPtr = Tcl_CreateHashEntry(&tsdPtr->hashTable, (char *)templatePtr,
&newEntry);
if (!newEntry) {
tablePtr = (OptionTable *)Tcl_GetHashValue(hashEntryPtr);
@@ -262,7 +262,7 @@ Tk_CreateOptionTable(
Tcl_Panic("Tk_CreateOptionTable couldn't find synonym");
}
if (strcmp(specPtr2->optionName,
- (char *) specPtr->clientData) == 0) {
+ (char *)specPtr->clientData) == 0) {
optionPtr->extra.synonymPtr = tablePtr->options + i;
break;
}
@@ -621,9 +621,9 @@ DoObjConfig(
if (savedOptionPtr != NULL) {
savedOptionPtr->optionPtr = optionPtr;
savedOptionPtr->valuePtr = oldPtr;
- oldInternalPtr = (char *) &savedOptionPtr->internalForm;
+ oldInternalPtr = (char *)&savedOptionPtr->internalForm;
} else {
- oldInternalPtr = (char *) &internal.internalForm;
+ oldInternalPtr = (char *)&internal.internalForm;
}
nullOK = (optionPtr->specPtr->flags & (TK_OPTION_NULL_OK|TCL_NULL_OK|1));
switch (optionPtr->specPtr->type) {
@@ -643,17 +643,17 @@ DoObjConfig(
if (internalPtr != NULL) {
if (optionPtr->specPtr->flags & TYPE_MASK) {
if ((optionPtr->specPtr->flags & TYPE_MASK) == TK_OPTION_VAR(char)) {
- *((char *) oldInternalPtr) = *((char *) internalPtr);
- *((char *) internalPtr) = (char)newBool;
+ *((char *)oldInternalPtr) = *((char *)internalPtr);
+ *((char *)internalPtr) = (char)newBool;
} else if ((optionPtr->specPtr->flags & TYPE_MASK) == TK_OPTION_VAR(short)) {
- *((short *) oldInternalPtr) = *((short *) internalPtr);
- *((short *) internalPtr) = (short)newBool;
+ *((short *)oldInternalPtr) = *((short *)internalPtr);
+ *((short *)internalPtr) = (short)newBool;
} else {
Tcl_Panic("Invalid flags for %s", "TK_OPTION_BOOLEAN");
}
} else {
- *((int *) oldInternalPtr) = *((int *) internalPtr);
- *((int *) internalPtr) = newBool;
+ *((int *)oldInternalPtr) = *((int *)internalPtr);
+ *((int *)internalPtr) = newBool;
}
}
break;
@@ -670,13 +670,13 @@ DoObjConfig(
if (nullOK && interp) {
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"expected integer or \"\" but got \"%.50s\"", Tcl_GetString(valuePtr)));
- Tcl_SetErrorCode(interp, "TCL", "VALUE", "NUMBER", NULL);
+ Tcl_SetErrorCode(interp, "TCL", "VALUE", "NUMBER", (char *)NULL);
}
return TCL_ERROR;
}
if (internalPtr != NULL) {
- *((int *) oldInternalPtr) = *((int *) internalPtr);
- *((int *) internalPtr) = newInt;
+ *((int *)oldInternalPtr) = *((int *)internalPtr);
+ *((int *)internalPtr) = newInt;
}
} else if ((optionPtr->specPtr->flags & TYPE_MASK) == TYPE_MASK) {
Tcl_WideInt newWideInt;
@@ -688,11 +688,11 @@ DoObjConfig(
}
if (internalPtr != NULL) {
if (sizeof(long) > sizeof(int)) {
- *((long *) oldInternalPtr) = *((long *) internalPtr);
- *((long *) internalPtr) = (long)newWideInt;
+ *((long *)oldInternalPtr) = *((long *)internalPtr);
+ *((long *)internalPtr) = (long)newWideInt;
} else {
- *((long long *) oldInternalPtr) = *((long long *) internalPtr);
- *((long long *) internalPtr) = (long long)newWideInt;
+ *((long long *)oldInternalPtr) = *((long long *)internalPtr);
+ *((long long *)internalPtr) = (long long)newWideInt;
}
}
} else {
@@ -716,8 +716,8 @@ DoObjConfig(
newIndex = INT_MAX;
}
if (internalPtr != NULL) {
- *((int *) oldInternalPtr) = *((int *) internalPtr);
- *((int *) internalPtr) = (int)newIndex;
+ *((int *)oldInternalPtr) = *((int *)internalPtr);
+ *((int *)internalPtr) = (int)newIndex;
}
break;
}
@@ -739,15 +739,15 @@ DoObjConfig(
Tcl_AppendLimitedToObj(msg, Tcl_GetString(valuePtr), TCL_INDEX_NONE, 50, "");
Tcl_AppendToObj(msg, "\"", TCL_INDEX_NONE);
Tcl_SetObjResult(interp, msg);
- Tcl_SetErrorCode(interp, "TCL", "VALUE", "NUMBER", NULL);
+ Tcl_SetErrorCode(interp, "TCL", "VALUE", "NUMBER", (char *)NULL);
}
return TCL_ERROR;
}
}
if (internalPtr != NULL) {
- *((double *) oldInternalPtr) = *((double *) internalPtr);
- *((double *) internalPtr) = newDbl;
+ *((double *)oldInternalPtr) = *((double *)internalPtr);
+ *((double *)internalPtr) = newDbl;
}
break;
}
@@ -767,8 +767,8 @@ DoObjConfig(
} else {
newStr = NULL;
}
- *((char **) oldInternalPtr) = *((char **) internalPtr);
- *((char **) internalPtr) = newStr;
+ *((char **)oldInternalPtr) = *((char **)internalPtr);
+ *((char **)internalPtr) = newStr;
}
break;
}
@@ -792,17 +792,17 @@ DoObjConfig(
if (internalPtr != NULL) {
if (optionPtr->specPtr->flags & TYPE_MASK) {
if ((optionPtr->specPtr->flags & TYPE_MASK) == TK_OPTION_VAR(char)) {
- *((char *) oldInternalPtr) = *((char *) internalPtr);
- *((char *) internalPtr) = (char)newValue;
+ *((char *)oldInternalPtr) = *((char *)internalPtr);
+ *((char *)internalPtr) = (char)newValue;
} else if ((optionPtr->specPtr->flags & TYPE_MASK) == TK_OPTION_VAR(short)) {
- *((short *) oldInternalPtr) = *((short *) internalPtr);
- *((short *) internalPtr) = (short)newValue;
+ *((short *)oldInternalPtr) = *((short *)internalPtr);
+ *((short *)internalPtr) = (short)newValue;
} else {
Tcl_Panic("Invalid flags for %s", "TK_OPTION_STRING_TABLE");
}
} else {
- *((int *) oldInternalPtr) = *((int *) internalPtr);
- *((int *) internalPtr) = newValue;
+ *((int *)oldInternalPtr) = *((int *)internalPtr);
+ *((int *)internalPtr) = newValue;
}
}
break;
@@ -820,8 +820,8 @@ DoObjConfig(
}
}
if (internalPtr != NULL) {
- *((XColor **) oldInternalPtr) = *((XColor **) internalPtr);
- *((XColor **) internalPtr) = newPtr;
+ *((XColor **)oldInternalPtr) = *((XColor **)internalPtr);
+ *((XColor **)internalPtr) = newPtr;
}
break;
}
@@ -838,8 +838,8 @@ DoObjConfig(
}
}
if (internalPtr != NULL) {
- *((Tk_Font *) oldInternalPtr) = *((Tk_Font *) internalPtr);
- *((Tk_Font *) internalPtr) = newFont;
+ *((Tk_Font *)oldInternalPtr) = *((Tk_Font *)internalPtr);
+ *((Tk_Font *)internalPtr) = newFont;
}
break;
}
@@ -856,8 +856,8 @@ DoObjConfig(
}
}
if (internalPtr != NULL) {
- *((Tk_Style *) oldInternalPtr) = *((Tk_Style *) internalPtr);
- *((Tk_Style *) internalPtr) = newStyle;
+ *((Tk_Style *)oldInternalPtr) = *((Tk_Style *)internalPtr);
+ *((Tk_Style *)internalPtr) = newStyle;
}
break;
}
@@ -874,8 +874,8 @@ DoObjConfig(
}
}
if (internalPtr != NULL) {
- *((Pixmap *) oldInternalPtr) = *((Pixmap *) internalPtr);
- *((Pixmap *) internalPtr) = newBitmap;
+ *((Pixmap *)oldInternalPtr) = *((Pixmap *)internalPtr);
+ *((Pixmap *)internalPtr) = newBitmap;
}
break;
}
@@ -892,8 +892,8 @@ DoObjConfig(
}
}
if (internalPtr != NULL) {
- *((Tk_3DBorder *) oldInternalPtr) = *((Tk_3DBorder *) internalPtr);
- *((Tk_3DBorder *) internalPtr) = newBorder;
+ *((Tk_3DBorder *)oldInternalPtr) = *((Tk_3DBorder *)internalPtr);
+ *((Tk_3DBorder *)internalPtr) = newBorder;
}
break;
}
@@ -910,17 +910,17 @@ DoObjConfig(
if (internalPtr != NULL) {
if (optionPtr->specPtr->flags & TYPE_MASK) {
if ((optionPtr->specPtr->flags & TYPE_MASK) == TK_OPTION_VAR(char)) {
- *((char *) oldInternalPtr) = *((char *) internalPtr);
- *((char *) internalPtr) = (char)newRelief;
+ *((char *)oldInternalPtr) = *((char *)internalPtr);
+ *((char *)internalPtr) = (char)newRelief;
} else if ((optionPtr->specPtr->flags & TYPE_MASK) == TK_OPTION_VAR(short)) {
- *((short *) oldInternalPtr) = *((short *) internalPtr);
- *((short *) internalPtr) = (short)newRelief;
+ *((short *)oldInternalPtr) = *((short *)internalPtr);
+ *((short *)internalPtr) = (short)newRelief;
} else {
Tcl_Panic("Invalid flags for %s", "TK_OPTION_RELIEF");
}
} else {
- *((int *) oldInternalPtr) = *((int *) internalPtr);
- *((int *) internalPtr) = newRelief;
+ *((int *)oldInternalPtr) = *((int *)internalPtr);
+ *((int *)internalPtr) = newRelief;
}
}
if (slotPtrPtr != NULL && valuePtr != NULL) {
@@ -961,17 +961,17 @@ DoObjConfig(
if (internalPtr != NULL) {
if (optionPtr->specPtr->flags & TYPE_MASK) {
if ((optionPtr->specPtr->flags & TYPE_MASK) == TK_OPTION_VAR(char)) {
- *((char *) oldInternalPtr) = *((char *) internalPtr);
- *((char *) internalPtr) = (char)newJustify;
+ *((char *)oldInternalPtr) = *((char *)internalPtr);
+ *((char *)internalPtr) = (char)newJustify;
} else if ((optionPtr->specPtr->flags & TYPE_MASK) == TK_OPTION_VAR(short)) {
- *((short *) oldInternalPtr) = *((short *) internalPtr);
- *((short *) internalPtr) = (short)newJustify;
+ *((short *)oldInternalPtr) = *((short *)internalPtr);
+ *((short *)internalPtr) = (short)newJustify;
} else {
Tcl_Panic("Invalid flags for %s", "TK_OPTION_JUSTIFY");
}
} else {
- *((int *) oldInternalPtr) = *((int *) internalPtr);
- *((int *) internalPtr) = newJustify;
+ *((int *)oldInternalPtr) = *((int *)internalPtr);
+ *((int *)internalPtr) = newJustify;
}
}
if (slotPtrPtr != NULL && valuePtr != NULL) {
@@ -993,17 +993,17 @@ DoObjConfig(
if (internalPtr != NULL) {
if (optionPtr->specPtr->flags & TYPE_MASK) {
if ((optionPtr->specPtr->flags & TYPE_MASK) == TK_OPTION_VAR(char)) {
- *((char *) oldInternalPtr) = *((char *) internalPtr);
- *((char *) internalPtr) = (char)newAnchor;
+ *((char *)oldInternalPtr) = *((char *)internalPtr);
+ *((char *)internalPtr) = (char)newAnchor;
} else if ((optionPtr->specPtr->flags & TYPE_MASK) == TK_OPTION_VAR(short)) {
- *((short *) oldInternalPtr) = *((short *) internalPtr);
- *((short *) internalPtr) = (short)newAnchor;
+ *((short *)oldInternalPtr) = *((short *)internalPtr);
+ *((short *)internalPtr) = (short)newAnchor;
} else {
Tcl_Panic("Invalid flags for %s", "TK_OPTION_JUSTIFY");
}
} else {
- *((int *) oldInternalPtr) = *((int *) internalPtr);
- *((int *) internalPtr) = newAnchor;
+ *((int *)oldInternalPtr) = *((int *)internalPtr);
+ *((int *)internalPtr) = newAnchor;
}
}
if (slotPtrPtr != NULL && valuePtr != NULL) {
@@ -1020,16 +1020,16 @@ DoObjConfig(
newPixels = INT_MIN;
} else if (Tk_GetPixelsFromObj(nullOK ? NULL : interp, tkwin, valuePtr,
&newPixels) != TCL_OK) {
- if (nullOK && interp) {
+ if (nullOK) {
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"expected screen distance or \"\" but got \"%.50s\"", Tcl_GetString(valuePtr)));
- Tcl_SetErrorCode(interp, "TK", "VALUE", "PIXELS", NULL);
+ Tcl_SetErrorCode(interp, "TK", "VALUE", "PIXELS", (char *)NULL);
}
return TCL_ERROR;
}
if (internalPtr != NULL) {
- *((int *) oldInternalPtr) = *((int *) internalPtr);
- *((int *) internalPtr) = newPixels;
+ *((int *)oldInternalPtr) = *((int *)internalPtr);
+ *((int *)internalPtr) = newPixels;
}
break;
}
@@ -1044,8 +1044,8 @@ DoObjConfig(
return TCL_ERROR;
}
if (internalPtr != NULL) {
- *((Tk_Window *) oldInternalPtr) = *((Tk_Window *) internalPtr);
- *((Tk_Window *) internalPtr) = newWin;
+ *((Tk_Window *)oldInternalPtr) = *((Tk_Window *)internalPtr);
+ *((Tk_Window *)internalPtr) = newWin;
}
break;
}
@@ -1064,7 +1064,7 @@ DoObjConfig(
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"bad config table: unknown type %d",
optionPtr->specPtr->type));
- Tcl_SetErrorCode(interp, "TK", "BAD_CONFIG", NULL);
+ Tcl_SetErrorCode(interp, "TK", "BAD_CONFIG", (char *)NULL);
return TCL_ERROR;
}
@@ -1271,7 +1271,7 @@ GetOptionFromObj(
if (interp != NULL) {
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"unknown option \"%s\"", name));
- Tcl_SetErrorCode(interp, "TK", "LOOKUP", "OPTION", name, NULL);
+ Tcl_SetErrorCode(interp, "TK", "LOOKUP", "OPTION", name, (char *)NULL);
}
return NULL;
}
@@ -1447,7 +1447,7 @@ Tk_SetOptions(
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"value for \"%s\" missing",
Tcl_GetString(*objv)));
- Tcl_SetErrorCode(interp, "TK", "VALUE_MISSING", NULL);
+ Tcl_SetErrorCode(interp, "TK", "VALUE_MISSING", (char *)NULL);
goto error;
}
}
@@ -1570,86 +1570,86 @@ Tk_RestoreSavedOptions(
= savePtr->items[i].valuePtr;
}
if (specPtr->internalOffset != TCL_INDEX_NONE) {
- char *ptr = (char *) &savePtr->items[i].internalForm;
+ char *ptr = (char *)&savePtr->items[i].internalForm;
CLANG_ASSERT(internalPtr);
switch (specPtr->type) {
case TK_OPTION_BOOLEAN:
if (optionPtr->specPtr->flags & TYPE_MASK) {
if ((optionPtr->specPtr->flags & TYPE_MASK) == TK_OPTION_VAR(char)) {
- *((char *) internalPtr) = *((char *) ptr);
+ *((char *)internalPtr) = *((char *)ptr);
} else if ((optionPtr->specPtr->flags & TYPE_MASK) == TK_OPTION_VAR(short)) {
- *((short *) internalPtr) = *((short *) ptr);
+ *((short *)internalPtr) = *((short *)ptr);
} else {
Tcl_Panic("Invalid flags for %s", "TK_OPTION_BOOLEAN");
}
} else {
- *((int *) internalPtr) = *((int *) ptr);
+ *((int *)internalPtr) = *((int *)ptr);
}
break;
case TK_OPTION_INT:
if (optionPtr->specPtr->flags & TYPE_MASK) {
if ((optionPtr->specPtr->flags & TYPE_MASK) == TYPE_MASK) {
if (sizeof(long) > sizeof(int)) {
- *((long *) internalPtr) = *((long *) ptr);
+ *((long *)internalPtr) = *((long *)ptr);
} else {
- *((long long *) internalPtr) = *((long long *) ptr);
+ *((long long *)internalPtr) = *((long long *)ptr);
}
} else {
Tcl_Panic("Invalid flags for %s", "TK_OPTION_INT");
}
} else {
- *((int *) internalPtr) = *((int *) ptr);
+ *((int *)internalPtr) = *((int *)ptr);
}
break;
case TK_OPTION_INDEX:
- *((int *) internalPtr) = *((int *) ptr);
+ *((int *)internalPtr) = *((int *)ptr);
break;
case TK_OPTION_DOUBLE:
- *((double *) internalPtr) = *((double *) ptr);
+ *((double *)internalPtr) = *((double *)ptr);
break;
case TK_OPTION_STRING:
- *((char **) internalPtr) = *((char **) ptr);
+ *((char **)internalPtr) = *((char **)ptr);
break;
case TK_OPTION_STRING_TABLE:
if (optionPtr->specPtr->flags & TYPE_MASK) {
if ((optionPtr->specPtr->flags & TYPE_MASK) == TK_OPTION_VAR(char)) {
- *((char *) internalPtr) = *((char *) ptr);
+ *((char *)internalPtr) = *((char *)ptr);
} else if ((optionPtr->specPtr->flags & TYPE_MASK) == TK_OPTION_VAR(short)) {
- *((short *) internalPtr) = *((short *) ptr);
+ *((short *)internalPtr) = *((short *)ptr);
} else {
Tcl_Panic("Invalid flags for %s", "TK_OPTION_STRING_TABLE");
}
} else {
- *((int *) internalPtr) = *((int *) ptr);
+ *((int *)internalPtr) = *((int *)ptr);
}
break;
case TK_OPTION_COLOR:
- *((XColor **) internalPtr) = *((XColor **) ptr);
+ *((XColor **)internalPtr) = *((XColor **)ptr);
break;
case TK_OPTION_FONT:
- *((Tk_Font *) internalPtr) = *((Tk_Font *) ptr);
+ *((Tk_Font *)internalPtr) = *((Tk_Font *)ptr);
break;
case TK_OPTION_STYLE:
- *((Tk_Style *) internalPtr) = *((Tk_Style *) ptr);
+ *((Tk_Style *)internalPtr) = *((Tk_Style *)ptr);
break;
case TK_OPTION_BITMAP:
- *((Pixmap *) internalPtr) = *((Pixmap *) ptr);
+ *((Pixmap *)internalPtr) = *((Pixmap *)ptr);
break;
case TK_OPTION_BORDER:
- *((Tk_3DBorder *) internalPtr) = *((Tk_3DBorder *) ptr);
+ *((Tk_3DBorder *)internalPtr) = *((Tk_3DBorder *)ptr);
break;
case TK_OPTION_RELIEF:
if (optionPtr->specPtr->flags & TYPE_MASK) {
if ((optionPtr->specPtr->flags & TYPE_MASK) == TK_OPTION_VAR(char)) {
- *((char *) internalPtr) = *((char *) ptr);
+ *((char *)internalPtr) = *((char *)ptr);
} else if ((optionPtr->specPtr->flags & TYPE_MASK) == TK_OPTION_VAR(short)) {
- *((short *) internalPtr) = *((short *) ptr);
+ *((short *)internalPtr) = *((short *)ptr);
} else {
Tcl_Panic("Invalid flags for %s", "TK_OPTION_RELIEF");
}
} else {
- *((int *) internalPtr) = *((int *) ptr);
+ *((int *)internalPtr) = *((int *)ptr);
}
break;
case TK_OPTION_CURSOR:
@@ -1659,34 +1659,34 @@ Tk_RestoreSavedOptions(
case TK_OPTION_JUSTIFY:
if (optionPtr->specPtr->flags & TYPE_MASK) {
if ((optionPtr->specPtr->flags & TYPE_MASK) == TK_OPTION_VAR(char)) {
- *((char *) internalPtr) = *((char *) ptr);
+ *((char *)internalPtr) = *((char *)ptr);
} else if ((optionPtr->specPtr->flags & TYPE_MASK) == TK_OPTION_VAR(short)) {
- *((short *) internalPtr) = *((short *) ptr);
+ *((short *)internalPtr) = *((short *)ptr);
} else {
Tcl_Panic("Invalid flags for %s", "TK_OPTION_JUSTIFY");
}
} else {
- *((int *) internalPtr) = *((int *) ptr);
+ *((int *)internalPtr) = *((int *)ptr);
}
break;
case TK_OPTION_ANCHOR:
if (optionPtr->specPtr->flags & TYPE_MASK) {
if ((optionPtr->specPtr->flags & TYPE_MASK) == TK_OPTION_VAR(char)) {
- *((char *) internalPtr) = *((char *) ptr);
+ *((char *)internalPtr) = *((char *)ptr);
} else if ((optionPtr->specPtr->flags & TYPE_MASK) == TK_OPTION_VAR(short)) {
- *((short *) internalPtr) = *((short *) ptr);
+ *((short *)internalPtr) = *((short *)ptr);
} else {
Tcl_Panic("Invalid flags for %s", "TK_OPTION_ANCHOR");
}
} else {
- *((int *) internalPtr) = *((int *) ptr);
+ *((int *)internalPtr) = *((int *)ptr);
}
break;
case TK_OPTION_PIXELS:
- *((int *) internalPtr) = *((int *) ptr);
+ *((int *)internalPtr) = *((int *)ptr);
break;
case TK_OPTION_WINDOW:
- *((Tk_Window *) internalPtr) = *((Tk_Window *) ptr);
+ *((Tk_Window *)internalPtr) = *((Tk_Window *)ptr);
break;
case TK_OPTION_CUSTOM: {
const Tk_ObjCustomOption *custom = optionPtr->extra.custom;
@@ -1738,7 +1738,7 @@ Tk_FreeSavedOptions(
savedOptionPtr = &savePtr->items[count-1];
if (savedOptionPtr->optionPtr->flags & OPTION_NEEDS_FREEING) {
FreeResources(savedOptionPtr->optionPtr, savedOptionPtr->valuePtr,
- (char *) &savedOptionPtr->internalForm, savePtr->tkwin);
+ (char *)&savedOptionPtr->internalForm, savePtr->tkwin);
}
if (savedOptionPtr->valuePtr != NULL) {
Tcl_DecrRefCount(savedOptionPtr->valuePtr);
@@ -1849,17 +1849,17 @@ FreeResources(
switch (optionPtr->specPtr->type) {
case TK_OPTION_STRING:
if (internalFormExists) {
- if (*((char **) internalPtr) != NULL) {
- ckfree(*((char **) internalPtr));
- *((char **) internalPtr) = NULL;
+ if (*((char **)internalPtr) != NULL) {
+ ckfree(*((char **)internalPtr));
+ *((char **)internalPtr) = NULL;
}
}
break;
case TK_OPTION_COLOR:
if (internalFormExists) {
- if (*((XColor **) internalPtr) != NULL) {
- Tk_FreeColor(*((XColor **) internalPtr));
- *((XColor **) internalPtr) = NULL;
+ if (*((XColor **)internalPtr) != NULL) {
+ Tk_FreeColor(*((XColor **)internalPtr));
+ *((XColor **)internalPtr) = NULL;
}
} else if (objPtr != NULL) {
Tk_FreeColorFromObj(tkwin, objPtr);
@@ -1867,23 +1867,23 @@ FreeResources(
break;
case TK_OPTION_FONT:
if (internalFormExists) {
- Tk_FreeFont(*((Tk_Font *) internalPtr));
- *((Tk_Font *) internalPtr) = NULL;
+ Tk_FreeFont(*((Tk_Font *)internalPtr));
+ *((Tk_Font *)internalPtr) = NULL;
} else if (objPtr != NULL) {
Tk_FreeFontFromObj(tkwin, objPtr);
}
break;
case TK_OPTION_STYLE:
if (internalFormExists) {
- Tk_FreeStyle(*((Tk_Style *) internalPtr));
- *((Tk_Style *) internalPtr) = NULL;
+ Tk_FreeStyle(*((Tk_Style *)internalPtr));
+ *((Tk_Style *)internalPtr) = NULL;
}
break;
case TK_OPTION_BITMAP:
if (internalFormExists) {
- if (*((Pixmap *) internalPtr) != None) {
- Tk_FreeBitmap(Tk_Display(tkwin), *((Pixmap *) internalPtr));
- *((Pixmap *) internalPtr) = None;
+ if (*((Pixmap *)internalPtr) != None) {
+ Tk_FreeBitmap(Tk_Display(tkwin), *((Pixmap *)internalPtr));
+ *((Pixmap *)internalPtr) = None;
}
} else if (objPtr != NULL) {
Tk_FreeBitmapFromObj(tkwin, objPtr);
@@ -1891,9 +1891,9 @@ FreeResources(
break;
case TK_OPTION_BORDER:
if (internalFormExists) {
- if (*((Tk_3DBorder *) internalPtr) != NULL) {
- Tk_Free3DBorder(*((Tk_3DBorder *) internalPtr));
- *((Tk_3DBorder *) internalPtr) = NULL;
+ if (*((Tk_3DBorder *)internalPtr) != NULL) {
+ Tk_Free3DBorder(*((Tk_3DBorder *)internalPtr));
+ *((Tk_3DBorder *)internalPtr) = NULL;
}
} else if (objPtr != NULL) {
Tk_Free3DBorderFromObj(tkwin, objPtr);
@@ -2151,25 +2151,25 @@ GetObjectForOption(
break;
}
case TK_OPTION_INDEX:
- if (!(optionPtr->specPtr->flags & (TK_OPTION_NULL_OK|TCL_NULL_OK|1)) || *((int *) internalPtr) != INT_MIN) {
- if (*((int *) internalPtr) == INT_MIN) {
+ if (!(optionPtr->specPtr->flags & (TK_OPTION_NULL_OK|TCL_NULL_OK|1)) || *((int *)internalPtr) != INT_MIN) {
+ if (*((int *)internalPtr) == INT_MIN) {
objPtr = TkNewIndexObj(TCL_INDEX_NONE);
- } else if (*((int *) internalPtr) == INT_MAX) {
+ } else if (*((int *)internalPtr) == INT_MAX) {
objPtr = Tcl_NewStringObj("end+1", TCL_INDEX_NONE);
- } else if (*((int *) internalPtr) == -1) {
+ } else if (*((int *)internalPtr) == -1) {
objPtr = Tcl_NewStringObj("end", TCL_INDEX_NONE);
- } else if (*((int *) internalPtr) < 0) {
+ } else if (*((int *)internalPtr) < 0) {
char buf[32];
- snprintf(buf, 32, "end%d", 1 + *((int *) internalPtr));
+ snprintf(buf, 32, "end%d", 1 + *((int *)internalPtr));
objPtr = Tcl_NewStringObj(buf, TCL_INDEX_NONE);
} else {
- objPtr = Tcl_NewWideIntObj(*((int *) internalPtr));
+ objPtr = Tcl_NewWideIntObj(*((int *)internalPtr));
}
}
break;
case TK_OPTION_DOUBLE:
- if (!(optionPtr->specPtr->flags & (TK_OPTION_NULL_OK|TCL_NULL_OK|1)) || !isnan(*((double *) internalPtr))) {
- objPtr = Tcl_NewDoubleObj(*((double *) internalPtr));
+ if (!(optionPtr->specPtr->flags & (TK_OPTION_NULL_OK|TCL_NULL_OK|1)) || !isnan(*((double *)internalPtr))) {
+ objPtr = Tcl_NewDoubleObj(*((double *)internalPtr));
}
break;
case TK_OPTION_STRING:
@@ -2189,7 +2189,7 @@ GetObjectForOption(
value = *((int *)internalPtr);
}
if (value >= 0) {
- objPtr = Tcl_NewStringObj(((char **) optionPtr->specPtr->clientData)[
+ objPtr = Tcl_NewStringObj(((char **)optionPtr->specPtr->clientData)[
value], TCL_INDEX_NONE);
}
break;
@@ -2299,12 +2299,12 @@ GetObjectForOption(
break;
}
case TK_OPTION_PIXELS:
- if (!(optionPtr->specPtr->flags & (TK_OPTION_NULL_OK|TCL_NULL_OK|1)) || *((int *) internalPtr) != INT_MIN) {
+ if (!(optionPtr->specPtr->flags & (TK_OPTION_NULL_OK|TCL_NULL_OK|1)) || *((int *)internalPtr) != INT_MIN) {
objPtr = Tcl_NewWideIntObj(*((int *)internalPtr));
}
break;
case TK_OPTION_WINDOW: {
- tkwin = *((Tk_Window *) internalPtr);
+ tkwin = *((Tk_Window *)internalPtr);
if (tkwin != NULL) {
objPtr = Tcl_NewStringObj(Tk_PathName(tkwin), TCL_INDEX_NONE);
diff --git a/generic/tkListbox.c b/generic/tkListbox.c
index 4a2ea5f..4e4fa23 100644
--- a/generic/tkListbox.c
+++ b/generic/tkListbox.c
@@ -115,7 +115,7 @@ typedef struct {
* is offset to the left by this many pixels
* (0 means no offset, positive means there is
* an offset). This is x scrolling information
- * is not linked to justification. */
+ * is not linked to justification. */
/*
* Information about what's selected or active, if any.
@@ -874,7 +874,7 @@ ListboxWidgetObjCmd(
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"item number \"%s\" out of range",
Tcl_GetString(objv[2])));
- Tcl_SetErrorCode(interp, "TK", "LISTBOX", "ITEM_INDEX", NULL);
+ Tcl_SetErrorCode(interp, "TK", "LISTBOX", "ITEM_INDEX", (char *)NULL);
result = TCL_ERROR;
break;
}
@@ -911,7 +911,7 @@ ListboxWidgetObjCmd(
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"item number \"%s\" out of range",
Tcl_GetString(objv[2])));
- Tcl_SetErrorCode(interp, "TK", "LISTBOX", "ITEM_INDEX", NULL);
+ Tcl_SetErrorCode(interp, "TK", "LISTBOX", "ITEM_INDEX", (char *)NULL);
result = TCL_ERROR;
break;
}
@@ -1111,15 +1111,15 @@ ListboxBboxSubCmd(
Tk_GetFontMetrics(listPtr->tkfont, &fm);
pixelWidth = Tk_TextWidth(listPtr->tkfont, stringRep, stringLen);
- if (listPtr->justify == TK_JUSTIFY_LEFT) {
- x = (listPtr->inset + listPtr->selBorderWidth) - listPtr->xOffset;
- } else if (listPtr->justify == TK_JUSTIFY_RIGHT) {
- x = Tk_Width(tkwin) - (listPtr->inset + listPtr->selBorderWidth)
- - pixelWidth - listPtr->xOffset + GetMaxOffset(listPtr);
- } else {
- x = (Tk_Width(tkwin) - pixelWidth)/2
- - listPtr->xOffset + GetMaxOffset(listPtr)/2;
- }
+ if (listPtr->justify == TK_JUSTIFY_LEFT) {
+ x = (listPtr->inset + listPtr->selBorderWidth) - listPtr->xOffset;
+ } else if (listPtr->justify == TK_JUSTIFY_RIGHT) {
+ x = Tk_Width(tkwin) - (listPtr->inset + listPtr->selBorderWidth)
+ - pixelWidth - listPtr->xOffset + GetMaxOffset(listPtr);
+ } else {
+ x = (Tk_Width(tkwin) - pixelWidth)/2
+ - listPtr->xOffset + GetMaxOffset(listPtr)/2;
+ }
y = ((index - listPtr->topIndex)*listPtr->lineHeight)
+ listPtr->inset + listPtr->selBorderWidth;
results[0] = Tcl_NewWideIntObj(x);
@@ -2072,24 +2072,24 @@ DisplayListbox(
* Draw the actual text of this item.
*/
- Tcl_ListObjIndex(listPtr->interp, listPtr->listObj, i, &curElement);
- stringRep = Tcl_GetStringFromObj(curElement, &stringLen);
- textWidth = Tk_TextWidth(listPtr->tkfont, stringRep, stringLen);
+ Tcl_ListObjIndex(listPtr->interp, listPtr->listObj, i, &curElement);
+ stringRep = Tcl_GetStringFromObj(curElement, &stringLen);
+ textWidth = Tk_TextWidth(listPtr->tkfont, stringRep, stringLen);
Tk_GetFontMetrics(listPtr->tkfont, &fm);
y += fm.ascent + listPtr->selBorderWidth;
- if (listPtr->justify == TK_JUSTIFY_LEFT) {
- x = (listPtr->inset + listPtr->selBorderWidth) - listPtr->xOffset;
- } else if (listPtr->justify == TK_JUSTIFY_RIGHT) {
- x = Tk_Width(tkwin) - (listPtr->inset + listPtr->selBorderWidth)
- - textWidth - listPtr->xOffset + GetMaxOffset(listPtr);
- } else {
- x = (Tk_Width(tkwin) - textWidth)/2
- - listPtr->xOffset + GetMaxOffset(listPtr)/2;
- }
-
- Tk_DrawChars(listPtr->display, pixmap, gc, listPtr->tkfont,
+ if (listPtr->justify == TK_JUSTIFY_LEFT) {
+ x = (listPtr->inset + listPtr->selBorderWidth) - listPtr->xOffset;
+ } else if (listPtr->justify == TK_JUSTIFY_RIGHT) {
+ x = Tk_Width(tkwin) - (listPtr->inset + listPtr->selBorderWidth)
+ - textWidth - listPtr->xOffset + GetMaxOffset(listPtr);
+ } else {
+ x = (Tk_Width(tkwin) - textWidth)/2
+ - listPtr->xOffset + GetMaxOffset(listPtr)/2;
+ }
+
+ Tk_DrawChars(listPtr->display, pixmap, gc, listPtr->tkfont,
stringRep, stringLen, x, y);
/*
@@ -2769,9 +2769,9 @@ GetListboxIndex(
stringRep = Tcl_GetString(indexObj);
if (stringRep[0] == '@') {
- /*
- * @x,y index
- */
+ /*
+ * @x,y index
+ */
int y;
char *start;
@@ -2804,7 +2804,7 @@ GetListboxIndex(
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"bad listbox index \"%s\": must be active, anchor, end, @x,y,"
" or an index", Tcl_GetString(indexObj)));
- Tcl_SetErrorCode(interp, "TK", "VALUE", "LISTBOX_INDEX", NULL);
+ Tcl_SetErrorCode(interp, "TK", "VALUE", "LISTBOX_INDEX", (char *)NULL);
return TCL_ERROR;
}
@@ -3203,7 +3203,7 @@ ListboxLostSelection(
if ((listPtr->exportSelection) && (!Tcl_IsSafe(listPtr->interp))
&& (listPtr->nElements > 0)) {
ListboxSelect(listPtr, 0, listPtr->nElements-1, 0);
- GenerateListboxSelectEvent(listPtr);
+ GenerateListboxSelectEvent(listPtr);
}
}
@@ -3448,27 +3448,27 @@ ListboxListVarProc(
if (flags & TCL_TRACE_UNSETS) {
- if (!Tcl_InterpDeleted(interp) && listPtr->listVarName) {
- void *probe = NULL;
-
- do {
- probe = Tcl_VarTraceInfo(interp,
- listPtr->listVarName,
- TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
- ListboxListVarProc, probe);
- if (probe == (void *)listPtr) {
- break;
- }
- } while (probe);
- if (probe) {
- /*
- * We were able to fetch the unset trace for our
- * listVarName, which means it is not unset and not
- * the cause of this unset trace. Instead some outdated
- * former variable must be, and we should ignore it.
- */
- return NULL;
- }
+ if (!Tcl_InterpDeleted(interp) && listPtr->listVarName) {
+ void *probe = NULL;
+
+ do {
+ probe = Tcl_VarTraceInfo(interp,
+ listPtr->listVarName,
+ TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
+ ListboxListVarProc, probe);
+ if (probe == (void *)listPtr) {
+ break;
+ }
+ } while (probe);
+ if (probe) {
+ /*
+ * We were able to fetch the unset trace for our
+ * listVarName, which means it is not unset and not
+ * the cause of this unset trace. Instead some outdated
+ * former variable must be, and we should ignore it.
+ */
+ return NULL;
+ }
Tcl_SetVar2Ex(interp, listPtr->listVarName, NULL,
listPtr->listObj, TCL_GLOBAL_ONLY);
Tcl_TraceVar2(interp, listPtr->listVarName,
@@ -3650,15 +3650,15 @@ static int GetMaxOffset(
int maxOffset;
maxOffset = listPtr->maxWidth -
- (Tk_Width(listPtr->tkwin) - 2*listPtr->inset -
- 2*listPtr->selBorderWidth) + listPtr->xScrollUnit - 1;
+ (Tk_Width(listPtr->tkwin) - 2*listPtr->inset -
+ 2*listPtr->selBorderWidth) + listPtr->xScrollUnit - 1;
if (maxOffset < 0) {
- /*
- * Listbox is larger in width than its largest width item.
- */
+ /*
+ * Listbox is larger in width than its largest width item.
+ */
- maxOffset = 0;
+ maxOffset = 0;
}
maxOffset -= maxOffset % listPtr->xScrollUnit;
diff --git a/generic/tkMenu.c b/generic/tkMenu.c
index a0cee25..be60f2a 100644
--- a/generic/tkMenu.c
+++ b/generic/tkMenu.c
@@ -900,9 +900,9 @@ MenuWidgetObjCmd(
goto error;
}
if (objc == 5) {
- if (GetMenuIndex(interp, menuPtr, objv[4], 0, &index) != TCL_OK) {
- goto error;
- }
+ if (GetMenuIndex(interp, menuPtr, objv[4], 0, &index) != TCL_OK) {
+ goto error;
+ }
}
/*
@@ -914,9 +914,9 @@ MenuWidgetObjCmd(
*/
if (menuPtr->menuType == MENUBAR) {
- Tcl_AppendResult(interp, "a menubar menu cannot be posted", NULL);
- return TCL_ERROR;
- } else if (menuPtr->menuType != TEAROFF_MENU) {
+ Tcl_AppendResult(interp, "a menubar menu cannot be posted", NULL);
+ return TCL_ERROR;
+ } else if (menuPtr->menuType != TEAROFF_MENU) {
result = TkpPostMenu(interp, menuPtr, x, y, index);
} else {
result = TkpPostTearoffMenu(interp, menuPtr, x, y, index);
@@ -1197,16 +1197,16 @@ DestroyMenuInstance(
*/
for (i = menuPtr->numEntries; --i >= 0; ) {
- /*
- * Clean up the hash entry for the menu item ID.
- * This cannot be postponed until the entry is eventually freed,
- * because the hash table may already have been deleted by then.
- */
+ /*
+ * Clean up the hash entry for the menu item ID.
+ * This cannot be postponed until the entry is eventually freed,
+ * because the hash table may already have been deleted by then.
+ */
- if (menuPtr->entries[i]->entryPtr) {
- Tcl_DeleteHashEntry(menuPtr->entries[i]->entryPtr);
- menuPtr->entries[i]->entryPtr = NULL;
- }
+ if (menuPtr->entries[i]->entryPtr) {
+ Tcl_DeleteHashEntry(menuPtr->entries[i]->entryPtr);
+ menuPtr->entries[i]->entryPtr = NULL;
+ }
/*
* As each menu entry is deleted from the end of the array of entries,
@@ -1495,8 +1495,8 @@ DestroyMenuEntry(
MenuVarProc, mePtr);
}
if (mePtr->entryPtr) {
- Tcl_DeleteHashEntry(mePtr->entryPtr);
- mePtr->entryPtr = NULL;
+ Tcl_DeleteHashEntry(mePtr->entryPtr);
+ mePtr->entryPtr = NULL;
}
TkpDestroyMenuEntry(mePtr);
TkMenuEntryFreeDrawOptions(mePtr);
@@ -2199,9 +2199,9 @@ GetMenuIndex(
entryPtr = Tcl_FindHashEntry(&menuPtr->items, string);
if (entryPtr) {
- TkMenuEntry *mePtr = (TkMenuEntry *)Tcl_GetHashValue(entryPtr);
- *indexPtr = mePtr->index;
- return TCL_OK;
+ TkMenuEntry *mePtr = (TkMenuEntry *)Tcl_GetHashValue(entryPtr);
+ *indexPtr = mePtr->index;
+ return TCL_OK;
}
for (i = 0; i < menuPtr->numEntries; i++) {
@@ -2216,7 +2216,7 @@ GetMenuIndex(
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"bad menu entry index \"%s\"", string));
- Tcl_SetErrorCode(interp, "TK", "MENU", "INDEX", NULL);
+ Tcl_SetErrorCode(interp, "TK", "MENU", "INDEX", (char *)NULL);
return TCL_ERROR;
}
@@ -2407,7 +2407,7 @@ MenuAddOrInsert(
if (index < 0) {
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"bad menu entry index \"%s\"", Tcl_GetString(indexPtr)));
- Tcl_SetErrorCode(interp, "TK", "MENU", "INDEX", NULL);
+ Tcl_SetErrorCode(interp, "TK", "MENU", "INDEX", (char *)NULL);
return TCL_ERROR;
}
if (menuPtr->tearoff && (index == 0)) {
@@ -2429,14 +2429,14 @@ MenuAddOrInsert(
*/
if (objc % 2 == 0) {
- idPtr = objv[offs];
- if (Tcl_FindHashEntry(&menuPtr->items, Tcl_GetString(idPtr))) {
- Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+ idPtr = objv[offs];
+ if (Tcl_FindHashEntry(&menuPtr->items, Tcl_GetString(idPtr))) {
+ Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"entry \"%s\" already exists", Tcl_GetString(idPtr)));
- Tcl_SetErrorCode(interp, "TK", "MENU", "ENTRY_EXISTS", NULL);
- return TCL_ERROR;
- }
- offs++;
+ Tcl_SetErrorCode(interp, "TK", "MENU", "ENTRY_EXISTS", (char *)NULL);
+ return TCL_ERROR;
+ }
+ offs++;
}
/*
@@ -2473,22 +2473,22 @@ MenuAddOrInsert(
return TCL_ERROR;
}
- if (idPtr == NULL) {
- char idbuf[16];
- /* Generate an id for the new entry on the main menu */
- do {
- snprintf(idbuf, sizeof(idbuf), "e%03X", ++menuPtr->serial);
- entryPtr = Tcl_CreateHashEntry(
+ if (idPtr == NULL) {
+ char idbuf[16];
+ /* Generate an id for the new entry on the main menu */
+ do {
+ snprintf(idbuf, sizeof(idbuf), "e%03X", ++menuPtr->serial);
+ entryPtr = Tcl_CreateHashEntry(
&menuListPtr->items, idbuf, &isNew);
- } while (!isNew);
- idPtr = Tcl_NewStringObj(idbuf, TCL_INDEX_NONE);
- } else {
- /* Reuse the specified or previously generated id on all clones */
- entryPtr = Tcl_CreateHashEntry(
+ } while (!isNew);
+ idPtr = Tcl_NewStringObj(idbuf, TCL_INDEX_NONE);
+ } else {
+ /* Reuse the specified or previously generated id on all clones */
+ entryPtr = Tcl_CreateHashEntry(
&menuListPtr->items, Tcl_GetString(idPtr), &isNew);
- }
- Tcl_SetHashValue(entryPtr, mePtr);
- mePtr->entryPtr = entryPtr;
+ }
+ Tcl_SetHashValue(entryPtr, mePtr);
+ mePtr->entryPtr = entryPtr;
/*
* If a menu has cascades, then every instance of the menu has to have
@@ -2593,26 +2593,26 @@ MenuVarProc(
*/
if (flags & TCL_TRACE_UNSETS) {
- void *probe = NULL;
+ void *probe = NULL;
mePtr->entryFlags &= ~ENTRY_SELECTED;
- do {
- probe = Tcl_VarTraceInfo(interp, name,
- TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
- MenuVarProc, probe);
- if (probe == (void *)mePtr) {
- break;
- }
- } while (probe);
- if (probe) {
- /*
- * We were able to fetch the unset trace for our
- * namePtr, which means it is not unset and not
- * the cause of this unset trace. Instead some outdated
- * former variable must be, and we should ignore it.
- */
+ do {
+ probe = Tcl_VarTraceInfo(interp, name,
+ TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
+ MenuVarProc, probe);
+ if (probe == (void *)mePtr) {
+ break;
+ }
+ } while (probe);
+ if (probe) {
+ /*
+ * We were able to fetch the unset trace for our
+ * namePtr, which means it is not unset and not
+ * the cause of this unset trace. Instead some outdated
+ * former variable must be, and we should ignore it.
+ */
return NULL;
- }
+ }
Tcl_TraceVar2(interp, name, NULL,
TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
MenuVarProc, clientData);
diff --git a/generic/tkObj.c b/generic/tkObj.c
index afcf7c8..cdea2ed 100644
--- a/generic/tkObj.c
+++ b/generic/tkObj.c
@@ -518,7 +518,7 @@ SetPixelFromAny(
if (interp != NULL) {
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"expected screen distance but got \"%.50s\"", string));
- Tcl_SetErrorCode(interp, "TK", "VALUE", "PIXELS", NULL);
+ Tcl_SetErrorCode(interp, "TK", "VALUE", "PIXELS", (char *)NULL);
}
return TCL_ERROR;
}
@@ -802,7 +802,7 @@ SetMMFromAny(
error:
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"expected screen distance but got \"%.50s\"", string));
- Tcl_SetErrorCode(interp, "TK", "VALUE", "PIXELS", NULL);
+ Tcl_SetErrorCode(interp, "TK", "VALUE", "PIXELS", (char *)NULL);
return TCL_ERROR;
}
switch (*rest) {
@@ -1103,7 +1103,7 @@ TkParsePadAmount(
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"bad pad value \"%s\": must be positive screen distance",
Tcl_GetString(specObj)));
- Tcl_SetErrorCode(interp, "TK", "VALUE", "PADDING", "DIST", NULL);
+ Tcl_SetErrorCode(interp, "TK", "VALUE", "PADDING", "DIST", (char *)NULL);
return TCL_ERROR;
}
secondInt = firstInt;
@@ -1121,7 +1121,7 @@ TkParsePadAmount(
if (objc != 1 && objc != 2) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"wrong number of parts to pad specification", TCL_INDEX_NONE));
- Tcl_SetErrorCode(interp, "TK", "VALUE", "PADDING", "PARTS", NULL);
+ Tcl_SetErrorCode(interp, "TK", "VALUE", "PADDING", "PARTS", (char *)NULL);
return TCL_ERROR;
}
@@ -1134,7 +1134,7 @@ TkParsePadAmount(
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"bad pad value \"%s\": must be positive screen distance",
Tcl_GetString(objv[0])));
- Tcl_SetErrorCode(interp, "TK", "VALUE", "PADDING", "DIST", NULL);
+ Tcl_SetErrorCode(interp, "TK", "VALUE", "PADDING", "DIST", (char *)NULL);
return TCL_ERROR;
}
@@ -1150,7 +1150,7 @@ TkParsePadAmount(
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"bad 2nd pad value \"%s\": must be positive screen distance",
Tcl_GetString(objv[1])));
- Tcl_SetErrorCode(interp, "TK", "VALUE", "PADDING", "DIST", NULL);
+ Tcl_SetErrorCode(interp, "TK", "VALUE", "PADDING", "DIST", (char *)NULL);
return TCL_ERROR;
}
diff --git a/generic/tkOption.c b/generic/tkOption.c
index e626930..f6976bd 100644
--- a/generic/tkOption.c
+++ b/generic/tkOption.c
@@ -881,7 +881,7 @@ ParsePriority(
"bad priority level \"%s\": must be "
"widgetDefault, startupFile, userDefault, "
"interactive, or a number between 0 and 100", string));
- Tcl_SetErrorCode(interp, "TK", "VALUE", "PRIORITY", NULL);
+ Tcl_SetErrorCode(interp, "TK", "VALUE", "PRIORITY", (char *)NULL);
return -1;
}
}
@@ -965,7 +965,7 @@ AddFromString(
if ((*src == '\0') || (*src == '\n')) {
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"missing colon on line %d", lineNum));
- Tcl_SetErrorCode(interp, "TK", "OPTIONDB", "COLON", NULL);
+ Tcl_SetErrorCode(interp, "TK", "OPTIONDB", "COLON", (char *)NULL);
return TCL_ERROR;
}
if ((src[0] == '\\') && (src[1] == '\n')) {
@@ -1002,7 +1002,7 @@ AddFromString(
if (*src == '\0') {
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"missing value on line %d", lineNum));
- Tcl_SetErrorCode(interp, "TK", "OPTIONDB", "VALUE", NULL);
+ Tcl_SetErrorCode(interp, "TK", "OPTIONDB", "VALUE", (char *)NULL);
return TCL_ERROR;
}
@@ -1016,7 +1016,7 @@ AddFromString(
if (*src == '\0') {
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"missing newline on line %d", lineNum));
- Tcl_SetErrorCode(interp, "TK", "OPTIONDB", "NEWLINE", NULL);
+ Tcl_SetErrorCode(interp, "TK", "OPTIONDB", "NEWLINE", (char *)NULL);
return TCL_ERROR;
}
if (*src == '\\'){
@@ -1096,7 +1096,7 @@ ReadOptionFile(
if (Tcl_IsSafe(interp)) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"can't read options from a file in a safe interpreter", TCL_INDEX_NONE));
- Tcl_SetErrorCode(interp, "TK", "SAFE", "OPTION_FILE", NULL);
+ Tcl_SetErrorCode(interp, "TK", "SAFE", "OPTION_FILE", (char *)NULL);
return TCL_ERROR;
}
diff --git a/generic/tkPanedWindow.c b/generic/tkPanedWindow.c
index 25f87bc..b244c9a 100644
--- a/generic/tkPanedWindow.c
+++ b/generic/tkPanedWindow.c
@@ -674,7 +674,7 @@ PanedWindowWidgetObjCmd(
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"not managed by this window", TCL_INDEX_NONE));
Tcl_SetErrorCode(interp, "TK", "PANEDWINDOW", "UNMANAGED",
- NULL);
+ (char *)NULL);
}
result = TCL_ERROR;
} else {
@@ -693,15 +693,15 @@ PanedWindowWidgetObjCmd(
if (objc <= 4) {
tkwin = Tk_NameToWindow(interp, Tcl_GetString(objv[2]),
pwPtr->tkwin);
- if (tkwin == NULL) {
- /*
- * Just a plain old bad window; Tk_NameToWindow filled in an
- * error message for us.
- */
-
- result = TCL_ERROR;
- break;
- }
+ if (tkwin == NULL) {
+ /*
+ * Just a plain old bad window; Tk_NameToWindow filled in an
+ * error message for us.
+ */
+
+ result = TCL_ERROR;
+ break;
+ }
for (i = 0; i < pwPtr->numPanes; i++) {
if (pwPtr->panes[i]->tkwin == tkwin) {
resultObj = Tk_GetOptionInfo(interp,
@@ -799,7 +799,7 @@ ConfigurePanes(
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"can't add %s to itself", arg));
- Tcl_SetErrorCode(interp, "TK", "GEOMETRY", "SELF", NULL);
+ Tcl_SetErrorCode(interp, "TK", "GEOMETRY", "SELF", (char *)NULL);
return TCL_ERROR;
} else if (Tk_IsTopLevel(tkwin)) {
/*
@@ -809,7 +809,7 @@ ConfigurePanes(
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"can't add toplevel %s to %s", arg,
Tk_PathName(pwPtr->tkwin)));
- Tcl_SetErrorCode(interp, "TK", "GEOMETRY", "TOPLEVEL", NULL);
+ Tcl_SetErrorCode(interp, "TK", "GEOMETRY", "TOPLEVEL", (char *)NULL);
return TCL_ERROR;
} else {
/*
@@ -827,7 +827,7 @@ ConfigurePanes(
"can't add %s to %s", arg,
Tk_PathName(pwPtr->tkwin)));
Tcl_SetErrorCode(interp, "TK", "GEOMETRY",
- "HIERARCHY", NULL);
+ "HIERARCHY", (char *)NULL);
return TCL_ERROR;
}
}
@@ -887,7 +887,7 @@ ConfigurePanes(
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"window \"%s\" is not managed by %s",
Tk_PathName(tkwin), Tk_PathName(pwPtr->tkwin)));
- Tcl_SetErrorCode(interp, "TK", "PANEDWINDOW", "UNMANAGED", NULL);
+ Tcl_SetErrorCode(interp, "TK", "PANEDWINDOW", "UNMANAGED", (char *)NULL);
Tk_FreeConfigOptions(&options, pwPtr->paneOpts,
pwPtr->tkwin);
return TCL_ERROR;
@@ -1127,7 +1127,7 @@ PanedWindowSashCommand(
if (!ValidSashIndex(pwPtr, sash)) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"invalid sash index", TCL_INDEX_NONE));
- Tcl_SetErrorCode(interp, "TK", "VALUE", "SASH_INDEX", NULL);
+ Tcl_SetErrorCode(interp, "TK", "VALUE", "SASH_INDEX", (char *)NULL);
return TCL_ERROR;
}
panePtr = pwPtr->panes[sash];
@@ -1150,7 +1150,7 @@ PanedWindowSashCommand(
if (!ValidSashIndex(pwPtr, sash)) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"invalid sash index", TCL_INDEX_NONE));
- Tcl_SetErrorCode(interp, "TK", "VALUE", "SASH_INDEX", NULL);
+ Tcl_SetErrorCode(interp, "TK", "VALUE", "SASH_INDEX", (char *)NULL);
return TCL_ERROR;
}
@@ -1186,7 +1186,7 @@ PanedWindowSashCommand(
if (!ValidSashIndex(pwPtr, sash)) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"invalid sash index", TCL_INDEX_NONE));
- Tcl_SetErrorCode(interp, "TK", "VALUE", "SASH_INDEX", NULL);
+ Tcl_SetErrorCode(interp, "TK", "VALUE", "SASH_INDEX", (char *)NULL);
return TCL_ERROR;
}
@@ -1369,17 +1369,17 @@ PanedWindowEventProc(
} else if (eventPtr->type == DestroyNotify) {
DestroyPanedWindow(pwPtr);
} else if (eventPtr->type == UnmapNotify) {
- for (i = 0; i < pwPtr->numPanes; i++) {
- if (!pwPtr->panes[i]->hide) {
- Tk_UnmapWindow(pwPtr->panes[i]->tkwin);
- }
- }
+ for (i = 0; i < pwPtr->numPanes; i++) {
+ if (!pwPtr->panes[i]->hide) {
+ Tk_UnmapWindow(pwPtr->panes[i]->tkwin);
+ }
+ }
} else if (eventPtr->type == MapNotify) {
- for (i = 0; i < pwPtr->numPanes; i++) {
- if (!pwPtr->panes[i]->hide) {
- Tk_MapWindow(pwPtr->panes[i]->tkwin);
- }
- }
+ for (i = 0; i < pwPtr->numPanes; i++) {
+ if (!pwPtr->panes[i]->hide) {
+ Tk_MapWindow(pwPtr->panes[i]->tkwin);
+ }
+ }
}
}
@@ -1789,18 +1789,18 @@ ArrangePanes(
*/
if (horizontal) {
- if (panePtr->width > 0) {
- paneSize = panePtr->width;
- } else {
- paneSize = panePtr->paneWidth;
- }
+ if (panePtr->width > 0) {
+ paneSize = panePtr->width;
+ } else {
+ paneSize = panePtr->paneWidth;
+ }
stretchReserve -= paneSize + (2 * panePtr->padx);
} else {
- if (panePtr->height > 0) {
- paneSize = panePtr->height;
- } else {
- paneSize = panePtr->paneHeight;
- }
+ if (panePtr->height > 0) {
+ paneSize = panePtr->height;
+ } else {
+ paneSize = panePtr->paneHeight;
+ }
stretchReserve -= paneSize + (2 * panePtr->pady);
}
if (IsStretchable(panePtr->stretch,i,first,last)
@@ -1850,18 +1850,18 @@ ArrangePanes(
*/
if (horizontal) {
- if (panePtr->width > 0) {
- paneSize = panePtr->width;
- } else {
- paneSize = panePtr->paneWidth;
- }
+ if (panePtr->width > 0) {
+ paneSize = panePtr->width;
+ } else {
+ paneSize = panePtr->paneWidth;
+ }
pwSize = pwWidth;
} else {
- if (panePtr->height > 0) {
- paneSize = panePtr->height;
- } else {
- paneSize = panePtr->paneHeight;
- }
+ if (panePtr->height > 0) {
+ paneSize = panePtr->height;
+ } else {
+ paneSize = panePtr->paneHeight;
+ }
pwSize = pwHeight;
}
if (IsStretchable(panePtr->stretch, i, first, last)) {
@@ -2491,7 +2491,7 @@ SetSticky(
"bad stickyness value \"%s\": must be a string"
" containing zero or more of n, e, s, and w",
Tcl_GetString(*value)));
- Tcl_SetErrorCode(interp, "TK", "VALUE", "STICKY", NULL);
+ Tcl_SetErrorCode(interp, "TK", "VALUE", "STICKY", (char *)NULL);
return TCL_ERROR;
}
}
@@ -2907,16 +2907,16 @@ PanedWindowProxyCommand(
return TCL_ERROR;
}
- internalBW = Tk_InternalBorderLeft(pwPtr->tkwin);
+ internalBW = Tk_InternalBorderLeft(pwPtr->tkwin);
if (pwPtr->orient == ORIENT_HORIZONTAL) {
if (x < 0) {
x = 0;
}
- pwWidth = Tk_Width(pwPtr->tkwin) - (2 * internalBW);
- if (x > pwWidth) {
- x = pwWidth;
- }
- y = Tk_InternalBorderLeft(pwPtr->tkwin);
+ pwWidth = Tk_Width(pwPtr->tkwin) - (2 * internalBW);
+ if (x > pwWidth) {
+ x = pwWidth;
+ }
+ y = Tk_InternalBorderLeft(pwPtr->tkwin);
sashWidth = pwPtr->sashWidth;
sashHeight = Tk_Height(pwPtr->tkwin) -
(2 * Tk_InternalBorderLeft(pwPtr->tkwin));
@@ -2924,10 +2924,10 @@ PanedWindowProxyCommand(
if (y < 0) {
y = 0;
}
- pwHeight = Tk_Height(pwPtr->tkwin) - (2 * internalBW);
- if (y > pwHeight) {
- y = pwHeight;
- }
+ pwHeight = Tk_Height(pwPtr->tkwin) - (2 * internalBW);
+ if (y > pwHeight) {
+ y = pwHeight;
+ }
x = Tk_InternalBorderLeft(pwPtr->tkwin);
sashHeight = pwPtr->sashWidth;
sashWidth = Tk_Width(pwPtr->tkwin) -
diff --git a/generic/tkPlace.c b/generic/tkPlace.c
index f60861a..013c531 100644
--- a/generic/tkPlace.c
+++ b/generic/tkPlace.c
@@ -626,7 +626,7 @@ ConfigureContent(
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"can't use placer on top-level window \"%s\"; use "
"wm command instead", Tk_PathName(tkwin)));
- Tcl_SetErrorCode(interp, "TK", "GEOMETRY", "TOPLEVEL", NULL);
+ Tcl_SetErrorCode(interp, "TK", "GEOMETRY", "TOPLEVEL", (char *)NULL);
return TCL_ERROR;
}
@@ -666,7 +666,7 @@ ConfigureContent(
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"can't place \"%s\" relative to \"%s\"",
Tk_PathName(contentPtr->tkwin), Tk_PathName(win)));
- Tcl_SetErrorCode(interp, "TK", "GEOMETRY", "HIERARCHY", NULL);
+ Tcl_SetErrorCode(interp, "TK", "GEOMETRY", "HIERARCHY", (char *)NULL);
goto error;
}
}
@@ -674,7 +674,7 @@ ConfigureContent(
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"can't place \"%s\" relative to itself",
Tk_PathName(contentPtr->tkwin)));
- Tcl_SetErrorCode(interp, "TK", "GEOMETRY", "LOOP", NULL);
+ Tcl_SetErrorCode(interp, "TK", "GEOMETRY", "LOOP", (char *)NULL);
goto error;
}
@@ -688,7 +688,7 @@ ConfigureContent(
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"can't put \"%s\" inside \"%s\": would cause management loop",
Tk_PathName(contentPtr->tkwin), Tk_PathName(win)));
- Tcl_SetErrorCode(interp, "TK", "GEOMETRY", "LOOP", NULL);
+ Tcl_SetErrorCode(interp, "TK", "GEOMETRY", "LOOP", (char *)NULL);
goto error;
}
}
diff --git a/generic/tkSelect.c b/generic/tkSelect.c
index ef15a7e..752b5ea 100644
--- a/generic/tkSelect.c
+++ b/generic/tkSelect.c
@@ -715,7 +715,7 @@ Tk_SelectionObjCmd(
if (count < 2) {
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"value for \"%s\" missing", string));
- Tcl_SetErrorCode(interp, "TK", "SELECTION", "VALUE", NULL);
+ Tcl_SetErrorCode(interp, "TK", "SELECTION", "VALUE", (char *)NULL);
return TCL_ERROR;
}
@@ -775,7 +775,7 @@ Tk_SelectionObjCmd(
if (count < 2) {
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"value for \"%s\" missing", string));
- Tcl_SetErrorCode(interp, "TK", "SELECTION", "VALUE", NULL);
+ Tcl_SetErrorCode(interp, "TK", "SELECTION", "VALUE", (char *)NULL);
return TCL_ERROR;
}
@@ -853,7 +853,7 @@ Tk_SelectionObjCmd(
if (count < 2) {
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"value for \"%s\" missing", string));
- Tcl_SetErrorCode(interp, "TK", "SELECTION", "VALUE", NULL);
+ Tcl_SetErrorCode(interp, "TK", "SELECTION", "VALUE", (char *)NULL);
return TCL_ERROR;
}
@@ -940,7 +940,7 @@ Tk_SelectionObjCmd(
if (count < 2) {
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"value for \"%s\" missing", string));
- Tcl_SetErrorCode(interp, "TK", "SELECTION", "VALUE", NULL);
+ Tcl_SetErrorCode(interp, "TK", "SELECTION", "VALUE", (char *)NULL);
return TCL_ERROR;
}
diff --git a/generic/tkTextWind.c b/generic/tkTextWind.c
index 954e16f..8c71e48 100644
--- a/generic/tkTextWind.c
+++ b/generic/tkTextWind.c
@@ -171,7 +171,7 @@ TkTextWindowCmd(
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"no embedded window at index \"%s\"",
Tcl_GetString(objv[3])));
- Tcl_SetErrorCode(interp, "TK", "TEXT", "NO_WINDOW", NULL);
+ Tcl_SetErrorCode(interp, "TK", "TEXT", "NO_WINDOW", (char *)NULL);
return TCL_ERROR;
}
@@ -209,7 +209,7 @@ TkTextWindowCmd(
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"no embedded window at index \"%s\"",
Tcl_GetString(objv[3])));
- Tcl_SetErrorCode(interp, "TK", "TEXT", "NO_WINDOW", NULL);
+ Tcl_SetErrorCode(interp, "TK", "TEXT", "NO_WINDOW", (char *)NULL);
return TCL_ERROR;
}
if (objc <= 5) {
@@ -443,7 +443,7 @@ EmbWinConfigure(
Tk_PathName(ewPtr->body.ew.tkwin),
Tk_PathName(textPtr->tkwin)));
Tcl_SetErrorCode(textPtr->interp, "TK", "GEOMETRY",
- "HIERARCHY", NULL);
+ "HIERARCHY", (char *)NULL);
ewPtr->body.ew.tkwin = NULL;
if (client != NULL) {
client->tkwin = NULL;
@@ -940,7 +940,7 @@ EmbWinLayoutProc(
Tk_PathName(ewPtr->body.ew.tkwin),
Tk_PathName(textPtr->tkwin)));
Tcl_SetErrorCode(textPtr->interp, "TK", "GEOMETRY", "HIERARCHY",
- NULL);
+ (char *)NULL);
Tcl_BackgroundException(textPtr->interp, TCL_ERROR);
ewPtr->body.ew.tkwin = NULL;
goto gotWindow;
diff --git a/win/nmakehlp.c b/win/nmakehlp.c
index 36708c9..4fc9f7a 100644
--- a/win/nmakehlp.c
+++ b/win/nmakehlp.c
@@ -19,7 +19,6 @@
#pragma comment (lib, "kernel32.lib")
#endif
#include <stdio.h>
-#include <math.h>
/*
* This library is required for x64 builds with _some_ versions of MSVC
@@ -601,9 +600,9 @@ list_free(list_item_t **listPtrPtr)
*
* Usage is something like:
* nmakehlp -S << $** > $@
- * @PACKAGE_NAME@ $(PACKAGE_NAME)
- * @PACKAGE_VERSION@ $(PACKAGE_VERSION)
- * <<
+ * @PACKAGE_NAME@ $(PACKAGE_NAME)
+ * @PACKAGE_VERSION@ $(PACKAGE_VERSION)
+ * <<
*/
static int
@@ -727,11 +726,13 @@ static int LocateDependencyHelper(const char *dir, const char *keypath)
int keylen, ret;
WIN32_FIND_DATA finfo;
- if (dir == NULL || keypath == NULL)
+ if (dir == NULL || keypath == NULL) {
return 2; /* Have no real error reporting mechanism into nmake */
+ }
dirlen = strlen(dir);
- if ((dirlen + 3) > sizeof(path))
+ if ((dirlen + 3) > sizeof(path)) {
return 2;
+ }
strncpy(path, dir, dirlen);
strncpy(path+dirlen, "\\*", 3); /* Including terminating \0 */
keylen = strlen(keypath);
@@ -746,8 +747,9 @@ static int LocateDependencyHelper(const char *dir, const char *keypath)
#else
hSearch = FindFirstFile(path, &finfo);
#endif
- if (hSearch == INVALID_HANDLE_VALUE)
+ if (hSearch == INVALID_HANDLE_VALUE) {
return 1; /* Not found */
+ }
/* Loop through all subdirs checking if the keypath is under there */
ret = 1; /* Assume not found */
@@ -757,11 +759,13 @@ static int LocateDependencyHelper(const char *dir, const char *keypath)
* We need to check it is a directory despite the
* FindExSearchLimitToDirectories in the above call. See SDK docs
*/
- if ((finfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0)
+ if ((finfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0) {
continue;
+ }
sublen = strlen(finfo.cFileName);
- if ((dirlen+1+sublen+1+keylen+1) > sizeof(path))
+ if ((dirlen+1+sublen+1+keylen+1) > sizeof(path)) {
continue; /* Path does not fit, assume not matched */
+ }
strncpy(path+dirlen+1, finfo.cFileName, sublen);
path[dirlen+1+sublen] = '\\';
strncpy(path+dirlen+1+sublen+1, keypath, keylen+1);
@@ -781,13 +785,13 @@ static int LocateDependencyHelper(const char *dir, const char *keypath)
* LocateDependency --
*
* Locates a dependency for a package.
- * keypath - a relative path within the package directory
- * that is used to confirm it is the correct directory.
+ * keypath - a relative path within the package directory
+ * that is used to confirm it is the correct directory.
* The search path for the package directory is currently only
- * the parent and grandparent of the current working directory.
- * If found, the command prints
- * name_DIRPATH=<full path of located directory>
- * and returns 0. If not found, does not print anything and returns 1.
+ * the parent and grandparent of the current working directory.
+ * If found, the command prints
+ * name_DIRPATH=<full path of located directory>
+ * and returns 0. If not found, does not print anything and returns 1.
*/
static int LocateDependency(const char *keypath)
{
@@ -797,8 +801,9 @@ static int LocateDependency(const char *keypath)
for (i = 0; i < (sizeof(paths)/sizeof(paths[0])); ++i) {
ret = LocateDependencyHelper(paths[i], keypath);
- if (ret == 0)
+ if (ret == 0) {
return ret;
+ }
}
return ret;
}
generated by cgit v0.12 at 2024-09-19 22:21:02 (GMT)