diff options
| author | dgp <dgp@users.sourceforge.net> | 2007-12-06 07:00:04 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2007-12-06 07:00:04 (GMT) |
| commit | b5a2f8be5cb88b24bf02d78ccfb64a452760250b (patch) | |
| tree | 16f42102ad14d33e65af61653e8a6e49c69d6404 | |
| parent | 052769d3429842c878d3f69a27ab2075e1cb44b8 (diff) | |
| download | tk-b5a2f8be5cb88b24bf02d78ccfb64a452760250b.zip tk-b5a2f8be5cb88b24bf02d78ccfb64a452760250b.tar.gz tk-b5a2f8be5cb88b24bf02d78ccfb64a452760250b.tar.bz2 | |
merge updates from HEAD
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | library/demos/widget | 4 |
2 files changed, 5 insertions, 2 deletions
@@ -1,5 +1,8 @@ 2007-12-05 Jeff Hobbs <jeffh@ActiveState.com> + * library/demos/widget: reduce start size to 70% of screenheight + from sh-200 for a more reasonable size. + * win/tkWinButton.c, win/tkWinDialog.c: use SetWindowLongPtr and * win/tkWinScrlbr.c, win/tkWinWm.c: GetWindowLongPtr only. * win/ttkWinMonitor.c: diff --git a/library/demos/widget b/library/demos/widget index e64b061..268c56c 100644 --- a/library/demos/widget +++ b/library/demos/widget @@ -10,7 +10,7 @@ exec wish "$0" "$@" # separate ".tcl" files is this directory, which are sourced by this script as # needed. # -# RCS: @(#) $Id: widget,v 1.29.2.7 2007/11/05 14:24:18 dgp Exp $ +# RCS: @(#) $Id: widget,v 1.29.2.8 2007/12/06 07:00:05 dgp Exp $ package require Tcl 8.5 package require Tk 8.5 @@ -142,7 +142,7 @@ pack .statusBar -side bottom -fill x -pady 2 set textheight 30 catch { set textheight [expr { - ([winfo screenheight .] - 200) / + ([winfo screenheight .] * 0.7) / [font metrics mainFont -displayof . -linespace] }] } |