Check-in [1af051c03d]
Not logged in

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

Overview
Comment:add tk upstream changes plus fixes in droid ttk theme
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 1af051c03d838cab00e8886e62e50bbe9dac9bc8
User & Date: chw 2016-10-14 12:08:34
Context
2016-10-16
19:24
update SQLite to version 3.15.0 check-in: 28abc72d56 user: chw tags: trunk
2016-10-14
12:08
add tk upstream changes plus fixes in droid ttk theme check-in: 1af051c03d user: chw tags: trunk
08:58
add upstream tksvg changes check-in: a67e4657ca user: chw tags: trunk
Changes

Changes to jni/sdl2tk/doc/text.n.

   605    605   have any of the forms accepted by \fBTk_GetColor\fR. If \fIcolor\fR has not
   606    606   been specified, or if it is specified as an empty string, then the color
   607    607   specified by the \fB\-foreground\fR tag option is used.
   608    608   .TP
   609    609   \fB\-wrap \fImode\fR
   610    610   .
   611    611   \fIMode\fR specifies how to handle lines that are wider than the text's
   612         -window. It has the same legal values as the \fB\-wrap\fR option for the text
   613         -widget: \fBnone\fR, \fBchar\fR, or \fBword\fR. If this tag option is
   614         -specified, it overrides the \fB\-wrap\fR option for the text widget.
          612  +window. This option only applies to a display line if it applies to the
          613  +first non-elided character on that display line. It has the same legal
          614  +values as the \fB\-wrap\fR option for the text widget: \fBnone\fR,
          615  +\fBchar\fR, or \fBword\fR. If this tag option is specified, it
          616  +overrides the \fB\-wrap\fR option for the text widget.
   615    617   .PP
   616    618   If a character has several tags associated with it, and if their display
   617    619   options conflict, then the options of the highest priority tag are used. If a
   618    620   particular display option has not been specified for a particular tag, or if
   619    621   it is specified as an empty string, then that option will never be used; the
   620    622   next-highest-priority tag's option will used instead. If no tag specifies a
   621    623   particular display option, then the default style for the widget will be used.

Changes to jni/sdl2tk/doc/ttk_vsapi.n.

    57     57   .SH "STATE MAP"
    58     58   .PP
    59     59   The \fIstateMap\fR parameter is a list of ttk states and the
    60     60   corresponding Visual Styles API state value.
    61     61   This permits the element appearance to respond to changes in the
    62     62   widget state such as becoming active or being pressed. The list should
    63     63   be as described for the \fBttk::style map\fR command but note that the
    64         -last pair in the list should be the default state and is typically and
           64  +last pair in the list should be the default state and is typically an
    65     65   empty list and 1. Unfortunately all the Visual Styles parts have
    66     66   different state values and these must be looked up either in the
    67     67   Microsoft documentation or more likely in the header files. The
    68     68   original header to use was \fItmschema.h\fR, but in more recent
    69     69   versions of the Windows Development Kit this is \fIvssym32.h\fR.
    70     70   .PP
    71     71   If no \fIstateMap\fR parameter is given there is an implicit default

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

  2479   2479       }
  2480   2480       if (dlPtr->rMarginColor != NULL) {
  2481   2481           Tk_Fill3DRectangle(textPtr->tkwin, pixmap, dlPtr->rMarginColor,
  2482   2482                   dInfoPtr->maxX - dlPtr->rMarginWidth + dInfoPtr->curXPixelOffset,
  2483   2483                   y, dlPtr->rMarginWidth, dlPtr->height, 0, TK_RELIEF_FLAT);
  2484   2484       }
  2485   2485   
  2486         -
  2487   2486       /*
  2488   2487        * Make another pass through all of the chunks to redraw the insertion
  2489   2488        * cursor, if it is visible on this line. Must do it here rather than in
  2490   2489        * the foreground pass below because otherwise a wide insertion cursor
  2491   2490        * will obscure the character to its left.
  2492   2491        */
  2493   2492   
................................................................................
  7544   7543        * following is true:
  7545   7544        *	 (a) the chunk contains no characters and the display line contains no
  7546   7545        *	     characters yet (i.e. the line isn't wide enough to hold even a
  7547   7546        *	     single character).
  7548   7547        *	 (b) at least one pixel of the character is visible, we have not
  7549   7548        *	     already exceeded the character limit, and the next character is a
  7550   7549        *	     white space character.
         7550  +     * In the specific case of 'word' wrapping mode however, include all space
         7551  +     * characters following the characters that fit in the space we've got,
         7552  +     * even if no pixel of them is visible.
  7551   7553        */
  7552   7554   
  7553   7555       p = segPtr->body.chars + byteOffset;
  7554   7556       tkfont = chunkPtr->stylePtr->sValuePtr->tkfont;
  7555   7557   
  7556   7558   #if TK_LAYOUT_WITH_BASE_CHUNKS
  7557   7559       if (baseCharChunkPtr == NULL) {
................................................................................
  7606   7608   	     * if there is at least one pixel of space left on the line. Just
  7607   7609   	     * give the space character whatever space is left.
  7608   7610   	     */
  7609   7611   
  7610   7612   	    nextX = maxX;
  7611   7613   	    bytesThatFit++;
  7612   7614   	}
         7615  +        if (wrapMode == TEXT_WRAPMODE_WORD) {
         7616  +            while (p[bytesThatFit] == ' ') {
         7617  +                /*
         7618  +                 * Space characters that would go at the beginning of the
         7619  +                 * next line are allocated to the current line. This gives
         7620  +                 * the effect of trimming white spaces that would otherwise
         7621  +                 * be seen at the beginning of wrapped lines.
         7622  +                 * Note that testing for '\t' is useless here because the
         7623  +                 * chunk always includes at most one trailing \t, see
         7624  +                 * LayoutDLine.
         7625  +                 */
         7626  +
         7627  +                bytesThatFit++;
         7628  +            }
         7629  +        }
  7613   7630   	if (p[bytesThatFit] == '\n') {
  7614   7631   	    /*
  7615   7632   	     * A newline character takes up no space, so if the previous
  7616   7633   	     * character fits then so does the newline.
  7617   7634   	     */
  7618   7635   
  7619   7636   	    bytesThatFit++;

Changes to jni/sdl2tk/library/ttk/altTheme.tcl.

    10     10   	-window		"#ffffff"
    11     11   	-darker 	"#c3c3c3"
    12     12   	-border		"#414141"
    13     13   	-activebg 	"#ececec"
    14     14   	-disabledfg	"#a3a3a3"
    15     15   	-selectbg	"#4a6984"
    16     16   	-selectfg	"#ffffff"
           17  +	-altindicator	"#aaaaaa"
    17     18       }
    18     19   
    19     20       ttk::style theme settings alt {
    20     21   
    21     22   	ttk::style configure "." \
    22     23   	    -background 	$colors(-frame) \
    23     24   	    -foreground 	black \
................................................................................
    42     43   	    {pressed !disabled} 	sunken
    43     44   	    {active !disabled} 	raised
    44     45   	} -highlightcolor {alternate black}
    45     46   
    46     47   	ttk::style configure TCheckbutton -indicatorcolor "#ffffff" -padding 2
    47     48   	ttk::style configure TRadiobutton -indicatorcolor "#ffffff" -padding 2
    48     49   	ttk::style map TCheckbutton -indicatorcolor \
    49         -	    [list  disabled $colors(-frame)  pressed $colors(-frame)]
           50  +	    [list  pressed $colors(-frame) \
           51  +	           alternate $colors(-altindicator) \
           52  +	           disabled $colors(-frame)]
    50     53   	ttk::style map TRadiobutton -indicatorcolor \
    51         -	    [list  disabled $colors(-frame)  pressed $colors(-frame)]
           54  +	    [list  pressed $colors(-frame) \
           55  +	           alternate $colors(-altindicator) \
           56  +	           disabled $colors(-frame)]
    52     57   
    53     58   	ttk::style configure TMenubutton \
    54     59   	    -width -11 -padding "3 3" -relief raised
    55     60   
    56     61   	ttk::style configure TEntry -padding 1
    57     62   	ttk::style map TEntry -fieldbackground \
    58     63   		[list readonly $colors(-frame) disabled $colors(-frame)]

