diff options
| -rw-r--r-- | library/print.tcl | 6 | ||||
| -rw-r--r-- | win/tkWinPrint.c | 10 |
2 files changed, 5 insertions, 11 deletions
diff --git a/library/print.tcl b/library/print.tcl index c6fb1d8..0cd4c12 100644 --- a/library/print.tcl +++ b/library/print.tcl @@ -46,11 +46,11 @@ namespace eval ::tk::print { } #Next, set values. - set printargs(hDC) ::tk::print::_gethdc + set printargs(hDC) [::tk::print::_gethdc] set printargs(pw) $::tk::print::paper_width set printargs(pl) $::tk::print::paper_height - set printargs(lm) 100 ;#$::tk::print::margin_left - set printargs(tm) 100 ;#$::tk::print::margin_top + set printargs(lm) 100 + set printargs(tm) 100 set printargs(rm) [expr $printargs(pw) - $printargs(lm)] set printargs(bm) [expr $printargs(pl) - $printargs(tm)] set printargs(resx) $::tk::print::dpi_x diff --git a/win/tkWinPrint.c b/win/tkWinPrint.c index f698bb7..2157287 100644 --- a/win/tkWinPrint.c +++ b/win/tkWinPrint.c @@ -27,7 +27,7 @@ /* Initialize variables for later use. */ static PRINTDLG pd; static DOCINFO di; -int copies, paper_width, paper_height, dpi_x, dpi_y, margin_left, margin_top; +int copies, paper_width, paper_height, dpi_x, dpi_y; char *localPrinterName; PDEVMODE returnedDevmode; PDEVMODE localDevmode; @@ -75,8 +75,6 @@ static int PrintSelectPrinter(ClientData clientData, Tcl_Interp *interp, int arg paper_height = 0; dpi_x = 0; dpi_y = 0; - margin_left = 0; - margin_top = 0; /* Set up print dialog and initalize property structure. */ @@ -117,8 +115,6 @@ static int PrintSelectPrinter(ClientData clientData, Tcl_Interp *interp, int arg paper_height = (int) localDevmode->dmPaperLength; paper_width = (int) localDevmode->dmPaperWidth; copies = pd.nCopies; - margin_left = GetDeviceCaps(hDC, PHYSICALOFFSETX); - margin_top = GetDeviceCaps(hDC, PHYSICALOFFSETY); } else { @@ -146,9 +142,7 @@ static int PrintSelectPrinter(ClientData clientData, Tcl_Interp *interp, int arg Tcl_LinkVar(interp, "::tk::print::dpi_y", (char *)&dpi_y, TCL_LINK_INT | TCL_LINK_READ_ONLY); Tcl_LinkVar(interp, "::tk::print::paper_width", (char *)&paper_width, TCL_LINK_INT | TCL_LINK_READ_ONLY); Tcl_LinkVar(interp, "::tk::print::paper_height", (char *)&paper_height, TCL_LINK_INT | TCL_LINK_READ_ONLY); - Tcl_LinkVar(interp, "::tk::print::margin_left", (char *)&margin_left, TCL_LINK_INT | TCL_LINK_READ_ONLY); - Tcl_LinkVar(interp, "::tk::print::margin_top", (char *)&margin_top, TCL_LINK_INT | TCL_LINK_READ_ONLY); - + return TCL_OK; } |