Tk Source Code

Check-in [38c69518]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:_Xconst -> CONST
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | core-8-4-branch
Files: files | file ages | folders
SHA1: 38c69518fa22ebaa5824d8554e699bb6bb0216f9
User & Date: jan.nijtmans 2012-02-21 05:38:49
Context
2012-02-26
21:23
Provide fallback for _strtoi64 check-in: 2f32e4e8 user: jan.nijtmans tags: core-8-4-branch
2012-02-21
05:41
_Xconst -> CONST check-in: 52840c0c user: jan.nijtmans tags: core-8-5-branch
05:38
_Xconst -> CONST check-in: 38c69518 user: jan.nijtmans tags: core-8-4-branch
2012-02-15
20:33
[Bug 3486474]: Inconsistent color scaling check-in: feaff433 user: jan.nijtmans tags: core-8-4-branch
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to generic/tkColor.c.

813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
#ifndef __WIN32__
/* This function is not necessary for Win32,
 * since XParseColor already does the right thing */
Status
TkParseColor(display, map, spec, colorPtr)
    Display * display;		/* The display */
    Colormap map;			/* Color map */
    _Xconst char* spec;     /* String to be parsed */
    XColor * colorPtr;
{
    if (*spec == '#') {
    char buf[14];
    buf[0] = '#'; buf[13] = '\0';
	if (!*(++spec) || !*(++spec) || !*(++spec)) {
	/* Not at least 3 hex digits, so invalid */







|







813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
#ifndef __WIN32__
/* This function is not necessary for Win32,
 * since XParseColor already does the right thing */
Status
TkParseColor(display, map, spec, colorPtr)
    Display * display;		/* The display */
    Colormap map;			/* Color map */
    CONST char* spec;     /* String to be parsed */
    XColor * colorPtr;
{
    if (*spec == '#') {
    char buf[14];
    buf[0] = '#'; buf[13] = '\0';
	if (!*(++spec) || !*(++spec) || !*(++spec)) {
	/* Not at least 3 hex digits, so invalid */

Changes to generic/tkInt.h.

1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
			    Tk_Window tkwin, Tcl_Obj *objPtr,
			    int *pad1Ptr, int *pad2Ptr));
EXTERN int		TkpAlwaysShowSelection _ANSI_ARGS_((Tk_Window tkwin));
#ifdef __WIN32__
#define TkParseColor XParseColor
#else
EXTERN Status TkParseColor _ANSI_ARGS_((Display * display,
				Colormap map, _Xconst char* spec,
				XColor * colorPtr));
#endif

/*
 * Unsupported commands.
 */
EXTERN int		TkUnsupported1ObjCmd _ANSI_ARGS_((







|







1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
			    Tk_Window tkwin, Tcl_Obj *objPtr,
			    int *pad1Ptr, int *pad2Ptr));
EXTERN int		TkpAlwaysShowSelection _ANSI_ARGS_((Tk_Window tkwin));
#ifdef __WIN32__
#define TkParseColor XParseColor
#else
EXTERN Status TkParseColor _ANSI_ARGS_((Display * display,
				Colormap map, CONST char* spec,
				XColor * colorPtr));
#endif

/*
 * Unsupported commands.
 */
EXTERN int		TkUnsupported1ObjCmd _ANSI_ARGS_((