X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/766571a7039fe4428dabe5e2aabcb4055ceb9db9..5d3f234b6b56549bb7e46bfd1286b63cf09ffe65:/src/html/htmprint.cpp?ds=sidebyside

diff --git a/src/html/htmprint.cpp b/src/html/htmprint.cpp
index 0dd8817e52..834e791b2b 100644
--- a/src/html/htmprint.cpp
+++ b/src/html/htmprint.cpp
@@ -23,6 +23,7 @@
     #include "wx/dc.h"
     #include "wx/settings.h"
     #include "wx/msgdlg.h"
+    #include "wx/module.h"
 #endif
 
 #include "wx/print.h"
@@ -30,7 +31,6 @@
 #include "wx/html/htmprint.h"
 #include "wx/wxhtml.h"
 #include "wx/wfstream.h"
-#include "wx/module.h"
 
 
 //--------------------------------------------------------------------------------
@@ -276,7 +276,7 @@ void wxHtmlPrintout::GetPageInfo(int *minPage, int *maxPage, int *selPageFrom, i
 
 bool wxHtmlPrintout::HasPage(int pageNum)
 {
-    return (pageNum >= 1 && pageNum-1 <= (signed)m_PageBreaks.Count());
+    return pageNum > 0 && (unsigned)pageNum < m_PageBreaks.Count();
 }
 
 
@@ -376,7 +376,7 @@ void wxHtmlPrintout::CountPages()
         m_PageBreaks.Add( pos);
         if( m_PageBreaks.Count() > wxHTML_PRINT_MAX_PAGES)
         {
-            wxMessageBox( _("HTML pagination algorithm generated more than the allowed maximum number of pages and it can continue any longer!"),
+            wxMessageBox( _("HTML pagination algorithm generated more than the allowed maximum number of pages and it can't continue any longer!"),
             _("Warning"), wxCANCEL | wxICON_ERROR );
             break;
         }