FM small patch for wxDataViewCtrl compilation

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

diff --git a/src/html/htmprint.cpp b/src/html/htmprint.cpp
index 80fa77356431fa679e6ac7b32d953c5303a6cdb9..834e791b2bce4eb901ba43457e243edc5645808e 100644 (file)
--- a/src/html/htmprint.cpp
+++ b/src/html/htmprint.cpp
@@ -276,7 +276,7 @@ void wxHtmlPrintout::GetPageInfo(int *minPage, int *maxPage, int *selPageFrom, i
 
 bool wxHtmlPrintout::HasPage(int pageNum)
 {
 
 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)
         {
         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;
         }
             _("Warning"), wxCANCEL | wxICON_ERROR );
             break;
         }