Changes to jni/sdl2tk/library/ttk/clamTheme.tcl.

     1      1   #
     2      2   # "Clam" theme.
     3      3   #
     4      4   # Inspired by the XFCE family of Gnome themes.
     5      5   #
     6      6   
     7      7   namespace eval ttk::theme::clam {
     8         -    variable colors
            8  +    variable colors 
     9      9       array set colors {
    10         -	-disabledfg	"#999999"
    11         -	-frame  	"#dcdad5"
    12         -	-window  	"#ffffff"
    13         -	-dark		"#cfcdc8"
    14         -	-darker 	"#bab5ab"
    15         -	-darkest	"#9e9a91"
    16         -	-lighter	"#eeebe7"
    17         -	-lightest 	"#ffffff"
    18         -	-selectbg	"#4a6984"
    19         -	-selectfg	"#ffffff"
           10  +	-disabledfg		"#999999"
           11  +	-frame  		"#dcdad5"
           12  +	-window  		"#ffffff"
           13  +	-dark			"#cfcdc8"
           14  +	-darker 		"#bab5ab"
           15  +	-darkest		"#9e9a91"
           16  +	-lighter		"#eeebe7"
           17  +	-lightest 		"#ffffff"
           18  +	-selectbg		"#4a6984"
           19  +	-selectfg		"#ffffff"
           20  +	-altindicator		"#5895bc"
           21  +	-disabledaltindicator	"#a0a0a0"
    20     22       }
    21     23   
    22     24       ttk::style theme settings clam {
    23     25   
    24     26   	ttk::style configure "." \
    25     27   	    -background $colors(-frame) \
    26     28   	    -foreground black \
................................................................................
    76     78   	    -indicatormargin {1 1 4 1} \
    77     79   	    -padding 2 ;
    78     80   	ttk::style configure TRadiobutton \
    79     81   	    -indicatorbackground "#ffffff" \
    80     82   	    -indicatormargin {1 1 4 1} \
    81     83   	    -padding 2 ;
    82     84   	ttk::style map TCheckbutton -indicatorbackground \
    83         -	    [list  disabled $colors(-frame)  pressed $colors(-frame)]
           85  +	    [list  pressed $colors(-frame) \
           86  +			{!disabled alternate} $colors(-altindicator) \
           87  +			{disabled alternate} $colors(-disabledaltindicator) \
           88  +			disabled $colors(-frame)]
    84     89   	ttk::style map TRadiobutton -indicatorbackground \
    85         -	    [list  disabled $colors(-frame)  pressed $colors(-frame)]
           90  +	    [list  pressed $colors(-frame) \
           91  +			{!disabled alternate} $colors(-altindicator) \
           92  +			{disabled alternate} $colors(-disabledaltindicator) \
           93  +			disabled $colors(-frame)]
    86     94   
    87     95   	ttk::style configure TMenubutton \
    88     96   	    -width -11 -padding 5 -relief raised
    89     97   
    90     98   	ttk::style configure TEntry -padding 1 -insertwidth 1
    91     99   	ttk::style map TEntry \
    92    100   	    -background [list  readonly $colors(-frame)] \

Changes to jni/sdl2tk/library/ttk/classicTheme.tcl.

    11     11   	-window		"#ffffff"
    12     12   	-activebg	"#ececec"
    13     13   	-troughbg	"#c3c3c3"
    14     14   	-selectbg	"#c3c3c3"
    15     15   	-selectfg	"#000000"
    16     16   	-disabledfg	"#a3a3a3"
    17     17   	-indicator	"#b03060"
           18  +	-altindicator	"#b05e5e"
    18     19       }
    19     20   
    20     21       ttk::style theme settings classic {
    21     22   	ttk::style configure "." \
    22     23   	    -font		TkDefaultFont \
    23     24   	    -background		$colors(-frame) \
    24     25   	    -foreground		black \
................................................................................
    45     46   	ttk::style configure TButton \
    46     47   	    -anchor center -padding "3m 1m" -relief raised -shiftrelief 1
    47     48   	ttk::style map TButton -relief [list {!disabled pressed} sunken]
    48     49   
    49     50   	ttk::style configure TCheckbutton -indicatorrelief raised
    50     51   	ttk::style map TCheckbutton \
    51     52   	    -indicatorcolor [list \
    52         -		pressed $colors(-frame)  selected $colors(-indicator)] \
    53         -	    -indicatorrelief {selected sunken  pressed sunken} \
           53  +		    pressed $colors(-frame) \
           54  +		    alternate $colors(-altindicator) \
           55  +		    selected $colors(-indicator)] \
           56  +	    -indicatorrelief {alternate raised  selected sunken  pressed sunken} \
    54     57   	    ;
    55     58   
    56     59   	ttk::style configure TRadiobutton -indicatorrelief raised
    57     60   	ttk::style map TRadiobutton \
    58     61   	    -indicatorcolor [list \
    59         -		pressed $colors(-frame)  selected $colors(-indicator)] \
    60         -	    -indicatorrelief {selected sunken  pressed sunken} \
           62  +		    pressed $colors(-frame) \
           63  +		    alternate $colors(-altindicator) \
           64  +		    selected $colors(-indicator)] \
           65  +	    -indicatorrelief {alternate raised  selected sunken  pressed sunken} \
    61     66   	    ;
    62     67   
    63     68   	ttk::style configure TMenubutton -relief raised -padding "3m 1m"
    64     69   
    65     70   	ttk::style configure TEntry -relief sunken -padding 1 -font TkTextFont
    66     71   	ttk::style map TEntry -fieldbackground \
    67     72   		[list readonly $colors(-frame) disabled $colors(-frame)]

