Changeset 90683 in webkit
- Timestamp:
- Jul 9, 2011 12:29:47 PM (13 years ago)
- Location:
- trunk/Source/WebKit/wx
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit/wx/ChangeLog
r90509 r90683 1 2011-07-08 Robin Dunn <robin@alldunn.com> 2 3 Reviewed by Kevin Ollivier. 4 5 Make sure wxPrintData grabs the default print settings to calculate page width, 6 and readjusts settings after the print dialog is displayed. 7 8 https://bugs.webkit.org/show_bug.cgi?id=64232 9 10 * WebFrame.cpp: 11 (wxWebFramePrintout::InitializeWithPageSize): 12 (wxWebFramePrintout::OnBeginPrinting): 13 (wxWebFrame::Print): 14 1 15 2011-07-06 Kevin Ollivier <kevino@theolliviers.com> 2 16 -
trunk/Source/WebKit/wx/WebFrame.cpp
r89284 r90683 118 118 pageRect.width = pageRect.width * mmToPixelsX; 119 119 pageRect.height = pageRect.height * mmToPixelsY; 120 120 121 121 m_pageWidth = pageRect.width; 122 122 m_printContext.begin(m_pageWidth); … … 130 130 wxPrinterDC* pdc = dynamic_cast<wxPrinterDC*>(GetDC()); 131 131 pdc->SetMapMode(wxMM_POINTS); 132 int pageWidth = 0; 133 int pageHeight = 0; 134 GetPageSizeMM(&pageWidth, &pageHeight); 135 136 InitializeWithPageSize(wxRect(0, 0, pageWidth, pageHeight)); 132 137 } 133 138 … … 580 585 wxPrintDialogData printdata; 581 586 printdata.GetPrintData().SetPrintMode(wxPRINT_MODE_PRINTER); 582 printdata.GetPrintData().SetPaperId(wxPAPER_LETTER);583 587 printdata.GetPrintData().SetNoCopies(1); 584 588 printdata.GetPrintData().ConvertFromNative(); 589 585 590 wxPageSetupDialogData pageSetup(printdata.GetPrintData()); 586 591 … … 599 604 printdata.SetToPage(printout->GetPageCount()); 600 605 601 wxPrintDialogData data(printdata);602 603 606 if (showDialog) { 604 wxPrintDialog dialog(0, & data);607 wxPrintDialog dialog(0, &printdata); 605 608 if (dialog.ShowModal() == wxID_OK) { 606 data = dialog.GetPrintDialogData();607 printout->SetFirstPage( data.GetFromPage());608 printout->SetLastPage( data.GetToPage());609 wxPrintDialogData updatedPrintdata = dialog.GetPrintDialogData(); 610 printout->SetFirstPage(updatedPrintdata.GetFromPage()); 611 printout->SetLastPage(updatedPrintdata.GetToPage()); 609 612 } else 610 613 return; 611 614 } 612 615 613 wxPrinter printer(& data);616 wxPrinter printer(&printdata); 614 617 615 618 printer.Print(0, printout, false);
Note: See TracChangeset
for help on using the changeset viewer.