summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--generic/tkButton.c6
-rw-r--r--generic/tkMenu.c2
-rw-r--r--generic/tkScale.c2
-rw-r--r--macosx/tkMacOSXDialog.c2
-rw-r--r--macosx/tkMacOSXKeyboard.c4
5 files changed, 8 insertions, 8 deletions
diff --git a/generic/tkButton.c b/generic/tkButton.c
index 61aab0e..0d760b0 100644
--- a/generic/tkButton.c
+++ b/generic/tkButton.c
@@ -1636,7 +1636,7 @@ ButtonVarProc(
}
} while (probe);
if (probe) {
- /*
+ /*
* We were able to fetch the unset trace for our
* selVarNamePtr, which means it is not unset and not
* the cause of this unset trace. Instead some outdated
@@ -1739,7 +1739,7 @@ ButtonTextVarProc(
/*
* An unset trace on some variable brought us here, but is it
- * the variable we have stored in butPtr->textVarNamePtr ?
+ * the variable we have stored in butPtr->textVarNamePtr ?
*/
ClientData probe = NULL;
@@ -1754,7 +1754,7 @@ ButtonTextVarProc(
}
} while (probe);
if (probe) {
- /*
+ /*
* We were able to fetch the unset trace for our
* textVarNamePtr, which means it is not unset and not
* the cause of this unset trace. Instead some outdated
diff --git a/generic/tkMenu.c b/generic/tkMenu.c
index a096684..3a2d987 100644
--- a/generic/tkMenu.c
+++ b/generic/tkMenu.c
@@ -2525,7 +2525,7 @@ MenuVarProc(
}
} 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
diff --git a/generic/tkScale.c b/generic/tkScale.c
index a821e9d..5957b00 100644
--- a/generic/tkScale.c
+++ b/generic/tkScale.c
@@ -1371,7 +1371,7 @@ ScaleVarProc(
}
} while (probe);
if (probe) {
- /*
+ /*
* We were able to fetch the unset trace for our
* varNamePtr, which means it is not unset and not
* the cause of this unset trace. Instead some outdated
diff --git a/macosx/tkMacOSXDialog.c b/macosx/tkMacOSXDialog.c
index 90d0dc7..322519a 100644
--- a/macosx/tkMacOSXDialog.c
+++ b/macosx/tkMacOSXDialog.c
@@ -2080,7 +2080,7 @@ FontchooserParentEventHandler(
if (eventPtr->type == DestroyNotify) {
Tk_DeleteEventHandler(fcdPtr->parent, StructureNotifyMask,
FontchooserParentEventHandler, fcdPtr);
- fcdPtr->parent = None;
+ fcdPtr->parent = NULL;
FontchooserHideCmd(NULL, NULL, 0, NULL);
}
}
diff --git a/macosx/tkMacOSXKeyboard.c b/macosx/tkMacOSXKeyboard.c
index 31f842a..5899064 100644
--- a/macosx/tkMacOSXKeyboard.c
+++ b/macosx/tkMacOSXKeyboard.c
@@ -180,13 +180,13 @@ InitKeyMaps(void)
for (kPtr = keyArray; kPtr->keycode != 0; kPtr++) {
hPtr = Tcl_CreateHashEntry(&keycodeTable, INT2PTR(kPtr->keycode),
&dummy);
- Tcl_SetHashValue(hPtr, kPtr->keysym);
+ Tcl_SetHashValue(hPtr, INT2PTR(kPtr->keysym));
}
Tcl_InitHashTable(&vkeyTable, TCL_ONE_WORD_KEYS);
for (kPtr = virtualkeyArray; kPtr->keycode != 0; kPtr++) {
hPtr = Tcl_CreateHashEntry(&vkeyTable, INT2PTR(kPtr->keycode),
&dummy);
- Tcl_SetHashValue(hPtr, kPtr->keysym);
+ Tcl_SetHashValue(hPtr, INT2PTR(kPtr->keysym));
}
initialized = 1;
}