Tk Source Code

Check-in [4f65f224]
Login

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

Overview
Comment:Merge trunk. Define some macros in tk.h which are needed by Tk as fallback, which might be removed from future tcl.h versions.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 4f65f224c4c5308c95002268dc54586b17ac13e2
User & Date: jan.nijtmans 2013-01-31 12:41:37
Context
2013-02-01
14:30
Use internalRep.twoPtrValue.ptr1 in stead of internalRep.otherValuePtr everywhere. Change some internal "length" variables from type int to type size_t, so it could handle bigger string sizes (for "novem") check-in: dc4fe358 user: jan.nijtmans tags: trunk
2013-01-31
13:38
merge trunk check-in: f1d51ad7 user: jan.nijtmans tags: novem-support
12:41
Merge trunk. Define some macros in tk.h which are needed by Tk as fallback, which might be removed from future tcl.h versions. check-in: 4f65f224 user: jan.nijtmans tags: trunk
11:49
Bug [3599928]: Use XkbKeycodeToKeysym if available. check-in: fe704e14 user: stwo tags: core-8-5-branch
11:47
Oops. Missed removing one line in last commit. check-in: 84a425c7 user: stwo tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to generic/tk.h.

16
17
18
19
20
21
22
23

























24
25
26
27
28
29
30
#ifndef _TK
#define _TK

#include <tcl.h>
#if (TCL_MAJOR_VERSION != 8) || (TCL_MINOR_VERSION < 6)
#	error Tk 8.6 must be compiled with tcl.h from Tcl 8.6 or better
#endif


























/*
 * For C++ compilers, use extern "C"
 */

#ifdef __cplusplus
extern "C" {
#endif







|
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>







16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
#ifndef _TK
#define _TK

#include <tcl.h>
#if (TCL_MAJOR_VERSION != 8) || (TCL_MINOR_VERSION < 6)
#	error Tk 8.6 must be compiled with tcl.h from Tcl 8.6 or better
#endif

#ifndef CONST84
#   define CONST84 const
#   define CONST84_RETURN const
#endif
#ifndef CONST86
#   define CONST86 CONST84
#endif
#ifndef EXTERN
#   define EXTERN extern TCL_STORAGE_CLASS
#endif

/*
 * Utility macros: STRINGIFY takes an argument and wraps it in "" (double
 * quotation marks), JOIN joins two arguments.
 */

#ifndef STRINGIFY
#  define STRINGIFY(x) STRINGIFY1(x)
#  define STRINGIFY1(x) #x
#endif
#ifndef JOIN
#  define JOIN(a,b) JOIN1(a,b)
#  define JOIN1(a,b) a##b
#endif

/*
 * For C++ compilers, use extern "C"
 */

#ifdef __cplusplus
extern "C" {
#endif