diff options
Diffstat (limited to 'library')
| -rw-r--r-- | library/fontchooser.tcl | 2 | ||||
| -rw-r--r-- | library/print.tcl | 30 |
2 files changed, 16 insertions, 16 deletions
diff --git a/library/fontchooser.tcl b/library/fontchooser.tcl index c53d1d6..8fcf0e0 100644 --- a/library/fontchooser.tcl +++ b/library/fontchooser.tcl @@ -172,7 +172,7 @@ proc ::tk::fontchooser::Create {} { if {![winfo exists $S(W)]} { toplevel $S(W) -class TkFontDialog if {[package provide tcltest] ne {}} { - set ::tk_dialog $S(W) + set ::tk::test::dialog::testDialog $S(W) } wm withdraw $S(W) wm title $S(W) $S(-title) diff --git a/library/print.tcl b/library/print.tcl index 76cf16f..504b975 100644 --- a/library/print.tcl +++ b/library/print.tcl @@ -76,19 +76,19 @@ namespace eval ::tk::print { #Next, set values. Some are taken from the printer, #some are sane defaults. - if {[info exists printer_name] && $printer_name ne ""} { - set printargs(hDC) $printer_name - set printargs(pw) $paper_width - set printargs(pl) $paper_height - set printargs(lm) 1000 - set printargs(tm) 1000 - set printargs(rm) 1000 - set printargs(bm) 1000 - set printargs(resx) $dpi_x - set printargs(resy) $dpi_y - set printargs(copies) $copies - set printargs(resolution) [list $dpi_x $dpi_y] - } + if {[info exists printer_name] && $printer_name ne ""} { + set printargs(hDC) $printer_name + set printargs(pw) $paper_width + set printargs(pl) $paper_height + set printargs(lm) 1000 + set printargs(tm) 1000 + set printargs(rm) 1000 + set printargs(bm) 1000 + set printargs(resx) $dpi_x + set printargs(resy) $dpi_y + set printargs(copies) $copies + set printargs(resolution) [list $dpi_x $dpi_y] + } } # _print_data @@ -279,8 +279,8 @@ namespace eval ::tk::print { set sc [$wid cget -scrollregion] # if there is no scrollregion, use width and height. if {$sc eq ""} { - set window_x [$wid cget -width] - set window_y [$wid cget -height] + set window_x [winfo pixels $wid [$wid cget -width]] + set window_y [winfo pixels $wid [$wid cget -height]] } else { set window_x [lindex $sc 2] set window_y [lindex $sc 3] |