diff options
| author | culler <culler> | 2017-11-18 15:02:16 (GMT) |
|---|---|---|
| committer | culler <culler> | 2017-11-18 15:02:16 (GMT) |
| commit | 3bf68add2afec0323e278d4747d618a48fb1a855 (patch) | |
| tree | 7a2b678a10e33c0cad35524c137833a6d0e30697 /library | |
| parent | c955963ff1d1a260591dc59522ff5711326b6996 (diff) | |
| parent | 453c86e0e9f9fce7d9d0149e09f2b1bb2040a846 (diff) | |
| download | tk-3bf68add2afec0323e278d4747d618a48fb1a855.zip tk-3bf68add2afec0323e278d4747d618a48fb1a855.tar.gz tk-3bf68add2afec0323e278d4747d618a48fb1a855.tar.bz2 | |
Merge core-8-6-branch into trunk. Includes fix for [b24a7a877d].
Diffstat (limited to 'library')
| -rw-r--r-- | library/demos/images/earthmenu.png | bin | 0 -> 8157 bytes | |||
| -rw-r--r-- | library/demos/menu.tcl | 6 |
2 files changed, 4 insertions, 2 deletions
diff --git a/library/demos/images/earthmenu.png b/library/demos/images/earthmenu.png Binary files differnew file mode 100644 index 0000000..c25b667 --- /dev/null +++ b/library/demos/images/earthmenu.png diff --git a/library/demos/menu.tcl b/library/demos/menu.tcl index e32b54f..557bf45 100644 --- a/library/demos/menu.tcl +++ b/library/demos/menu.tcl @@ -114,10 +114,12 @@ set m $w.menu.icon $w.menu add cascade -label "Icons" -menu $m -underline 0 menu $m -tearoff 0 # Main widget program sets variable tk_demoDirectory -$m add command -bitmap @[file join $tk_demoDirectory images pattern.xbm] \ +image create photo lilearth -file [file join $tk_demoDirectory \ +images earthmenu.png] +$m add command -image lilearth \ -hidemargin 1 -command [list \ tk_dialog $w.pattern {Bitmap Menu Entry} \ - "The menu entry you invoked displays a bitmap rather than\ + "The menu entry you invoked displays a photoimage rather than\ a text string. Other than this, it is just like any other\ menu entry." {} 0 OK ] foreach i {info questhead error} { |
