wxRichTextCtrl native caret now flashes, for wxMac/Core Graphics mode

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

diff --git a/src/html/htmprint.cpp b/src/html/htmprint.cpp
index e674237f88f0fe5756b0420fa562a000708c2903..916948771249687487ef0e844677adc4d91f8c7d 100644 (file)
--- a/src/html/htmprint.cpp
+++ b/src/html/htmprint.cpp
@@ -227,7 +227,7 @@ wxHtmlPrintout::CheckFit(const wxSize& pageArea, const wxSize& docArea) const
             );
         dlg.SetYesNoLabels(_("&Print"), _("&Cancel"));
 
-        if ( dlg.ShowModal() != wxYES )
+        if ( dlg.ShowModal() != wxID_YES )
             return false;
     }
 
@@ -289,9 +289,9 @@ void wxHtmlPrintout::OnPreparePrinting()
     const int printAreaW = int(ppmm_h * (mm_w - m_MarginLeft - m_MarginRight));
     int printAreaH = int(ppmm_v * (mm_h - m_MarginTop - m_MarginBottom));
     if ( m_HeaderHeight )
-        printAreaH -= m_HeaderHeight + m_MarginSpace * ppmm_v;
+        printAreaH -= int(m_HeaderHeight + m_MarginSpace * ppmm_v);
     if ( m_FooterHeight )
-        printAreaH -= m_FooterHeight + m_MarginSpace * ppmm_v;
+        printAreaH -= int(m_FooterHeight + m_MarginSpace * ppmm_v);
 
     m_Renderer->SetSize(printAreaW, printAreaH);
     m_Renderer->SetHtmlText(m_Document, m_BasePath, m_BasePathIsDir);