Fix text input and completion in wxComboCtrl and wxOwnerDrawnComboBox.

[wxWidgets.git] / src / html / htmprint.cpp

diff --git a/src/html/htmprint.cpp b/src/html/htmprint.cpp
index 916948771249687487ef0e844677adc4d91f8c7d..14d478faa9be757c631e45c793859e406f6a8223 100644 (file)
--- a/src/html/htmprint.cpp
+++ b/src/html/htmprint.cpp
@@ -37,6 +37,28 @@
 #define DEFAULT_PRINT_FONT_SIZE   12
 
 
 #define DEFAULT_PRINT_FONT_SIZE   12
 
 

+// CSS specification offer following guidance on dealing with pixel sizes
+// when printing at
+// http://www.w3.org/TR/2004/CR-CSS21-20040225/syndata.html#length-units:
+//
+//      Pixel units are relative to the resolution of the viewing device, i.e.,
+//      most often a computer display. If the pixel density of the output
+//      device is very different from that of a typical computer display, the
+//      user agent should rescale pixel values. It is recommended that the [
+//      reference pixel] be the visual angle of one pixel on a device with a
+//      pixel density of 96dpi and a distance from the reader of an arm's
+//      length. For a nominal arm's length of 28 inches, the visual angle is
+//      therefore about 0.0213 degrees.
+//
+//      For reading at arm's length, 1px thus corresponds to about 0.26 mm
+//      (1/96 inch). When printed on a laser printer, meant for reading at a
+//      little less than arm's length (55 cm, 21 inches), 1px is about 0.20 mm.
+//      On a 300 dots-per-inch (dpi) printer, that may be rounded up to 3 dots
+//      (0.25 mm); on a 600 dpi printer, it can be rounded to 5 dots.
+//
+// See also http://trac.wxwidgets.org/ticket/10942.
+#define TYPICAL_SCREEN_DPI  96.0
+

 //--------------------------------------------------------------------------------
 // wxHtmlDCRenderer
 //--------------------------------------------------------------------------------
 //--------------------------------------------------------------------------------
 // wxHtmlDCRenderer
 //--------------------------------------------------------------------------------


@@ -64,10 +86,10 @@ wxHtmlDCRenderer::~wxHtmlDCRenderer()
 
 
 
 
 
 

-void wxHtmlDCRenderer::SetDC(wxDC *dc, double pixel_scale)
+void wxHtmlDCRenderer::SetDC(wxDC *dc, double pixel_scale, double font_scale)

 {
     m_DC = dc;
 {
     m_DC = dc;

-    m_Parser->SetDC(m_DC, pixel_scale);
+    m_Parser->SetDC(m_DC, pixel_scale, font_scale);

 }
 
 
 }
 
 


@@ -218,16 +240,16 @@ wxHtmlPrintout::CheckFit(const wxSize& pageArea, const wxSize& docArea) const
                  GetTitle()
                 ),
                 _("Printing"),
                  GetTitle()
                 ),
                 _("Printing"),

-                wxYES_NO | wxNO_DEFAULT | wxICON_QUESTION
+                wxOK | wxCANCEL | wxCANCEL_DEFAULT | wxICON_QUESTION

             );
         dlg.SetExtendedMessage
             (
                 _("If possible, try changing the layout parameters to "
             );
         dlg.SetExtendedMessage
             (
                 _("If possible, try changing the layout parameters to "

-                  "make the printout more narrow")
+                  "make the printout more narrow.")

             );
             );

-        dlg.SetYesNoLabels(_("&Print"), _("&Cancel"));
+        dlg.SetOKLabel(wxID_PRINT);

 
 

-        if ( dlg.ShowModal() != wxID_YES )
+        if ( dlg.ShowModal() == wxID_CANCEL )

             return false;
     }
 
             return false;
     }
 