Changes to jni/sdl2tk/library/ttk/defaults.tcl.

     1      1   #
     2      2   # Settings for default theme.
     3      3   #
     4      4   
     5      5   namespace eval ttk::theme::default {
     6      6       variable colors
     7      7       array set colors {
     8         -	-frame		"#d9d9d9"
     9         -	-foreground	"#000000"
    10         -	-window		"#ffffff"
    11         -	-text   	"#000000"
    12         -	-activebg	"#ececec"
    13         -	-selectbg	"#4a6984"
    14         -	-selectfg	"#ffffff"
    15         -	-darker 	"#c3c3c3"
    16         -	-disabledfg	"#a3a3a3"
    17         -	-indicator	"#4a6984"
            8  +	-frame			"#d9d9d9"
            9  +	-foreground		"#000000"
           10  +	-window			"#ffffff"
           11  +	-text   		"#000000"
           12  +	-activebg		"#ececec"
           13  +	-selectbg		"#4a6984"
           14  +	-selectfg		"#ffffff"
           15  +	-darker 		"#c3c3c3"
           16  +	-disabledfg		"#a3a3a3"
           17  +	-indicator		"#4a6984"
           18  +	-disabledindicator	"#a3a3a3"
           19  +	-altindicator		"#9fbdd8"
           20  +	-disabledaltindicator	"#c0c0c0"
    18     21       }
    19     22       variable sdltk [expr {[info command "sdltk"] eq "sdltk"}]
    20     23       variable android 0
    21     24       variable dpi 75
    22     25       variable geom
    23     26       if {$sdltk} {
    24     27   	set android [sdltk android]
................................................................................
   106    109   	    -anchor center -padding "3 3" -width -9 \
   107    110   	    -relief raised -shiftrelief 1
   108    111   	ttk::style map TButton -relief [list {!disabled pressed} sunken]
   109    112   
   110    113   	ttk::style configure TCheckbutton \
   111    114   	    -indicatorcolor "#ffffff" -indicatorrelief sunken -padding 1
   112    115   	ttk::style map TCheckbutton -indicatorcolor \
   113         -	    [list pressed $colors(-activebg)  selected $colors(-indicator)]
          116  +	    [list pressed $colors(-activebg)  \
          117  +			{!disabled alternate} $colors(-altindicator) \
          118  +			{disabled alternate} $colors(-disabledaltindicator) \
          119  +			{!disabled selected} $colors(-indicator) \
          120  +			{disabled selected} $colors(-disabledindicator)]
          121  +	ttk::style map TCheckbutton -indicatorrelief \
          122  +	    [list alternate raised]
   114    123   
   115    124   	ttk::style configure TRadiobutton \
   116    125   	    -indicatorcolor "#ffffff" -indicatorrelief sunken -padding 1
   117    126   	ttk::style map TRadiobutton -indicatorcolor \
   118         -	    [list pressed $colors(-activebg)  selected $colors(-indicator)]
          127  +	    [list pressed $colors(-activebg)  \
          128  +			{!disabled alternate} $colors(-altindicator) \
          129  +			{disabled alternate} $colors(-disabledaltindicator) \
          130  +			{!disabled selected} $colors(-indicator) \
          131  +			{disabled selected} $colors(-disabledindicator)]
          132  +	ttk::style map TRadiobutton -indicatorrelief \
          133  +	    [list alternate raised]
   119    134   
   120    135   	ttk::style configure TMenubutton \
   121    136   	    -relief raised -padding "10 3"
   122    137   
   123    138   	ttk::style configure TEntry \
   124    139   	    -relief sunken -fieldbackground white -padding 1
   125    140   	ttk::style map TEntry -fieldbackground \

Changes to jni/sdl2tk/library/ttk/droidTheme.tcl.

     7      7   #  Copyright (c) 2005 Pat Thoyts <patthoyts@users.sourceforge.net>
     8      8   #  Copyright (c) 2014 <chw@ch-werner.de>
     9      9   
    10     10   namespace eval ttk::theme::droid {
    11     11   
    12     12       variable colors
    13     13       array set colors {
    14         -    	-frame 		"#e6e6e6"
    15         -	-window		"#ffffff"
    16         -	-activebg	"#e6e6e6"
    17         -	-troughbg	"#657a9e"
    18         -	-selectbg	"#657a9e"
    19         -	-selectfg	"#ffffff"
    20         -	-disabledfg	"#aaaaaa"
    21         -	-indicator	"#b03060"
           14  +    	-frame 			"#e6e6e6"
           15  +	-window			"#ffffff"
           16  +	-activebg		"#e6e6e6"
           17  +	-troughbg		"#657a9e"
           18  +	-selectbg		"#657a9e"
           19  +	-selectfg		"#ffffff"
           20  +	-disabledfg		"#aaaaaa"
           21  +	-indicator		"#b03060"
           22  +	-altindicator		"#657a9e"
           23  +	-disabledaltindicator	"#657a9e"
    22     24       }
    23     25   
    24     26       set colors(-frame) [. cget -bg]
    25     27   
    26     28       variable hover hover
    27     29       variable dpi 120
    28     30       if {$::ttk::theme::default::sdltk} {
................................................................................
   176    178   	ttk::style element create Toolbutton.button image \
   177    179   	    [list $I(tbutton-n) selected $I(tbutton-p) \
   178    180   		 pressed $I(tbutton-p)] \
   179    181   	    -border {4 9} -padding 3 -sticky news
   180    182   
   181    183   	ttk::style element create Checkbutton.indicator image \
   182    184   	    [list $I(check-nu) {pressed selected} $I(check-pc) \
   183         -		 pressed $I(check-hc) selected $I(check-nc)] \
          185  +		 pressed $I(check-hc) \
          186  +		 {!disabled selected} $I(check-nc) \
          187  +		 {disabled !selected} $I(check-nu) \
          188  +		 {disabled selected} $I(check-pc) \
          189  +		 {!disabled alternate} $I(check-nu) \
          190  +		 {disabled alternate} $I(check-pc)] \
   184    191   	    -sticky {}
   185    192   
   186    193   	ttk::style element create Radiobutton.indicator image \
   187    194   	    [list $I(radio-nu) {pressed selected} $I(radio-pc) \
   188         -		 pressed $I(radio-hc) selected $I(radio-nc)] \
          195  +		 pressed $I(radio-hc) \
          196  +		 {!disabled selected} $I(radio-nc) \
          197  +		 {disabled !selected} $I(radio-nu) \
          198  +		 {disabled selected} $I(radio-pc) \
          199  +		 {!disabled alternate} $I(radio-nu) \
          200  +		 {disabled alternate} $I(radio-pc)] \
   189    201   	    -sticky {}
   190    202   
   191    203   	ttk::style element create Horizontal.Scrollbar.thumb \
   192    204   	    image $I(hsb-n) -border 3 -sticky ew
   193    205   	ttk::style element create Horizontal.Scrollbar.grip \
   194    206   	    image $I(hsb-g) -sticky ew
   195    207   	ttk::style element create Vertical.Scrollbar.thumb \

Changes to jni/sdl2tk/tests/filebox.test.

   459    459   		set gotmessage
   460    460   	    } \
   461    461   	    -match glob \
   462    462   	    -result "*RUBBISH*"
   463    463       }
   464    464   
   465    465       # The rest of the tests need to be executed on Unix only.
   466         -    # The test whether the dialog box widgets were implemented correctly.
          466  +    # They test whether the dialog box widgets were implemented correctly.
   467    467       # These tests are not
   468    468       # needed on the other platforms because they use native file dialogs.
   469    469   }
   470    470   
   471    471   set tk_strictMotif $tk_strictMotif_old
   472    472   
   473    473   # cleanup
   474    474   removeFile filebox.tmp
   475    475   cleanupTests
   476    476   return

