Attachment "tkuid.patch" to
ticket [1870330f]
added by
pspjuth
2008-01-13 20:28:47.
diff -ur -x .git tkmaster/doc/GetCursor.3 tk/doc/GetCursor.3
--- tkmaster/doc/GetCursor.3 2008-01-06 17:07:42.000000000 +0100
+++ tk/doc/GetCursor.3 2008-01-13 14:02:59.000000000 +0100
@@ -58,9 +58,9 @@
X-location of cursor hot-spot.
.AP "int" yHot in
Y-location of cursor hot-spot.
-.AP Tk_Uid fg in
+.AP "const char" *fg in
Textual description of foreground color for cursor.
-.AP Tk_Uid bg in
+.AP "const char" *bg in
Textual description of background color for cursor.
.AP Display *display in
Display for which \fIcursor\fR was allocated.
@@ -172,7 +172,7 @@
#include "mask.cursor"
cursor = Tk_GetCursorFromData(interp, tkwin, source_bits,
mask_bits, source_width, source_height, source_x_hot,
- source_y_hot, Tk_GetUid("red"), Tk_GetUid("blue"));
+ source_y_hot, "red", "blue");
.CE
.PP
Under normal conditions \fBTk_GetCursorFromData\fR
diff -ur -x .git tkmaster/doc/GetPixels.3 tk/doc/GetPixels.3
--- tkmaster/doc/GetPixels.3 2008-01-06 17:07:42.000000000 +0100
+++ tk/doc/GetPixels.3 2008-01-13 14:02:59.000000000 +0100
@@ -87,7 +87,7 @@
\fBTk_GetPixels\fR is identical to \fBTk_GetPixelsFromObj\fR except
that the screen distance is specified with a string instead
of an object. This prevents \fBTk_GetPixels\fR from caching the
-return value, so \fBTk_GetAnchor\fR is less efficient than
+return value, so \fBTk_GetPixels\fR is less efficient than
\fBTk_GetPixelsFromObj\fR.
.PP
\fBTk_GetMMFromObj\fR and \fBTk_GetScreenMM\fR are similar to
Only in tk/doc: man.macros
diff -ur -x .git tkmaster/generic/tk3d.c tk/generic/tk3d.c
--- tkmaster/generic/tk3d.c 2008-01-06 17:07:42.000000000 +0100
+++ tk/generic/tk3d.c 2008-01-13 14:02:59.000000000 +0100
@@ -185,7 +185,7 @@
Tcl_Interp *interp, /* Place to store an error message. */
Tk_Window tkwin, /* Token for window in which border will be
* drawn. */
- Tk_Uid colorName) /* String giving name of color for window
+ CONST char *colorName) /* String giving name of color for window
* background. */
{
Tcl_HashEntry *hashPtr;
diff -ur -x .git tkmaster/generic/tkColor.c tk/generic/tkColor.c
--- tkmaster/generic/tkColor.c 2008-01-06 17:07:42.000000000 +0100
+++ tk/generic/tkColor.c 2008-01-13 14:02:59.000000000 +0100
@@ -185,7 +185,7 @@
Tcl_Interp *interp, /* Place to leave error message if color can't
* be found. */
Tk_Window tkwin, /* Window in which color will be used. */
- Tk_Uid name) /* Name of color to be allocated (in form
+ CONST char *name) /* Name of color to be allocated (in form
* suitable for passing to XParseColor). */
{
Tcl_HashEntry *nameHashPtr;
diff -ur -x .git tkmaster/generic/tkColor.h tk/generic/tkColor.h
--- tkmaster/generic/tkColor.h 2008-01-06 17:07:42.000000000 +0100
+++ tk/generic/tkColor.h 2008-01-13 14:02:59.000000000 +0100
@@ -76,7 +76,7 @@
#ifndef TkpFreeColor
MODULE_SCOPE void TkpFreeColor(TkColor *tkColPtr);
#endif
-MODULE_SCOPE TkColor * TkpGetColor(Tk_Window tkwin, Tk_Uid name);
+MODULE_SCOPE TkColor * TkpGetColor(Tk_Window tkwin, CONST char *name);
MODULE_SCOPE TkColor * TkpGetColorByValue(Tk_Window tkwin, XColor *colorPtr);
#undef TCL_STORAGE_CLASS
diff -ur -x .git tkmaster/generic/tkCursor.c tk/generic/tkCursor.c
--- tkmaster/generic/tkCursor.c 2008-01-06 17:07:42.000000000 +0100
+++ tk/generic/tkCursor.c 2008-01-13 14:02:59.000000000 +0100
@@ -185,7 +185,7 @@
Tk_GetCursor(
Tcl_Interp *interp, /* Interpreter to use for error reporting. */
Tk_Window tkwin, /* Window in which cursor will be used. */
- Tk_Uid string) /* Description of cursor. See manual entry for
+ CONST char *string) /* Description of cursor. See manual entry for
* details on legal syntax. */
{
TkCursor *cursorPtr = TkcGetCursor(interp, tkwin, string);
@@ -315,8 +315,8 @@
CONST char *mask, /* Bitmap data for cursor mask. */
int width, int height, /* Dimensions of cursor. */
int xHot, int yHot, /* Location of hot-spot in cursor. */
- Tk_Uid fg, /* Foreground color for cursor. */
- Tk_Uid bg) /* Background color for cursor. */
+ CONST char *fg, /* Foreground color for cursor. */
+ CONST char *bg) /* Background color for cursor. */
{
DataKey dataKey;
Tcl_HashEntry *dataHashPtr;
@@ -335,8 +335,8 @@
dataKey.height = height;
dataKey.xHot = xHot;
dataKey.yHot = yHot;
- dataKey.fg = fg;
- dataKey.bg = bg;
+ dataKey.fg = Tk_GetUid(fg); /* Don't know if Uid is necessary here? */
+ dataKey.bg = Tk_GetUid(bg);
dataKey.display = Tk_Display(tkwin);
dataHashPtr = Tcl_CreateHashEntry(&dispPtr->cursorDataTable,
(char *) &dataKey, &isNew);
diff -ur -x .git tkmaster/generic/tk.decls tk/generic/tk.decls
--- tkmaster/generic/tk.decls 2008-01-06 17:07:42.000000000 +0100
+++ tk/generic/tk.decls 2008-01-13 14:02:59.000000000 +0100
@@ -338,7 +338,7 @@
}
declare 80 generic {
Tk_3DBorder Tk_Get3DBorder(Tcl_Interp *interp, Tk_Window tkwin,
- Tk_Uid colorName)
+ CONST char *colorName)
}
declare 81 generic {
void Tk_GetAllBindings(Tcl_Interp *interp,
@@ -367,7 +367,8 @@
int Tk_GetCapStyle(Tcl_Interp *interp, CONST char *str, int *capPtr)
}
declare 88 generic {
- XColor * Tk_GetColor(Tcl_Interp *interp, Tk_Window tkwin, Tk_Uid name)
+ XColor * Tk_GetColor(Tcl_Interp *interp, Tk_Window tkwin,
+ CONST char *name)
}
declare 89 generic {
XColor * Tk_GetColorByValue(Tk_Window tkwin, XColor *colorPtr)
@@ -378,13 +379,13 @@
}
declare 91 generic {
Tk_Cursor Tk_GetCursor(Tcl_Interp *interp, Tk_Window tkwin,
- Tk_Uid str)
+ CONST char *str)
}
declare 92 generic {
Tk_Cursor Tk_GetCursorFromData(Tcl_Interp *interp,
Tk_Window tkwin, CONST char *source, CONST char *mask,
int width, int height, int xHot, int yHot,
- Tk_Uid fg, Tk_Uid bg)
+ CONST char *fg, CONST char *bg)
}
declare 93 generic {
Tk_Font Tk_GetFont(Tcl_Interp *interp,
diff -ur -x .git tkmaster/generic/tkDecls.h tk/generic/tkDecls.h
--- tkmaster/generic/tkDecls.h 2007-11-11 20:11:14.000000000 +0100
+++ tk/generic/tkDecls.h 2008-01-13 14:02:59.000000000 +0100
@@ -536,7 +536,7 @@
#define Tk_Get3DBorder_TCL_DECLARED
/* 80 */
EXTERN Tk_3DBorder Tk_Get3DBorder (Tcl_Interp * interp, Tk_Window tkwin,
- Tk_Uid colorName);
+ CONST char * colorName);
#endif
#ifndef Tk_GetAllBindings_TCL_DECLARED
#define Tk_GetAllBindings_TCL_DECLARED
@@ -586,7 +586,7 @@
#define Tk_GetColor_TCL_DECLARED
/* 88 */
EXTERN XColor * Tk_GetColor (Tcl_Interp * interp, Tk_Window tkwin,
- Tk_Uid name);
+ CONST char * name);
#endif
#ifndef Tk_GetColorByValue_TCL_DECLARED
#define Tk_GetColorByValue_TCL_DECLARED
@@ -604,7 +604,7 @@
#define Tk_GetCursor_TCL_DECLARED
/* 91 */
EXTERN Tk_Cursor Tk_GetCursor (Tcl_Interp * interp, Tk_Window tkwin,
- Tk_Uid str);
+ CONST char * str);
#endif
#ifndef Tk_GetCursorFromData_TCL_DECLARED
#define Tk_GetCursorFromData_TCL_DECLARED
@@ -612,7 +612,8 @@
EXTERN Tk_Cursor Tk_GetCursorFromData (Tcl_Interp * interp,
Tk_Window tkwin, CONST char * source,
CONST char * mask, int width, int height,
- int xHot, int yHot, Tk_Uid fg, Tk_Uid bg);
+ int xHot, int yHot, CONST char * fg,
+ CONST char * bg);
#endif
#ifndef Tk_GetFont_TCL_DECLARED
#define Tk_GetFont_TCL_DECLARED
@@ -1786,7 +1787,7 @@
void (*tk_FreeXId) (Display * display, XID xid); /* 77 */
GC (*tk_GCForColor) (XColor * colorPtr, Drawable drawable); /* 78 */
void (*tk_GeometryRequest) (Tk_Window tkwin, int reqWidth, int reqHeight); /* 79 */
- Tk_3DBorder (*tk_Get3DBorder) (Tcl_Interp * interp, Tk_Window tkwin, Tk_Uid colorName); /* 80 */
+ Tk_3DBorder (*tk_Get3DBorder) (Tcl_Interp * interp, Tk_Window tkwin, CONST char * colorName); /* 80 */
void (*tk_GetAllBindings) (Tcl_Interp * interp, Tk_BindingTable bindingTable, ClientData object); /* 81 */
int (*tk_GetAnchor) (Tcl_Interp * interp, CONST char * str, Tk_Anchor * anchorPtr); /* 82 */
CONST84_RETURN char * (*tk_GetAtomName) (Tk_Window tkwin, Atom atom); /* 83 */
@@ -1794,11 +1795,11 @@
Pixmap (*tk_GetBitmap) (Tcl_Interp * interp, Tk_Window tkwin, CONST char * str); /* 85 */
Pixmap (*tk_GetBitmapFromData) (Tcl_Interp * interp, Tk_Window tkwin, CONST char * source, int width, int height); /* 86 */
int (*tk_GetCapStyle) (Tcl_Interp * interp, CONST char * str, int * capPtr); /* 87 */
- XColor * (*tk_GetColor) (Tcl_Interp * interp, Tk_Window tkwin, Tk_Uid name); /* 88 */
+ XColor * (*tk_GetColor) (Tcl_Interp * interp, Tk_Window tkwin, CONST char * name); /* 88 */
XColor * (*tk_GetColorByValue) (Tk_Window tkwin, XColor * colorPtr); /* 89 */
Colormap (*tk_GetColormap) (Tcl_Interp * interp, Tk_Window tkwin, CONST char * str); /* 90 */
- Tk_Cursor (*tk_GetCursor) (Tcl_Interp * interp, Tk_Window tkwin, Tk_Uid str); /* 91 */
- Tk_Cursor (*tk_GetCursorFromData) (Tcl_Interp * interp, Tk_Window tkwin, CONST char * source, CONST char * mask, int width, int height, int xHot, int yHot, Tk_Uid fg, Tk_Uid bg); /* 92 */
+ Tk_Cursor (*tk_GetCursor) (Tcl_Interp * interp, Tk_Window tkwin, CONST char * str); /* 91 */
+ Tk_Cursor (*tk_GetCursorFromData) (Tcl_Interp * interp, Tk_Window tkwin, CONST char * source, CONST char * mask, int width, int height, int xHot, int yHot, CONST char * fg, CONST char * bg); /* 92 */
Tk_Font (*tk_GetFont) (Tcl_Interp * interp, Tk_Window tkwin, CONST char * str); /* 93 */
Tk_Font (*tk_GetFontFromObj) (Tk_Window tkwin, Tcl_Obj * objPtr); /* 94 */
void (*tk_GetFontMetrics) (Tk_Font font, Tk_FontMetrics * fmPtr); /* 95 */
diff -ur -x .git tkmaster/generic/tkImgBmap.c tk/generic/tkImgBmap.c
--- tkmaster/generic/tkImgBmap.c 2008-01-06 17:07:43.000000000 +0100
+++ tk/generic/tkImgBmap.c 2008-01-13 14:02:59.000000000 +0100
@@ -34,8 +34,8 @@
* no data. Malloc'ed. */
char *maskData; /* Data for bitmap's mask (suitable for input
* to XCreateBitmapFromData). Malloc'ed. */
- Tk_Uid fgUid; /* Value of -foreground option (malloc'ed). */
- Tk_Uid bgUid; /* Value of -background option (malloc'ed). */
+ char *fg; /* Value of -foreground option (malloc'ed). */
+ char *bg; /* Value of -background option (malloc'ed). */
char *fileString; /* Value of -file option (malloc'ed). */
char *dataString; /* Value of -data option (malloc'ed). */
char *maskFileString; /* Value of -maskfile option (malloc'ed). */
@@ -108,14 +108,14 @@
*/
static Tk_ConfigSpec configSpecs[] = {
- {TK_CONFIG_UID, "-background", NULL, NULL,
- "", Tk_Offset(BitmapMaster, bgUid), 0},
+ {TK_CONFIG_STRING, "-background", NULL, NULL,
+ "", Tk_Offset(BitmapMaster, bg), 0},
{TK_CONFIG_STRING, "-data", NULL, NULL,
NULL, Tk_Offset(BitmapMaster, dataString), TK_CONFIG_NULL_OK},
{TK_CONFIG_STRING, "-file", NULL, NULL,
NULL, Tk_Offset(BitmapMaster, fileString), TK_CONFIG_NULL_OK},
- {TK_CONFIG_UID, "-foreground", NULL, NULL,
- "#000000", Tk_Offset(BitmapMaster, fgUid), 0},
+ {TK_CONFIG_STRING, "-foreground", NULL, NULL,
+ "#000000", Tk_Offset(BitmapMaster, fg), 0},
{TK_CONFIG_STRING, "-maskdata", NULL, NULL,
NULL, Tk_Offset(BitmapMaster, maskDataString), TK_CONFIG_NULL_OK},
{TK_CONFIG_STRING, "-maskfile", NULL, NULL,
@@ -195,8 +195,8 @@
masterPtr->width = masterPtr->height = 0;
masterPtr->data = NULL;
masterPtr->maskData = NULL;
- masterPtr->fgUid = NULL;
- masterPtr->bgUid = NULL;
+ masterPtr->fg = NULL;
+ masterPtr->bg = NULL;
masterPtr->fileString = NULL;
masterPtr->dataString = NULL;
masterPtr->maskFileString = NULL;
@@ -351,9 +351,9 @@
* internal form appropriate for instancePtr.
*/
- if (*masterPtr->bgUid != 0) {
+ if (*masterPtr->bg != 0) {
colorPtr = Tk_GetColor(masterPtr->interp, instancePtr->tkwin,
- masterPtr->bgUid);
+ masterPtr->bg);
if (colorPtr == NULL) {
goto error;
}
@@ -366,7 +366,7 @@
instancePtr->bg = colorPtr;
colorPtr = Tk_GetColor(masterPtr->interp, instancePtr->tkwin,
- masterPtr->fgUid);
+ masterPtr->fg);
if (colorPtr == NULL) {
goto error;
}
@@ -1246,10 +1246,10 @@
* color to the bits specified by the mask.
*/
- if ((masterPtr->bgUid != NULL) && (masterPtr->bgUid[0] != '\000')) {
+ if ((masterPtr->bg != NULL) && (masterPtr->bg[0] != '\000')) {
XColor color;
- XParseColor(Tk_Display(tkwin), Tk_Colormap(tkwin), masterPtr->bgUid,
+ XParseColor(Tk_Display(tkwin), Tk_Colormap(tkwin), masterPtr->bg,
&color);
if (Tk_PostscriptColor(interp, psinfo, &color) != TCL_OK) {
return TCL_ERROR;
@@ -1268,10 +1268,10 @@
* Draw the bitmap foreground, assuming there is one.
*/
- if ((masterPtr->fgUid != NULL) && (masterPtr->data != NULL)) {
+ if ((masterPtr->fg != NULL) && (masterPtr->data != NULL)) {
XColor color;
- XParseColor(Tk_Display(tkwin), Tk_Colormap(tkwin), masterPtr->fgUid,
+ XParseColor(Tk_Display(tkwin), Tk_Colormap(tkwin), masterPtr->fg,
&color);
if (Tk_PostscriptColor(interp, psinfo, &color) != TCL_OK) {
return TCL_ERROR;
diff -ur -x .git tkmaster/generic/tkImgPhoto.c tk/generic/tkImgPhoto.c
--- tkmaster/generic/tkImgPhoto.c 2008-01-06 17:07:43.000000000 +0100
+++ tk/generic/tkImgPhoto.c 2008-01-13 14:02:59.000000000 +0100
@@ -1709,7 +1709,7 @@
if (index + 1 < objc) {
*optIndexPtr = ++index;
optPtr->background = Tk_GetColor(interp, Tk_MainWindow(interp),
- Tk_GetUid(Tcl_GetString(objv[index])));
+ Tcl_GetString(objv[index]));
if (!optPtr->background) {
return TCL_ERROR;
}
diff -ur -x .git tkmaster/generic/tkInt.decls tk/generic/tkInt.decls
--- tkmaster/generic/tkInt.decls 2008-01-06 17:07:43.000000000 +0100
+++ tk/generic/tkInt.decls 2008-01-13 14:02:59.000000000 +0100
@@ -138,7 +138,7 @@
}
declare 32 generic {
TkCursor *TkGetCursorByName(Tcl_Interp *interp,
- Tk_Window tkwin, Tk_Uid string)
+ Tk_Window tkwin, CONST char *string)
}
declare 33 generic {
CONST84_RETURN char *TkGetDefaultScreenName(Tcl_Interp *interp,
diff -ur -x .git tkmaster/generic/tkIntDecls.h tk/generic/tkIntDecls.h
--- tkmaster/generic/tkIntDecls.h 2008-01-06 17:07:43.000000000 +0100
+++ tk/generic/tkIntDecls.h 2008-01-13 14:02:59.000000000 +0100
@@ -232,7 +232,7 @@
#define TkGetCursorByName_TCL_DECLARED
/* 32 */
EXTERN TkCursor * TkGetCursorByName (Tcl_Interp * interp,
- Tk_Window tkwin, Tk_Uid string);
+ Tk_Window tkwin, CONST char * string);
#endif
#ifndef TkGetDefaultScreenName_TCL_DECLARED
#define TkGetDefaultScreenName_TCL_DECLARED
@@ -995,7 +995,7 @@
void (*tkpFreeCursor) (TkCursor * cursorPtr); /* 29 */
char * (*tkGetBitmapData) (Tcl_Interp * interp, char * string, char * fileName, int * widthPtr, int * heightPtr, int * hotXPtr, int * hotYPtr); /* 30 */
void (*tkGetButtPoints) (double p1[], double p2[], double width, int project, double m1[], double m2[]); /* 31 */
- TkCursor * (*tkGetCursorByName) (Tcl_Interp * interp, Tk_Window tkwin, Tk_Uid string); /* 32 */
+ TkCursor * (*tkGetCursorByName) (Tcl_Interp * interp, Tk_Window tkwin, CONST char * string); /* 32 */
CONST84_RETURN char * (*tkGetDefaultScreenName) (Tcl_Interp * interp, CONST char * screenName); /* 33 */
TkDisplay * (*tkGetDisplay) (Display * display); /* 34 */
int (*tkGetDisplayOf) (Tcl_Interp * interp, int objc, Tcl_Obj *CONST objv[], Tk_Window * tkwinPtr); /* 35 */
diff -ur -x .git tkmaster/generic/tkOldConfig.c tk/generic/tkOldConfig.c
--- tkmaster/generic/tkOldConfig.c 2008-01-06 17:07:43.000000000 +0100
+++ tk/generic/tkOldConfig.c 2008-01-13 14:02:59.000000000 +0100
@@ -32,7 +32,7 @@
*/
static int DoConfig(Tcl_Interp *interp, Tk_Window tkwin,
- Tk_ConfigSpec *specPtr, Tk_Uid value,
+ Tk_ConfigSpec *specPtr, CONST char *value,
int valueIsUid, char *widgRec);
static Tk_ConfigSpec * FindConfigSpec(Tcl_Interp *interp,
Tk_ConfigSpec *specs, CONST char *argvName,
@@ -192,14 +192,10 @@
return TCL_ERROR;
}
} else {
- if (specPtr->defValue != NULL) {
- value = Tk_GetUid(specPtr->defValue);
- } else {
- value = NULL;
- }
+ value = specPtr->defValue;
if ((value != NULL) && !(specPtr->specFlags
& TK_CONFIG_DONT_SET_DEFAULT)) {
- if (DoConfig(interp, tkwin, specPtr, value, 1, widgRec) !=
+ if (DoConfig(interp, tkwin, specPtr, value, 0, widgRec) !=
TCL_OK) {
char msg[200];
@@ -335,7 +331,7 @@
Tk_Window tkwin, /* Window containing widget (needed to set up
* X resources). */
Tk_ConfigSpec *specPtr, /* Specifier to apply. */
- Tk_Uid value, /* Value to use to fill in widgRec. */
+ CONST char *value, /* Value to use to fill in widgRec. */
int valueIsUid, /* Non-zero means value is a Tk_Uid; zero
* means it's an ordinary string. */
char *widgRec) /* Record whose fields are to be modified.
@@ -382,7 +378,7 @@
ckfree(oldStr);
}
*((char **) ptr) = newStr;
- break;
+ break;
}
case TK_CONFIG_UID:
if (nullValue) {
@@ -398,8 +394,8 @@
if (nullValue) {
newPtr = NULL;
} else {
- uid = valueIsUid ? (Tk_Uid) value : Tk_GetUid(value);
- newPtr = Tk_GetColor(interp, tkwin, uid);
+
+ newPtr = Tk_GetColor(interp, tkwin, value);
if (newPtr == NULL) {
return TCL_ERROR;
}
@@ -432,8 +428,7 @@
if (nullValue) {
newBmp = None;
} else {
- uid = valueIsUid ? (Tk_Uid) value : Tk_GetUid(value);
- newBmp = Tk_GetBitmap(interp, tkwin, uid);
+ newBmp = Tk_GetBitmap(interp, tkwin, value);
if (newBmp == None) {
return TCL_ERROR;
}
@@ -451,8 +446,7 @@
if (nullValue) {
newBorder = NULL;
} else {
- uid = valueIsUid ? (Tk_Uid) value : Tk_GetUid(value);
- newBorder = Tk_Get3DBorder(interp, tkwin, uid);
+ newBorder = Tk_Get3DBorder(interp, tkwin, value);
if (newBorder == NULL) {
return TCL_ERROR;
}
@@ -465,8 +459,7 @@
break;
}
case TK_CONFIG_RELIEF:
- uid = valueIsUid ? (Tk_Uid) value : Tk_GetUid(value);
- if (Tk_GetRelief(interp, uid, (int *) ptr) != TCL_OK) {
+ if (Tk_GetRelief(interp, value, (int *) ptr) != TCL_OK) {
return TCL_ERROR;
}
break;
@@ -477,8 +470,7 @@
if (nullValue) {
newCursor = None;
} else {
- uid = valueIsUid ? (Tk_Uid) value : Tk_GetUid(value);
- newCursor = Tk_GetCursor(interp, tkwin, uid);
+ newCursor = Tk_GetCursor(interp, tkwin, value);
if (newCursor == None) {
return TCL_ERROR;
}
@@ -493,27 +485,23 @@
}
break;
}
- case TK_CONFIG_JUSTIFY:
- uid = valueIsUid ? (Tk_Uid) value : Tk_GetUid(value);
- if (Tk_GetJustify(interp, uid, (Tk_Justify *) ptr) != TCL_OK) {
+ case TK_CONFIG_JUSTIFY:
+ if (Tk_GetJustify(interp, value, (Tk_Justify *) ptr) != TCL_OK) {
return TCL_ERROR;
}
break;
- case TK_CONFIG_ANCHOR:
- uid = valueIsUid ? (Tk_Uid) value : Tk_GetUid(value);
- if (Tk_GetAnchor(interp, uid, (Tk_Anchor *) ptr) != TCL_OK) {
+ case TK_CONFIG_ANCHOR:
+ if (Tk_GetAnchor(interp, value, (Tk_Anchor *) ptr) != TCL_OK) {
return TCL_ERROR;
}
break;
- case TK_CONFIG_CAP_STYLE:
- uid = valueIsUid ? (Tk_Uid) value : Tk_GetUid(value);
- if (Tk_GetCapStyle(interp, uid, (int *) ptr) != TCL_OK) {
+ case TK_CONFIG_CAP_STYLE:
+ if (Tk_GetCapStyle(interp, value, (int *) ptr) != TCL_OK) {
return TCL_ERROR;
}
break;
- case TK_CONFIG_JOIN_STYLE:
- uid = valueIsUid ? (Tk_Uid) value : Tk_GetUid(value);
- if (Tk_GetJoinStyle(interp, uid, (int *) ptr) != TCL_OK) {
+ case TK_CONFIG_JOIN_STYLE:
+ if (Tk_GetJoinStyle(interp, value, (int *) ptr) != TCL_OK) {
return TCL_ERROR;
}
break;
@@ -523,7 +511,7 @@
return TCL_ERROR;
}
break;
- case TK_CONFIG_MM:
+ case TK_CONFIG_MM:
if (Tk_GetScreenMM(interp, tkwin, value, (double*)ptr) != TCL_OK) {
return TCL_ERROR;
}
diff -ur -x .git tkmaster/macosx/tkMacOSXBitmap.c tk/macosx/tkMacOSXBitmap.c
--- tkmaster/macosx/tkMacOSXBitmap.c 2007-11-11 20:11:14.000000000 +0100
+++ tk/macosx/tkMacOSXBitmap.c 2008-01-13 14:02:59.000000000 +0100
@@ -97,7 +97,7 @@
const char * name;
int isNew;
- name = Tk_GetUid(builtInPtr->name);
+ name = builtInPtr->name;
predefHashPtr = Tcl_CreateHashEntry(tablePtr, name, &isNew);
if (isNew) {
TkPredefBitmap *predefPtr = (TkPredefBitmap *)
diff -ur -x .git tkmaster/macosx/tkMacOSXColor.c tk/macosx/tkMacOSXColor.c
--- tkmaster/macosx/tkMacOSXColor.c 2008-01-06 17:07:43.000000000 +0100
+++ tk/macosx/tkMacOSXColor.c 2008-01-13 14:02:59.000000000 +0100
@@ -552,7 +552,7 @@
TkColor *
TkpGetColor(
Tk_Window tkwin, /* Window in which color will be used. */
- Tk_Uid name) /* Name of color to allocated (in form
+ CONST char *name) /* Name of color to allocated (in form
* suitable for passing to XParseColor). */
{
Display *display = Tk_Display(tkwin);
diff -ur -x .git tkmaster/macosx/tkMacOSXCursor.c tk/macosx/tkMacOSXCursor.c
--- tkmaster/macosx/tkMacOSXCursor.c 2008-01-06 17:07:43.000000000 +0100
+++ tk/macosx/tkMacOSXCursor.c 2008-01-13 14:02:59.000000000 +0100
@@ -194,7 +194,7 @@
TkGetCursorByName(
Tcl_Interp *interp, /* Interpreter to use for error reporting. */
Tk_Window tkwin, /* Window in which cursor will be used. */
- Tk_Uid string) /* Description of cursor. See manual entry
+ CONST char *string) /* Description of cursor. See manual entry
* for details on legal syntax. */
{
struct CursorName *namePtr;
diff -ur -x .git tkmaster/macosx/tkMacOSXWm.c tk/macosx/tkMacOSXWm.c
--- tkmaster/macosx/tkMacOSXWm.c 2008-01-06 17:07:43.000000000 +0100
+++ tk/macosx/tkMacOSXWm.c 2008-01-13 14:02:59.000000000 +0100
@@ -1730,7 +1730,7 @@
wmPtr->hints.flags &= ~IconPixmapHint;
}
} else {
- pixmap = Tk_GetBitmap(interp, (Tk_Window) winPtr, Tk_GetUid(str));
+ pixmap = Tk_GetBitmap(interp, (Tk_Window) winPtr, str);
if (pixmap == None) {
return TCL_ERROR;
}
Only in tk: tkuid.txt
Only in tk/unix: libtk8.5.so
Only in tk/unix: libtkstub8.5.a
Only in tk/unix: tk3d.o
Only in tk/unix: tkAppInit.o
Only in tk/unix: tkArgv.o
Only in tk/unix: tkAtom.o
Only in tk/unix: tkBind.o
Only in tk/unix: tkBitmap.o
Only in tk/unix: tkButton.o
Only in tk/unix: tkCanvArc.o
Only in tk/unix: tkCanvas.o
Only in tk/unix: tkCanvBmap.o
Only in tk/unix: tkCanvImg.o
Only in tk/unix: tkCanvLine.o
Only in tk/unix: tkCanvPoly.o
Only in tk/unix: tkCanvPs.o
Only in tk/unix: tkCanvText.o
Only in tk/unix: tkCanvUtil.o
Only in tk/unix: tkCanvWind.o
Only in tk/unix: tkClipboard.o
Only in tk/unix: tkCmds.o
Only in tk/unix: tkColor.o
Only in tk/unix: tkConfig.o
Only in tk/unix: tkConsole.o
Only in tk/unix: tkCursor.o
Only in tk/unix: tkEntry.o
Only in tk/unix: tkError.o
Only in tk/unix: tkEvent.o
Only in tk/unix: tkFocus.o
Only in tk/unix: tkFont.o
Only in tk/unix: tkFrame.o
Only in tk/unix: tkGC.o
Only in tk/unix: tkGeometry.o
Only in tk/unix: tkGet.o
Only in tk/unix: tkGrab.o
Only in tk/unix: tkGrid.o
Only in tk/unix: tkImage.o
Only in tk/unix: tkImgBmap.o
Only in tk/unix: tkImgGIF.o
Only in tk/unix: tkImgPhoto.o
Only in tk/unix: tkImgPPM.o
Only in tk/unix: tkListbox.o
Only in tk/unix: tkMain.o
Only in tk/unix: tkMenubutton.o
Only in tk/unix: tkMenuDraw.o
Only in tk/unix: tkMenu.o
Only in tk/unix: tkMessage.o
Only in tk/unix: tkObj.o
Only in tk/unix: tkOldConfig.o
Only in tk/unix: tkOption.o
Only in tk/unix: tkPack.o
Only in tk/unix: tkPanedWindow.o
Only in tk/unix: tkPlace.o
Only in tk/unix: tkRectOval.o
Only in tk/unix: tkScale.o
Only in tk/unix: tkScrollbar.o
Only in tk/unix: tkSelect.o
Only in tk/unix: tkStubInit.o
Only in tk/unix: tkStubLib.o
Only in tk/unix: tkStyle.o
Only in tk/unix: tkTextBTree.o
Only in tk/unix: tkTextDisp.o
Only in tk/unix: tkTextImage.o
Only in tk/unix: tkTextIndex.o
Only in tk/unix: tkTextMark.o
Only in tk/unix: tkText.o
Only in tk/unix: tkTextTag.o
Only in tk/unix: tkTextWind.o
Only in tk/unix: tkTrig.o
Only in tk/unix: tkUndo.o
diff -ur -x .git tkmaster/unix/tkUnix3d.c tk/unix/tkUnix3d.c
--- tkmaster/unix/tkUnix3d.c 2008-01-06 17:07:43.000000000 +0100
+++ tk/unix/tkUnix3d.c 2008-01-13 14:02:59.000000000 +0100
@@ -444,8 +444,7 @@
}
if (borderPtr->shadow == None) {
- borderPtr->shadow = Tk_GetBitmap((Tcl_Interp *) NULL, tkwin,
- Tk_GetUid("gray50"));
+ borderPtr->shadow = Tk_GetBitmap((Tcl_Interp *) NULL, tkwin, "gray50");
if (borderPtr->shadow == None) {
Tcl_Panic("TkpGetShadows couldn't allocate bitmap for border");
}
Only in tk/unix: tkUnix3d.o
Only in tk/unix: tkUnixButton.o
diff -ur -x .git tkmaster/unix/tkUnixColor.c tk/unix/tkUnixColor.c
--- tkmaster/unix/tkUnixColor.c 2008-01-06 17:07:43.000000000 +0100
+++ tk/unix/tkUnixColor.c 2008-01-13 14:02:59.000000000 +0100
@@ -121,7 +121,7 @@
TkColor *
TkpGetColor(
Tk_Window tkwin, /* Window in which color will be used. */
- Tk_Uid name) /* Name of color to allocated (in form
+ CONST char *name) /* Name of color to allocated (in form
* suitable for passing to XParseColor). */
{
Display *display = Tk_Display(tkwin);
Only in tk/unix: tkUnixColor.o
Only in tk/unix: tkUnixConfig.o
diff -ur -x .git tkmaster/unix/tkUnixCursor.c tk/unix/tkUnixCursor.c
--- tkmaster/unix/tkUnixCursor.c 2008-01-06 17:07:43.000000000 +0100
+++ tk/unix/tkUnixCursor.c 2008-01-13 14:02:59.000000000 +0100
@@ -207,7 +207,7 @@
TkGetCursorByName(
Tcl_Interp *interp, /* Interpreter to use for error reporting. */
Tk_Window tkwin, /* Window in which cursor will be used. */
- Tk_Uid string) /* Description of cursor. See manual entry for
+ CONST char *string) /* Description of cursor. See manual entry for
* details on legal syntax. */
{
TkUnixCursor *cursorPtr = NULL;
Only in tk/unix: tkUnixCursor.o
Only in tk/unix: tkUnixDraw.o
Only in tk/unix: tkUnixEmbed.o
Only in tk/unix: tkUnixEvent.o
Only in tk/unix: tkUnixFocus.o
Only in tk/unix: tkUnixInit.o
Only in tk/unix: tkUnixKey.o
Only in tk/unix: tkUnixMenubu.o
Only in tk/unix: tkUnixMenu.o
Only in tk/unix: tkUnix.o
diff -ur -x .git tkmaster/unix/tkUnixRFont.c tk/unix/tkUnixRFont.c
--- tkmaster/unix/tkUnixRFont.c 2007-11-11 20:11:14.000000000 +0100
+++ tk/unix/tkUnixRFont.c 2008-01-13 14:02:59.000000000 +0100
@@ -407,7 +407,7 @@
for (i = 0; i < list->nfont; i++) {
if (XftPatternGetString(list->fonts[i], XFT_FAMILY, 0,
familyPtr) == XftResultMatch) {
- strPtr = Tcl_NewStringObj(Tk_GetUid(family), -1);
+ strPtr = Tcl_NewStringObj(family, -1);
Tcl_ListObjAppendElement(NULL, resultPtr, strPtr);
}
}
Only in tk/unix: tkUnixRFont.o
Only in tk/unix: tkUnixScale.o
Only in tk/unix: tkUnixScrlbr.o
Only in tk/unix: tkUnixSelect.o
Only in tk/unix: tkUnixSend.o
Only in tk/unix: tkUnixWm.o
Only in tk/unix: tkUnixXId.o
Only in tk/unix: tkUtil.o
Only in tk/unix: tkVisual.o
Only in tk/unix: tkWindow.o
Only in tk/unix: ttkBlink.o
Only in tk/unix: ttkButton.o
Only in tk/unix: ttkCache.o
Only in tk/unix: ttkClamTheme.o
Only in tk/unix: ttkClassicTheme.o
Only in tk/unix: ttkDefaultTheme.o
Only in tk/unix: ttkElements.o
Only in tk/unix: ttkEntry.o
Only in tk/unix: ttkFrame.o
Only in tk/unix: ttkImage.o
Only in tk/unix: ttkInit.o
Only in tk/unix: ttkLabel.o
Only in tk/unix: ttkLayout.o
Only in tk/unix: ttkManager.o
Only in tk/unix: ttkNotebook.o
Only in tk/unix: ttkPanedwindow.o
Only in tk/unix: ttkProgress.o
Only in tk/unix: ttkScale.o
Only in tk/unix: ttkScrollbar.o
Only in tk/unix: ttkScroll.o
Only in tk/unix: ttkSeparator.o
Only in tk/unix: ttkSquare.o
Only in tk/unix: ttkState.o
Only in tk/unix: ttkStubInit.o
Only in tk/unix: ttkStubLib.o
Only in tk/unix: ttkTagSet.o
Only in tk/unix: ttkTheme.o
Only in tk/unix: ttkTrace.o
Only in tk/unix: ttkTrack.o
Only in tk/unix: ttkTreeview.o
Only in tk/unix: ttkWidget.o
Only in tk/unix: wish
diff -ur -x .git tkmaster/win/tkWin3d.c tk/win/tkWin3d.c
--- tkmaster/win/tkWin3d.c 2007-11-11 20:11:14.000000000 +0100
+++ tk/win/tkWin3d.c 2008-01-13 14:02:59.000000000 +0100
@@ -352,17 +352,17 @@
if ((TkWinIndexOfColor(borderPtr->bgColorPtr) == COLOR_3DFACE)
|| (TkWinIndexOfColor(borderPtr->bgColorPtr) == COLOR_WINDOW)) {
borderPtr->darkColorPtr = Tk_GetColor(NULL, tkwin,
- Tk_GetUid("SystemButtonShadow"));
+ "SystemButtonShadow");
gcValues.foreground = borderPtr->darkColorPtr->pixel;
borderPtr->darkGC = Tk_GetGC(tkwin, GCForeground, &gcValues);
borderPtr->lightColorPtr = Tk_GetColor(NULL, tkwin,
- Tk_GetUid("SystemButtonHighlight"));
+ "SystemButtonHighlight");
gcValues.foreground = borderPtr->lightColorPtr->pixel;
borderPtr->lightGC = Tk_GetGC(tkwin, GCForeground, &gcValues);
((WinBorder*)borderPtr)->dark2ColorPtr = Tk_GetColor(NULL, tkwin,
- Tk_GetUid("System3dDarkShadow"));
+ "System3dDarkShadow");
((WinBorder*)borderPtr)->light2ColorPtr = Tk_GetColor(NULL, tkwin,
- Tk_GetUid("System3dLight"));
+ "System3dLight");
return;
}
darkColor.red = 0;
@@ -468,8 +468,7 @@
}
if (borderPtr->shadow == None) {
- borderPtr->shadow = Tk_GetBitmap((Tcl_Interp *) NULL, tkwin,
- Tk_GetUid("gray50"));
+ borderPtr->shadow = Tk_GetBitmap((Tcl_Interp *) NULL, tkwin, "gray50");
if (borderPtr->shadow == None) {
Tcl_Panic("TkpGetShadows couldn't allocate bitmap for border");
}
diff -ur -x .git tkmaster/win/tkWinColor.c tk/win/tkWinColor.c
--- tkmaster/win/tkWinColor.c 2007-11-11 20:11:14.000000000 +0100
+++ tk/win/tkWinColor.c 2008-01-13 14:02:59.000000000 +0100
@@ -186,7 +186,7 @@
TkColor *
TkpGetColor(
Tk_Window tkwin, /* Window in which color will be used. */
- Tk_Uid name) /* Name of color to allocated (in form
+ CONST char * name) /* Name of color to allocated (in form
* suitable for passing to XParseColor). */
{
WinColor *winColPtr;
diff -ur -x .git tkmaster/win/tkWinCursor.c tk/win/tkWinCursor.c
--- tkmaster/win/tkWinCursor.c 2008-01-06 17:07:43.000000000 +0100
+++ tk/win/tkWinCursor.c 2008-01-13 14:02:59.000000000 +0100
@@ -92,7 +92,7 @@
TkGetCursorByName(
Tcl_Interp *interp, /* Interpreter to use for error reporting. */
Tk_Window tkwin, /* Window in which cursor will be used. */
- Tk_Uid string) /* Description of cursor. See manual entry for
+ CONST char *string) /* Description of cursor. See manual entry for
* details on legal syntax. */
{
struct CursorName *namePtr;
diff -ur -x .git tkmaster/win/tkWinWm.c tk/win/tkWinWm.c
--- tkmaster/win/tkWinWm.c 2008-01-06 17:07:43.000000000 +0100
+++ tk/win/tkWinWm.c 2008-01-13 14:02:59.000000000 +0100
@@ -3202,7 +3202,7 @@
}
} else {
XColor *cPtr =
- Tk_GetColor(interp, tkwin, Tk_GetUid(crefstr));
+ Tk_GetColor(interp, tkwin, crefstr);
if (cPtr == NULL) {
return TCL_ERROR;
}