Check-in [24b8c3122c]
Not logged in

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

Overview
Comment:fix for ticket [6a1d1b0283]
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 24b8c3122c6c2b0584779a5305415d50006fc3fa
User & Date: chw 2016-10-09 06:10:24
References
2016-10-09
06:10 Closed ticket [6a1d1b0283]: error dialog when changing font in tkchat plus 5 other changes artifact: 5ac4fa3753 user: chw
Context
2016-10-09
06:28
add tksvg, thank you Christian check-in: bc8ab002c1 user: chw tags: trunk
06:10
fix for ticket [6a1d1b0283] check-in: 24b8c3122c user: chw tags: trunk
06:08
add tcl upstream changes check-in: 14321fd099 user: chw tags: trunk
Changes

Changes to jni/sdl2tk/generic/tkTextTag.c.

26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
static const char *const wrapStrings[] = {
    "char", "none", "word", "", NULL
};

/*
 * The 'TkTextTabStyle' enum in tkText.h is used to define a type for the
 * -tabstyle option of the Text widget. These values are used as indices into
 * the string table below. Tags are allowed an empty wrap value, but the
 * widget as a whole is not.
 */

static const char *const tabStyleStrings[] = {
    "tabular", "wordprocessor", "", NULL
};








|







26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
static const char *const wrapStrings[] = {
    "char", "none", "word", "", NULL
};

/*
 * The 'TkTextTabStyle' enum in tkText.h is used to define a type for the
 * -tabstyle option of the Text widget. These values are used as indices into
 * the string table below. Tags are allowed an empty tabstyle value, but the
 * widget as a whole is not.
 */

static const char *const tabStyleStrings[] = {
    "tabular", "wordprocessor", "", NULL
};

Changes to jni/sdl2tk/library/fontchooser.tcl.

66
67
68
69
70
71
72

73

74
75
76
77
78
79
80
        tk::PlaceWindow $S(W) widget $S(-parent)
    }
    wm deiconify $S(W)
}

proc ::tk::fontchooser::Hide {} {
    variable S

    wm withdraw $S(W)

}

proc ::tk::fontchooser::Configure {args} {
    variable S

    set specs {
        {-parent  "" "" . }







>
|
>







66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
        tk::PlaceWindow $S(W) widget $S(-parent)
    }
    wm deiconify $S(W)
}

proc ::tk::fontchooser::Hide {} {
    variable S
    if {[winfo exists $S(W)]} {
        wm withdraw $S(W)
    }
}

proc ::tk::fontchooser::Configure {args} {
    variable S

    set specs {
        {-parent  "" "" . }

jni/sdl2tk/unix/configure.in became a regular file.

jni/tcl/library/tzdata/America/Resolute became executable.

jni/tcl/tests/tcltest.test became executable.