Changeset 90683 in webkit

Timestamp:

Jul 9, 2011 12:29:47 PM (13 years ago)

Author:

kevino@webkit.org

Message:

Reviewed by Kevin Ollivier.

Make sure wxPrintData grabs the default print settings to calculate page width,
and readjusts settings after the print dialog is displayed.

​https://bugs.webkit.org/show_bug.cgi?id=64232

Location:

trunk/Source/WebKit/wx

Files:

• ChangeLog (modified) (1 diff)
• WebFrame.cpp (modified) (4 diffs)

trunk/Source/WebKit/wx/ChangeLog

@@ +1 @@
+2011-07-08  Robin Dunn  <robin@alldunn.com>
+
+        Reviewed by Kevin Ollivier.
+
+        Make sure wxPrintData grabs the default print settings to calculate page width, 
+        and readjusts settings after the print dialog is displayed.
+        
+        https://bugs.webkit.org/show_bug.cgi?id=64232
+
+        * WebFrame.cpp:
+        (wxWebFramePrintout::InitializeWithPageSize):
+        (wxWebFramePrintout::OnBeginPrinting):
+        (wxWebFrame::Print):
+
 2011-07-06  Kevin Ollivier  <kevino@theolliviers.com>
 

trunk/Source/WebKit/wx/WebFrame.cpp

@@ -118 +118 @@
         pageRect.width = pageRect.width * mmToPixelsX;
         pageRect.height = pageRect.height * mmToPixelsY;
-
+        
         m_pageWidth = pageRect.width;
         m_printContext.begin(m_pageWidth);
@@ -130 +130 @@
         wxPrinterDC* pdc = dynamic_cast<wxPrinterDC*>(GetDC());
         pdc->SetMapMode(wxMM_POINTS);
+        int pageWidth = 0;
+        int pageHeight = 0;
+        GetPageSizeMM(&pageWidth, &pageHeight);
+        
+        InitializeWithPageSize(wxRect(0, 0, pageWidth, pageHeight));
     }
     
@@ -580 +585 @@
     wxPrintDialogData printdata;
     printdata.GetPrintData().SetPrintMode(wxPRINT_MODE_PRINTER);
-    printdata.GetPrintData().SetPaperId(wxPAPER_LETTER);
     printdata.GetPrintData().SetNoCopies(1);
-        
+    printdata.GetPrintData().ConvertFromNative();
+    
     wxPageSetupDialogData pageSetup(printdata.GetPrintData());
 
@@ -599 +604 @@
     printdata.SetToPage(printout->GetPageCount());
 
-    wxPrintDialogData data(printdata);
-
     if (showDialog) {
-        wxPrintDialog dialog(0, &data);
+        wxPrintDialog dialog(0, &printdata);
         if (dialog.ShowModal() == wxID_OK) {
-            data = dialog.GetPrintDialogData();
-            printout->SetFirstPage(data.GetFromPage());
-            printout->SetLastPage(data.GetToPage());
+            wxPrintDialogData updatedPrintdata = dialog.GetPrintDialogData();            
+            printout->SetFirstPage(updatedPrintdata.GetFromPage());
+            printout->SetLastPage(updatedPrintdata.GetToPage());
         } else
             return;
     }
     
-    wxPrinter printer(&data);
+    wxPrinter printer(&printdata);
         
     printer.Print(0, printout, false);