summaryrefslogtreecommitdiffstats
path: root/generic/tkStyle.c
diff options
context:
space:
mode:
authordas <das>2007-10-15 07:24:47 (GMT)
committerdas <das>2007-10-15 07:24:47 (GMT)
commitefc99bc15db0e9e7a9b41476cff1119112348d7b (patch)
tree67915c083365997a60c6f2e4622f437540598f6d /generic/tkStyle.c
parent95b981bcce4ffe3ed7b5b3bf8f48e366955ee383 (diff)
downloadtk-efc99bc15db0e9e7a9b41476cff1119112348d7b.zip
tk-efc99bc15db0e9e7a9b41476cff1119112348d7b.tar.gz
tk-efc99bc15db0e9e7a9b41476cff1119112348d7b.tar.bz2
* generic/tkArgv.c: Fix gcc warnings about 'cast to/from
* generic/tkCanvUtil.c: pointer from/to integer of different * generic/tkCanvas.c: size' on 64-bit platforms by casting * generic/tkCursor.c: to intermediate types * generic/tkInt.h: intptr_t/uintptr_t via new PTR2INT(), * generic/tkListbox.c: INT2PTR(), PTR2UINT() and UINT2PTR() * generic/tkObj.c: macros. * generic/tkStyle.c: * generic/tkTextIndex.c: * generic/tkUtil.c: * generic/ttk/ttkTheme.h: * generic/ttk/ttkTreeview.c: * unix/tkUnixMenu.c: * unix/configure.in: * unix/configure: autoconf-2.59 * unix/tkConfig.h.in: autoheader-2.59
Diffstat (limited to 'generic/tkStyle.c')
-rw-r--r--generic/tkStyle.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/generic/tkStyle.c b/generic/tkStyle.c
index f3d9604..b8e70e5 100644
--- a/generic/tkStyle.c
+++ b/generic/tkStyle.c
@@ -9,7 +9,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkStyle.c,v 1.6 2007/01/03 05:06:26 nijtmans Exp $
+ * RCS: @(#) $Id: tkStyle.c,v 1.7 2007/10/15 07:24:49 das Exp $
*/
#include "tkInt.h"
@@ -624,7 +624,7 @@ CreateElement(
entryPtr = Tcl_CreateHashEntry(&tsdPtr->elementTable, name, &newEntry);
if (!newEntry) {
- elementId = (int) Tcl_GetHashValue(entryPtr);
+ elementId = PTR2INT(Tcl_GetHashValue(entryPtr));
if (create) {
tsdPtr->elements[elementId].created = 1;
}
@@ -642,7 +642,7 @@ CreateElement(
}
elementId = tsdPtr->nbElements++;
- Tcl_SetHashValue(entryPtr, (ClientData) elementId);
+ Tcl_SetHashValue(entryPtr, (ClientData) INT2PTR(elementId));
/*
* Reallocate element table.
@@ -705,7 +705,7 @@ Tk_GetElementId(
entryPtr = Tcl_FindHashEntry(&tsdPtr->elementTable, name);
if (entryPtr) {
- return (int) Tcl_GetHashValue(entryPtr);
+ return PTR2INT(Tcl_GetHashValue(entryPtr));
}
/*