@@ -236,7 +258,7 @@ wxHtmlPrintout::CheckFit(const wxSize& pageArea, const wxSize& docArea) const
 
 void wxHtmlPrintout::OnPreparePrinting()
 {
 
 void wxHtmlPrintout::OnPreparePrinting()
 {

-    int pageWidth, pageHeight, mm_w, mm_h, scr_w, scr_h, dc_w, dc_h;
+    int pageWidth, pageHeight, mm_w, mm_h, dc_w, dc_h;

     float ppmm_h, ppmm_v;
 
     GetPageSizePixels(&pageWidth, &pageHeight);
     float ppmm_h, ppmm_v;
 
     GetPageSizePixels(&pageWidth, &pageHeight);


@@ -251,7 +273,6 @@ void wxHtmlPrintout::OnPreparePrinting()
     GetPPIScreen(&ppiScreenX, &ppiScreenY);
     wxUnusedVar(ppiScreenX);
 
     GetPPIScreen(&ppiScreenX, &ppiScreenY);
     wxUnusedVar(ppiScreenX);
 

-    wxDisplaySize(&scr_w, &scr_h);

     GetDC()->GetSize(&dc_w, &dc_h);
 
     GetDC()->SetUserScale((double)dc_w / (double)pageWidth,
     GetDC()->GetSize(&dc_w, &dc_h);
 
     GetDC()->SetUserScale((double)dc_w / (double)pageWidth,


@@ -259,7 +280,9 @@ void wxHtmlPrintout::OnPreparePrinting()
 
     /* prepare headers/footers renderer: */
 
 
     /* prepare headers/footers renderer: */
 

-    m_RendererHdr->SetDC(GetDC(), (double)ppiPrinterY / (double)ppiScreenY);
+    m_RendererHdr->SetDC(GetDC(),
+                         (double)ppiPrinterY / TYPICAL_SCREEN_DPI,
+                         (double)ppiPrinterY / (double)ppiScreenY);

     m_RendererHdr->SetSize((int) (ppmm_h * (mm_w - m_MarginLeft - m_MarginRight)),
                           (int) (ppmm_v * (mm_h - m_MarginTop - m_MarginBottom)));
     if (m_Headers[0] != wxEmptyString)
     m_RendererHdr->SetSize((int) (ppmm_h * (mm_w - m_MarginLeft - m_MarginRight)),
                           (int) (ppmm_v * (mm_h - m_MarginTop - m_MarginBottom)));
     if (m_Headers[0] != wxEmptyString)


@@ -284,7 +307,9 @@ void wxHtmlPrintout::OnPreparePrinting()
     }
 
     /* prepare main renderer: */
     }
 
     /* prepare main renderer: */

-    m_Renderer->SetDC(GetDC(), (double)ppiPrinterY / (double)ppiScreenY);
+    m_Renderer->SetDC(GetDC(),
+                      (double)ppiPrinterY / TYPICAL_SCREEN_DPI,
+                      (double)ppiPrinterY / (double)ppiScreenY);

 
     const int printAreaW = int(ppmm_h * (mm_w - m_MarginLeft - m_MarginRight));
     int printAreaH = int(ppmm_v * (mm_h - m_MarginTop - m_MarginBottom));
 
     const int printAreaW = int(ppmm_h * (mm_w - m_MarginLeft - m_MarginRight));
     int printAreaH = int(ppmm_v * (mm_h - m_MarginTop - m_MarginBottom));


@@ -457,14 +482,13 @@ void wxHtmlPrintout::RenderPage(wxDC *dc, int page)
 {
     wxBusyCursor wait;
 
 {
     wxBusyCursor wait;
 

-    int pageWidth, pageHeight, mm_w, mm_h, scr_w, scr_h, dc_w, dc_h;
+    int pageWidth, pageHeight, mm_w, mm_h, dc_w, dc_h;

     float ppmm_h, ppmm_v;
 
     GetPageSizePixels(&pageWidth, &pageHeight);
     GetPageSizeMM(&mm_w, &mm_h);
     ppmm_h = (float)pageWidth / mm_w;
     ppmm_v = (float)pageHeight / mm_h;
     float ppmm_h, ppmm_v;
 
     GetPageSizePixels(&pageWidth, &pageHeight);
     GetPageSizeMM(&mm_w, &mm_h);
     ppmm_h = (float)pageWidth / mm_w;
     ppmm_v = (float)pageHeight / mm_h;

-    wxDisplaySize(&scr_w, &scr_h);

     dc->GetSize(&dc_w, &dc_h);
 
     int ppiPrinterX, ppiPrinterY;
     dc->GetSize(&dc_w, &dc_h);
 
     int ppiPrinterX, ppiPrinterY;


@@ -477,7 +501,9 @@ void wxHtmlPrintout::RenderPage(wxDC *dc, int page)
     dc->SetUserScale((double)dc_w / (double)pageWidth,
                      (double)dc_h / (double)pageHeight);
 
     dc->SetUserScale((double)dc_w / (double)pageWidth,
                      (double)dc_h / (double)pageHeight);
 

-    m_Renderer->SetDC(dc, (double)ppiPrinterY / (double)ppiScreenY);
+    m_Renderer->SetDC(dc,
+                      (double)ppiPrinterY / TYPICAL_SCREEN_DPI,
+                      (double)ppiPrinterY / (double)ppiScreenY);

 
     dc->SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT);
 
 
     dc->SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT);
 


@@ -486,7 +512,9 @@ void wxHtmlPrintout::RenderPage(wxDC *dc, int page)
                          m_PageBreaks[page-1], false, m_PageBreaks[page]-m_PageBreaks[page-1]);
 
 
                          m_PageBreaks[page-1], false, m_PageBreaks[page]-m_PageBreaks[page-1]);
 
 

-    m_RendererHdr->SetDC(dc, (double)ppiPrinterY / (double)ppiScreenY);
+    m_RendererHdr->SetDC(dc,
+                         (double)ppiPrinterY / TYPICAL_SCREEN_DPI,
+                         (double)ppiPrinterY / (double)ppiScreenY);

     if (m_Headers[page % 2] != wxEmptyString)
     {
         m_RendererHdr->SetHtmlText(TranslateHeader(m_Headers[page % 2], page));
     if (m_Headers[page % 2] != wxEmptyString)
     {
         m_RendererHdr->SetHtmlText(TranslateHeader(m_Headers[page % 2], page));