Rewrote wxRibbonPage realisation and layout code to avoid setting the position and...

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

diff --git a/src/html/htmprint.cpp b/src/html/htmprint.cpp
index e674237f88f0fe5756b0420fa562a000708c2903..6a22f88547216fb3bff807a225a50a233c5126e9 100644 (file)
--- a/src/html/htmprint.cpp
+++ b/src/html/htmprint.cpp
@@ -218,16 +218,16 @@ wxHtmlPrintout::CheckFit(const wxSize& pageArea, const wxSize& docArea) const
                  GetTitle()
                 ),
                 _("Printing"),
-                wxYES_NO | wxNO_DEFAULT | wxICON_QUESTION
+                wxOK | wxCANCEL | wxCANCEL_DEFAULT | wxICON_QUESTION
             );
         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() != wxYES )
+        if ( dlg.ShowModal() == wxID_CANCEL )
             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);