Changes to jni/sdl2tk/tests/text.test.

  3824   3824       toplevel .top
  3825   3825       text .top.t -width 6 -height 10 -wrap word
  3826   3826       frame .top.f -width 200 -height 20 -relief raised -bd 2
  3827   3827       pack .top.f .top.t -side left
  3828   3828       wm geometry .top +0+0
  3829   3829       update
  3830   3830   } -body {
  3831         -    .top.t insert end "abc def\n01 2345 678 9101112\nLine 3\nLine 4\nLine 5\n6\n7\n8\n"
         3831  +    .top.t insert end "abc def\n01 2a345 678 9101112\nLine 3\nLine 4\nLine 5\n6\n7\n8\n"
  3832   3832       .top.t yview 2.4
  3833   3833       .top.t delete 2.5
  3834   3834       set x [.top.t index @0,0]
  3835   3835       .top.t delete 2.5
  3836   3836       list $x [.top.t index @0,0]
  3837   3837   } -cleanup {
  3838   3838       destroy .top

Changes to jni/sdl2tk/tests/textDisp.test.

   249    249       .t insert 1.0 "This is some sample text for testing."
   250    250       list [.t bbox 1.19] [.t bbox 1.20]
   251    251   } [list [list 138 5 7 $fixedHeight] [list 5 [expr {$fixedDiff + 18}] 7 $fixedHeight]]
   252    252   test textDisp-2.5 {LayoutDLine, word wrap} {textfonts} {
   253    253       .t configure -wrap word
   254    254       .t delete 1.0 end
   255    255       .t insert 1.0 "This isx some sample text for testing."
   256         -    list [.t bbox 1.13] [.t bbox 1.14] [.t bbox 1.19]
   257         -} [list [list 96 5 49 $fixedHeight] [list 5 [expr {$fixedDiff + 18}] 7 $fixedHeight] [list 40 [expr {$fixedDiff + 18}] 7 $fixedHeight]]
          256  +    list [.t bbox 1.13] [.t bbox 1.19] [.t bbox 1.20] [.t bbox 1.21]
          257  +} [list [list 96 5 $fixedWidth $fixedHeight] [list 138 5 $fixedWidth $fixedHeight] [list 145 5 0  $fixedHeight] [list 5 [expr {$fixedDiff + 18}] $fixedWidth $fixedHeight]]
   258    258   test textDisp-2.6 {LayoutDLine, word wrap} {
   259    259       .t configure -wrap word
   260    260       .t delete 1.0 end
   261    261       .t insert 1.0 "This isxxx some sample text for testing."
   262    262       list [.t bbox 1.15] [.t bbox 1.16]
   263    263   } [list [list 110 5 35 $fixedHeight] [list 5 [expr {$fixedDiff + 18}] 7 $fixedHeight]]
   264    264   test textDisp-2.7 {LayoutDLine, marks and tags} {textfonts} {
................................................................................
   349    349   test textDisp-2.16 {LayoutDLine, justification} {textfonts} {
   350    350       .t configure -wrap word
   351    351       .t delete 1.0 end
   352    352       .t insert 1.0 "Lots of long words, enough to force word wrap\nThen\nmore lines"
   353    353       .t tag configure x -justify center
   354    354       .t tag add x 1.1 1.20
   355    355       .t tag add x 1.21 1.end
   356         -    list [.t bbox 1.0] [.t bbox 1.20] [.t bbox 1.36] [.t bbox 2.0]
   357         -} [list [list 5 5 7 $fixedHeight] [list 5 [expr {$fixedDiff + 18}] 7 $fixedHeight] [list 43 [expr {2*$fixedDiff + 31}] 7 $fixedHeight] [list 5 [expr {3*$fixedDiff + 44}] 7 $fixedHeight]]
          356  +    list [.t bbox 1.0] [.t bbox 1.20] [.t bbox 1.41] [.t bbox 2.0]
          357  +} [list [list 5 5 7 $fixedHeight] [list 5 [expr {$fixedDiff + 18}] 7 $fixedHeight] [list 61 [expr {2*$fixedDiff + 31}] 7 $fixedHeight] [list 5 [expr {3*$fixedDiff + 44}] 7 $fixedHeight]]
   358    358   test textDisp-2.17 {LayoutDLine, justification} {textfonts} {
   359    359       .t configure -wrap word
   360    360       .t delete 1.0 end
   361         -    .t insert 1.0 "Lots of long words, enough to force word wrap\nThen\nmore lines"
          361  +    .t insert 1.0 "Lots of very long words, enough to force word wrap\nThen\nmore lines"
   362    362       .t tag configure x -justify center
   363         -    .t tag add x 1.20
   364         -    list [.t bbox 1.0] [.t bbox 1.20] [.t bbox 1.36] [.t bbox 2.0]
   365         -} [list [list 5 5 7 $fixedHeight] [list 19 [expr {$fixedDiff + 18}] 7 $fixedHeight] [list 5 [expr {2*$fixedDiff + 31}] 7 $fixedHeight] [list 5 [expr {3*$fixedDiff + 44}] 7 $fixedHeight]]
          363  +    .t tag add x 1.18
          364  +    list [.t bbox 1.0] [.t bbox 1.18] [.t bbox 1.35] [.t bbox 2.0]
          365  +} [list [list 5 5 7 $fixedHeight] [list 15 [expr {$fixedDiff + 18}] 7 $fixedHeight] [list 5 [expr {2*$fixedDiff + 31}] 7 $fixedHeight] [list 5 [expr {3*$fixedDiff + 44}] 7 $fixedHeight]]
   366    366   test textDisp-2.18 {LayoutDLine, justification} {textfonts} {
   367    367       .t configure -wrap none
   368    368       .t delete 1.0 end
   369    369       .t insert 1.0 "Lots of long words, enough to extend out of the window\n"
   370    370       .t insert end "Then\nmore lines\nThat are shorter"
   371    371       .t tag configure x -justify center
   372    372       .t tag configure y -justify right
................................................................................
  2333   2333   test textDisp-17.10 {TkTextScanCmd procedure, word wrapping} {textfonts} {
  2334   2334       .t yview 10.0
  2335   2335       .t scan mark -10 60
  2336   2336       .t scan dragto -5 65
  2337   2337       set x [.t index @0,0]
  2338   2338       .t scan dragto 0 [expr {70 + $fixedDiff}]
  2339   2339       list $x [.t index @0,0]
  2340         -} {9.15 8.31}
         2340  +} {9.0 8.0}
  2341   2341   .t configure -xscrollcommand scroll -yscrollcommand {}
  2342   2342   test textDisp-18.1 {GetXView procedure} {
  2343   2343       .t configure -wrap none
  2344   2344       .t delete 1.0 end
  2345   2345       .t insert end xxxxxxxxx\n
  2346   2346       .t insert end xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\n
  2347   2347       .t insert end xxxxxxxxxxxxxxxxxxxxxxxxxx
................................................................................
  2559   2559       .t configure -wrap word
  2560   2560       .t delete 1.0 end
  2561   2561       .t insert 1.0 "Line 1"
  2562   2562       foreach i {2 3 4 5 6 7 8 9 10 11 12 13 14 15} {
  2563   2563   	.t insert end "\nLine $i"
  2564   2564       }
  2565   2565       .t insert end "\nThis last line wraps around four "
  2566         -    .t insert end "times with a bit left on the last line."
         2566  +    .t insert end "times with a little bit left on the last line."
  2567   2567       .t yview insert
  2568   2568       update
  2569   2569       .t count -update -ypixels 1.0 end
  2570   2570       set scrollInfo
  2571   2571   } {0.5 1.0}
  2572   2572   test textDisp-19.11 {GetYView procedure} {
  2573   2573       .t configure -wrap word
  2574   2574       .t delete 1.0 end
  2575   2575       .t insert 1.0 "Line 1"
  2576   2576       foreach i {2 3 4 5 6 7 8 9 10 11 12 13 14 15} {
  2577   2577   	.t insert end "\nLine $i"
  2578   2578       }
  2579   2579       .t insert end "\nThis last line wraps around four "
  2580         -    .t insert end "times with a bit left on the last line."
         2580  +    .t insert end "times with a little bit left on the last line."
  2581   2581       .t yview insert
  2582   2582       update
  2583   2583       .t count -update -ypixels 1.0 end
  2584   2584       set scrollInfo
  2585   2585   } {0.5 1.0}
  2586   2586   test textDisp-19.11.2 {TextWidgetCmd procedure, "count -displaylines"} {
  2587   2587       .t count -displaylines 1.0 end
................................................................................
  2595   2595   test textDisp-19.11.5 {TextWidgetCmd procedure, "count -displaylines"} {
  2596   2596       .t count -displaylines 16.0 16.1
  2597   2597   } {0}
  2598   2598   test textDisp-19.11.5.1 {TextWidgetCmd procedure, "count -displaylines"} {
  2599   2599       .t count -displaylines 16.0 16.5
  2600   2600   } {0}
  2601   2601   test textDisp-19.11.6 {TextWidgetCmd procedure, "count -displaylines"} {
  2602         -    .t count -displaylines 16.0 16.20
         2602  +    .t count -displaylines 16.0 16.24
  2603   2603   } {1}
  2604   2604   test textDisp-19.11.7 {TextWidgetCmd procedure, "count -displaylines"} {
  2605   2605       .t count -displaylines 16.0 16.40
  2606   2606   } {2}
  2607   2607   test textDisp-19.11.8 {TextWidgetCmd procedure, "count -displaylines"} {
  2608   2608       .t count -displaylines "16.0 displaylineend +1c" "16.0 lineend"
  2609   2609   } {3}
................................................................................
  2648   2648   test textDisp-19.11.17 {TextWidgetCmd procedure, "index +displaylines"} {
  2649   2649       .t tag remove elide 1.0 end
  2650   2650       .t tag add elide "12.0" "14.0"
  2651   2651       list [.t index "11.5 +2d lines"] \
  2652   2652         [.t index "12.0 +2d lines"] [.t index "11.0 +2d lines"] \
  2653   2653         [.t index "13.0 +2d lines"] [.t index "13.1 +3d lines"] \
  2654   2654         [.t index "13.0 +4d lines"]
  2655         -} {15.5 16.0 15.0 16.0 16.15 16.33}
         2655  +} {15.5 16.0 15.0 16.0 16.21 16.39}
  2656   2656   test textDisp-19.11.18 {TextWidgetCmd procedure, "index +displaylines"} {
  2657   2657       .t tag remove elide 1.0 end
  2658   2658       .t tag add elide "12.0" "14.0"
  2659   2659       list [.t index "15.5 -2d lines"] \
  2660   2660         [.t index "16.0 -2d lines"] [.t index "15.0 -2d lines"] \
  2661         -      [.t index "16.0 -3d lines"] [.t index "16.17 -4d lines"] \
  2662         -      [.t index "16.36 -5d lines"]
         2661  +      [.t index "16.0 -3d lines"] [.t index "16.23 -4d lines"] \
         2662  +      [.t index "16.42 -5d lines"]
  2663   2663   } {11.5 14.0 11.0 11.0 11.2 11.3}
  2664   2664   test textDisp-19.11.19 {TextWidgetCmd procedure, "count -displaylines"} {
  2665   2665       .t tag remove elide 1.0 end
  2666   2666       .t tag add elide "12.0" "16.0 +1displaylines"
  2667   2667       .t count -displaylines 12.0 17.0
  2668   2668   } {4}
  2669   2669   test textDisp-19.11.20 {TextWidgetCmd procedure, "index +displaylines"} {
  2670   2670       .t tag remove elide 1.0 end
  2671   2671       .t tag add elide "12.0" "16.0 +1displaylines"
  2672   2672       list [.t index "11.5 +2d lines"] \
  2673   2673         [.t index "12.0 +2d lines"] [.t index "11.0 +2d lines"] \
  2674   2674         [.t index "13.0 +2d lines"] [.t index "13.0 +3d lines"] \
  2675   2675         [.t index "13.0 +4d lines"]
  2676         -} {16.38 16.50 16.33 16.50 16.67 17.0}
         2676  +} {16.44 16.57 16.39 16.57 16.74 17.0}
  2677   2677   test textDisp-19.11.21 {TextWidgetCmd procedure, "index +displaylines"} {
  2678   2678       .t tag remove elide 1.0 end
  2679   2679       .t tag add elide "12.0" "16.0 +1displaylines"
  2680         -    list [.t index "16.38 -2d lines"] \
  2681         -      [.t index "16.50 -3d lines"] [.t index "16.33 -2d lines"] \
  2682         -      [.t index "16.53 -4d lines"] [.t index "16.69 -4d lines"] \
  2683         -      [.t index "17.1 -5d lines"]
         2680  +    list [.t index "16.44 -2d lines"] \
         2681  +      [.t index "16.57 -3d lines"] [.t index "16.39 -2d lines"] \
         2682  +      [.t index "16.60 -4d lines"] [.t index "16.76 -4d lines"] \
         2683  +      [.t index "17.0 -5d lines"]
  2684   2684   } {11.5 11.0 11.0 10.3 11.2 11.0}
  2685   2685   test textDisp-19.11.22 {TextWidgetCmd procedure, "index +displaylines"} {
  2686   2686       .t tag remove elide 1.0 end
  2687   2687       list [.t index "end +5d lines"] \
  2688   2688         [.t index "end -3d lines"] [.t index "1.0 -2d lines"] \
  2689   2689         [.t index "1.0 +4d lines"] [.t index "1.0 +50d lines"] \
  2690   2690         [.t index "end -50d lines"]
  2691         -} {17.0 16.33 1.0 5.0 17.0 1.0}
         2691  +} {17.0 16.39 1.0 5.0 17.0 1.0}
  2692   2692   test textDisp-19.11.23 {TextWidgetCmd procedure, "index +displaylines"} {
  2693   2693       .t tag remove elide 1.0 end
  2694   2694       .t tag add elide "12.3" "16.0 +1displaylines"
  2695   2695       list [.t index "11.5 +1d lines"] [.t index "11.5 +2d lines"] \
  2696   2696         [.t index "12.0 +1d lines"] \
  2697   2697         [.t index "12.0 +2d lines"] [.t index "11.0 +2d lines"] \
  2698   2698         [.t index "13.0 +2d lines"] [.t index "13.0 +3d lines"] \
  2699   2699         [.t index "13.0 +4d lines"]
  2700         -} {16.17 16.33 16.28 16.46 16.28 16.49 16.65 16.72}
         2700  +} {16.23 16.44 16.39 16.57 16.39 16.60 16.77 16.79}
  2701   2701   .t tag remove elide 1.0 end
  2702   2702   test textDisp-19.11.24 {TextWidgetCmd procedure, "index +/-displaylines"} {
  2703   2703       list [.t index "11.5 + -1 display lines"] \
  2704   2704         [.t index "11.5 + +1 disp lines"] \
  2705   2705         [.t index "11.5 - -1 disp lines"] \
  2706   2706         [.t index "11.5 - +1 disp lines"] \
  2707   2707         [.t index "11.5 -1 disp lines"] \
................................................................................
  2742   2742       .t configure -wrap word
  2743   2743       .t delete 1.0 end
  2744   2744       .t insert 1.0 "Line 1"
  2745   2745       foreach i {2 3 4 5 6 7 8 9 10 11 12 13 14 15} {
  2746   2746   	.t insert end "\nLine $i"
  2747   2747       }
  2748   2748       .t insert end "\nThis last line wraps around four "
  2749         -    .t insert end "times with a bit left on the last line."
         2749  +    .t insert end "times with a little bit left on the last line."
  2750   2750       # Need to update so everything is calculated.
  2751   2751       update ; .t count -update -ypixels 1.0 end
  2752   2752       update ; after 10 ; update
  2753   2753       set scrollInfo "unchanged"
  2754   2754       .t mark set insert 3.0
  2755   2755       .t tag configure x -background red
  2756   2756       .t tag add x 1.0 5.0
................................................................................
  2762   2762       .t configure -wrap word
  2763   2763       .t delete 1.0 end
  2764   2764       .t insert 1.0 "Line 1"
  2765   2765       foreach i {2 3 4 5 6 7 8 9 10 11 12 13 14 15} {
  2766   2766   	.t insert end "\nLine $i"
  2767   2767       }
  2768   2768       .t insert end "\nThis last line wraps around four "
  2769         -    .t insert end "times with a bit left on the last line."
         2769  +    .t insert end "times with a bit little left on the last line."
  2770   2770       update
  2771   2771       .t configure -yscrollcommand scrollError
  2772   2772       proc bgerror args {
  2773   2773   	global x errorInfo errorCode
  2774   2774   	set x [list $args $errorInfo $errorCode]
  2775   2775       }
  2776   2776       .t delete 1.0 end
................................................................................
  2790   2790       .t configure -wrap word
  2791   2791       .t delete 1.0 end
  2792   2792       .t insert 1.0 "Line 1"
  2793   2793       foreach i {2 3 4 5 6 7 8 9 10 11 12 13 14 15} {
  2794   2794   	.t insert end "\nLine $i"
  2795   2795       }
  2796   2796       .t insert end "\nThis last line wraps around four "
  2797         -    .t insert end "times with a bit left on the last line."
         2797  +    .t insert end "times with a little bit left on the last line."
  2798   2798       # Need to update so everything is calculated.
  2799   2799       update ; .t count -update -ypixels 1.0 end ; update
  2800   2800       set res {}
  2801   2801       lappend res \
  2802   2802         [.t count -ypixels 1.0 end] \
  2803   2803         [.t count -update -ypixels 1.0 end] \
  2804   2804         [.t count -ypixels 15.0 16.0] \
................................................................................
  2875   2875       .t yview 48.0
  2876   2876       list [.t dlineinfo 46.0] [.t dlineinfo 47.0] [.t dlineinfo 49.0] \
  2877   2877   	    [.t dlineinfo 58.0]
  2878   2878   } [list {} {} [list 3 [expr {$fixedDiff + 16}] 49 [expr {$fixedDiff + 13}] [expr {$fixedDiff + 10}]] {}]
  2879   2879   test textDisp-20.2 {FindDLine} {textfonts} {
  2880   2880       .t yview 100.0
  2881   2881       .t yview -pickplace 53.0
  2882         -    list [.t dlineinfo 50.0] [.t dlineinfo 50.14] [.t dlineinfo 50.15]
  2883         -} [list [list 3 [expr {-1 - $fixedDiff/2}] 105 [expr {$fixedDiff + 13}] [expr {$fixedDiff + 10}]] [list 3 [expr {-1 - $fixedDiff/2}] 105 [expr {$fixedDiff + 13}] [expr {$fixedDiff + 10}]] [list 3 [expr {12 + $fixedDiff/2}] 140 [expr {$fixedDiff + 13}] [expr {$fixedDiff + 10}]]]
         2882  +    list [.t dlineinfo 50.0] [.t dlineinfo 50.14] [.t dlineinfo 50.21]
         2883  +} [list [list 3 [expr {-1 - $fixedDiff/2}] 140 [expr {$fixedDiff + 13}] [expr {$fixedDiff + 10}]] [list 3 [expr {-1 - $fixedDiff/2}] 140 [expr {$fixedDiff + 13}] [expr {$fixedDiff + 10}]] [list 3 [expr {12 + $fixedDiff/2}] 133 [expr {$fixedDiff + 13}] [expr {$fixedDiff + 10}]]]
  2884   2884   test textDisp-20.3 {FindDLine} {textfonts} {
  2885   2885       .t yview 100.0
  2886   2886       .t yview 49.0
  2887         -    list [.t dlineinfo 50.0] [.t dlineinfo 50.20] [.t dlineinfo 57.0]
  2888         -} [list [list 3 [expr {$fixedDiff + 16}] 105 [expr {$fixedDiff + 13}] [expr {$fixedDiff + 10}]] [list 3 [expr {2*$fixedDiff + 29}] 140 [expr {$fixedDiff + 13}] [expr {$fixedDiff + 10}]] {}]
         2887  +    list [.t dlineinfo 50.0] [.t dlineinfo 50.24] [.t dlineinfo 57.0]
         2888  +} [list [list 3 [expr {$fixedDiff + 16}] 140 [expr {$fixedDiff + 13}] [expr {$fixedDiff + 10}]] [list 3 [expr {2*$fixedDiff + 29}] 133 [expr {$fixedDiff + 13}] [expr {$fixedDiff + 10}]] {}]
  2889   2889   test textDisp-20.4 {FindDLine} {textfonts} {
  2890   2890       .t yview 100.0
  2891   2891       .t yview 42.0
  2892         -    list [.t dlineinfo 50.0] [.t dlineinfo 50.20] [.t dlineinfo 50.40]
  2893         -} [list [list 3 [expr {8*$fixedDiff + 107}] 105 [expr {$fixedDiff + 13}] [expr {$fixedDiff + 10}]] [list 3 [expr {9*$fixedDiff + 120}] 140 [expr {$fixedDiff + 13}] [expr {$fixedDiff + 10}]] {}]
         2892  +    list [.t dlineinfo 50.0] [.t dlineinfo 50.24] [.t dlineinfo 50.40]
         2893  +} [list [list 3 [expr {8*$fixedDiff + 107}] 140 [expr {$fixedDiff + 13}] [expr {$fixedDiff + 10}]] [list 3 [expr {9*$fixedDiff + 120}] 133 [expr {$fixedDiff + 13}] [expr {$fixedDiff + 10}]] {}]
  2894   2894   .t config -wrap none
  2895   2895   test textDisp-20.5 {FindDLine} {textfonts} {
  2896   2896       .t yview 100.0
  2897   2897       .t yview 48.0
  2898   2898       list [.t dlineinfo 50.0] [.t dlineinfo 50.20] [.t dlineinfo 50.40]
  2899   2899   } [list [list 3 [expr {3+2*$fixedHeight}] 371 [expr {$fixedDiff + 13}] [expr {$fixedDiff + 10}]] [list 3 [expr {3+2*$fixedHeight}] 371 [expr {$fixedDiff + 13}] [expr {$fixedDiff + 10}]] [list 3 [expr {3+2*$fixedHeight}] 371 [expr {$fixedDiff + 13}] [expr {$fixedDiff + 10}]]]
  2900   2900   
  2901   2901   .t config -wrap word
  2902   2902   test textDisp-21.1 {TkTextPixelIndex} {textfonts} {
  2903   2903       .t yview 48.0
  2904   2904       list [.t index @-10,-10] [.t index @6,6] [.t index @22,6] \
  2905   2905   	    [.t index @102,6] [.t index @38,[expr {$fixedHeight * 4 + 3}]] [.t index @44,67]
  2906         -} {48.0 48.0 48.2 48.7 50.40 50.40}
         2906  +} {48.0 48.0 48.2 48.7 50.45 50.45}
  2907   2907   .t insert end \n
  2908   2908   test textDisp-21.2 {TkTextPixelIndex} {textfonts} {
  2909   2909       .t yview 195.0
  2910   2910       list [.t index @11,[expr {$fixedHeight * 5 + 5}]] [.t index @11,[expr {$fixedHeight * 6 + 5}]] [.t index @11,[expr {$fixedHeight * 7 + 5}]] \
  2911   2911   	    [.t index @11,1002]
  2912   2912   } {197.1 198.1 199.1 201.0}
  2913   2913   test textDisp-21.3 {TkTextPixelIndex, horizontal scrolling} {textfonts} {
................................................................................
  2955   2955   update
  2956   2956   .t tag add x 50.1
  2957   2957   test textDisp-22.1 {TkTextCharBbox} {textfonts} {
  2958   2958       .t config -wrap word
  2959   2959       .t yview 48.0
  2960   2960       list [.t bbox 47.2] [.t bbox 48.0] [.t bbox 50.5] [.t bbox 50.40] \
  2961   2961   	    [.t bbox 58.0]
  2962         -} [list {} [list 3 3 7 $fixedHeight] [list 38 [expr {3+2*$fixedHeight}] 7 $fixedHeight] [list 38 [expr {3+4*$fixedHeight}] 7 $fixedHeight] {}]
         2962  +} [list {} [list 3 3 7 $fixedHeight] [list 38 [expr {3+2*$fixedHeight}] 7 $fixedHeight] [list 3 [expr {3+4*$fixedHeight}] 7 $fixedHeight] {}]
  2963   2963   test textDisp-22.2 {TkTextCharBbox} {textfonts} {
  2964   2964       .t config -wrap none
  2965   2965       .t yview 48.0
  2966   2966       list [.t bbox 50.5] [.t bbox 50.40] [.t bbox 57.0]
  2967   2967   } [list [list 38 [expr {3+2*$fixedHeight}] 7 $fixedHeight] {} [list 3 [expr {3+9*$fixedHeight}] 7 $fixedHeight]]
  2968   2968   test textDisp-22.3 {TkTextCharBbox, cut-off lines} {textfonts} {
  2969   2969       .t config -wrap char
................................................................................
  3079   3079   .t insert 50.0 "This is a long line, one that will wrap around twice.\n"
  3080   3080   update
  3081   3081   test textDisp-23.1 {TkTextDLineInfo} {textfonts} {
  3082   3082       .t config -wrap word
  3083   3083       .t yview 48.0
  3084   3084       list [.t dlineinfo 47.3] [.t dlineinfo 48.0] [.t dlineinfo 50.40] \
  3085   3085   	    [.t dlineinfo 56.0]
  3086         -} [list {} [list 3 3 49 [expr {$fixedDiff + 13}] [expr {$fixedDiff + 10}]] [list 3 [expr {4*$fixedDiff + 55}] 126 [expr {$fixedDiff + 13}] [expr {$fixedDiff + 10}]] {}]
         3086  +} [list {} [list 3 3 49 [expr {$fixedDiff + 13}] [expr {$fixedDiff + 10}]] [list 3 [expr {4*$fixedDiff + 55}] 91 [expr {$fixedDiff + 13}] [expr {$fixedDiff + 10}]] {}]
  3087   3087   test textDisp-23.2 {TkTextDLineInfo} {textfonts} {
  3088   3088       .t config -bd 4 -wrap word
  3089   3089       update
  3090   3090       .t yview 48.0
  3091   3091       .t dlineinfo 50.40
  3092         -} [list 7 [expr {4*$fixedDiff + 59}] 126 [expr {$fixedDiff + 13}] [expr {$fixedDiff + 10}]]
         3092  +} [list 7 [expr {4*$fixedDiff + 59}] 91 [expr {$fixedDiff + 13}] [expr {$fixedDiff + 10}]]
  3093   3093   .t config -bd 0
  3094   3094   test textDisp-23.3 {TkTextDLineInfo} {textfonts} {
  3095   3095       .t config -wrap none
  3096   3096       update
  3097   3097       .t yview 48.0
  3098   3098       list [.t dlineinfo 50.40] [.t dlineinfo 57.3]
  3099   3099   } [list [list 3 [expr {2*$fixedDiff + 29}] 371 [expr {$fixedDiff + 13}] [expr {$fixedDiff + 10}]] [list 3 [expr {9*$fixedDiff + 120}] 49 [expr {$fixedDiff + 13}] [expr {$fixedDiff + 10}]]]
