Remove hard limit on number of pages in wxHtmlPrintout.

This seems to be a leftover from an old version in which the page breaks
positions were stored in a fixed size array. As the code uses a dynamic array
now there doesn't seem to be any reason to impose any limit on the number of
pages and some people did run into the old 999 pages limitation apparently.

Closes #11159.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65076 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/html/htmldefs.h b/include/wx/html/htmldefs.h
index 469f7072860a6703f627445deb4843f6b3eb478e..be385699f1072842ce8f014365fa5957a5b70c12 100644 (file)
--- a/include/wx/html/htmldefs.h
+++ b/include/wx/html/htmldefs.h
@@ -95,9 +95,6 @@
     /* size of temporary buffer used during parsing */
 #define wxHTML_BUFLEN                  1024
 
     /* size of temporary buffer used during parsing */
 #define wxHTML_BUFLEN                  1024
 

-    /* maximum number of pages printable via html printing */
-#define wxHTML_PRINT_MAX_PAGES          999
-

 #endif // wxUSE_HTML
 
 #endif // _WX_HTMLDEFS_H_
 #endif // wxUSE_HTML
 
 #endif // _WX_HTMLDEFS_H_

diff --git a/include/wx/html/htmprint.h b/include/wx/html/htmprint.h
index 73239426d8ee7f9b955d1b5b7cdfffa45ef7704e..74024d433baedc9a5de59dc9fbdfb22740016775 100644 (file)
--- a/include/wx/html/htmprint.h
+++ b/include/wx/html/htmprint.h
@@ -199,7 +199,6 @@ private:
 
 private:
     int m_NumPages;
 
 private:
     int m_NumPages;

-    //int m_PageBreaks[wxHTML_PRINT_MAX_PAGES];

     wxArrayInt m_PageBreaks;
 
     wxString m_Document, m_BasePath;
     wxArrayInt m_PageBreaks;
 
     wxString m_Document, m_BasePath;

diff --git a/src/html/htmprint.cpp b/src/html/htmprint.cpp
index c9d2609da29cdc418449d5d633c345eebd969fb8..4ce2e3b80a5416175b709ac3c17eea0c62bdc1dc 100644 (file)
--- a/src/html/htmprint.cpp
+++ b/src/html/htmprint.cpp
@@ -196,7 +196,7 @@ wxHtmlPrintout::wxHtmlPrintout(const wxString& title) : wxPrintout(title)
 {
     m_Renderer = new wxHtmlDCRenderer;
     m_RendererHdr = new wxHtmlDCRenderer;
 {
     m_Renderer = new wxHtmlDCRenderer;
     m_RendererHdr = new wxHtmlDCRenderer;

-    m_NumPages = wxHTML_PRINT_MAX_PAGES;
+    m_NumPages = INT_MAX;

     m_Document = m_BasePath = wxEmptyString; m_BasePathIsDir = true;
     m_Headers[0] = m_Headers[1] = wxEmptyString;
     m_Footers[0] = m_Footers[1] = wxEmptyString;
     m_Document = m_BasePath = wxEmptyString; m_BasePathIsDir = true;
     m_Headers[0] = m_Headers[1] = wxEmptyString;
     m_Footers[0] = m_Footers[1] = wxEmptyString;


@@ -492,7 +492,6 @@ void wxHtmlPrintout::CountPages()
 
     int pos = 0;
     m_NumPages = 0;
 
     int pos = 0;
     m_NumPages = 0;

-    // m_PageBreaks[0] = 0;

 
     m_PageBreaks.Clear();
     m_PageBreaks.Add( 0);
 
     m_PageBreaks.Clear();
     m_PageBreaks.Add( 0);


@@ -503,12 +502,6 @@ void wxHtmlPrintout::CountPages()
                                  m_PageBreaks,
                                  pos, true, INT_MAX);
         m_PageBreaks.Add( pos);
                                  m_PageBreaks,
                                  pos, true, INT_MAX);
         m_PageBreaks.Add( pos);

-        if( m_PageBreaks.GetCount() > wxHTML_PRINT_MAX_PAGES)
-        {
-            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;
-        }

     } while (pos < m_Renderer->GetTotalHeight());
 }
 
     } while (pos < m_Renderer->GetTotalHeight());
 }