................................................................................
  3280   3280       wm geom . {}
  3281   3281       update
  3282   3282       list [.t bbox 1.19] [.t bbox 1.20]
  3283   3283   } [list [list 136 3 7 $fixedHeight] [list 3 [expr {$fixedDiff + 16}] 7 $fixedHeight]]
  3284   3284   test textDisp-24.18 {TkTextCharLayoutProc, -wrap word} {textfonts} {
  3285   3285       .t configure -wrap word
  3286   3286       .t delete 1.0 end
  3287         -    .t insert 1.0 "xThis is a line that wraps around"
         3287  +    .t insert 1.0 "xxThis is a line that wraps around"
  3288   3288       wm geom . {}
  3289   3289       update
  3290         -    list [.t bbox 1.14] [.t bbox 1.15] [.t bbox 1.16]
  3291         -} [list [list 101 3 7 $fixedHeight] [list 108 3 35 $fixedHeight] [list 3 [expr {$fixedDiff + 16}] 7 $fixedHeight]]
         3290  +    list [.t bbox 1.15] [.t bbox 1.16] [.t bbox 1.17]
         3291  +} [list [list 108 3 7 $fixedHeight] [list 115 3 28 $fixedHeight] [list 3 [expr {$fixedDiff + 16}] 7 $fixedHeight]]
  3292   3292   test textDisp-24.19 {TkTextCharLayoutProc, -wrap word} {textfonts} {
  3293   3293       .t configure -wrap word
  3294   3294       .t delete 1.0 end
  3295   3295       .t insert 1.0 "xxThis is a line that wraps around"
  3296   3296       wm geom . {}
  3297   3297       update
  3298   3298       list [.t bbox 1.14] [.t bbox 1.15] [.t bbox 1.16]

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


Changes to jni/sdl2tk/win/ttkWinXPTheme.c.

   204    204   };
   205    205   
   206    206   /*
   207    207    * Radiobuttons:
   208    208    */
   209    209   static Ttk_StateTable radiobutton_statemap[] =
   210    210   {
          211  +{RBS_UNCHECKEDDISABLED,	TTK_STATE_ALTERNATE|TTK_STATE_DISABLED, 0},
          212  +{RBS_UNCHECKEDNORMAL,	TTK_STATE_ALTERNATE, 0},
   211    213   {RBS_CHECKEDDISABLED,	TTK_STATE_SELECTED|TTK_STATE_DISABLED, 0},
   212    214   {RBS_CHECKEDPRESSED,	TTK_STATE_SELECTED|TTK_STATE_PRESSED, 0},
   213    215   {RBS_CHECKEDHOT,	TTK_STATE_SELECTED|TTK_STATE_ACTIVE, 0},
   214    216   {RBS_CHECKEDNORMAL,	TTK_STATE_SELECTED, 0},
   215    217   {RBS_UNCHECKEDDISABLED,	TTK_STATE_DISABLED, 0},
   216    218   {RBS_UNCHECKEDPRESSED,	TTK_STATE_PRESSED, 0},
   217    219   {RBS_UNCHECKEDHOT,	TTK_STATE_ACTIVE, 0},