diff --git a/include/wx/html/htmldefs.h b/include/wx/html/htmldefs.h index 469f707286..be385699f1 100644 --- 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 - /* maximum number of pages printable via html printing */ -#define wxHTML_PRINT_MAX_PAGES 999 - #endif // wxUSE_HTML #endif // _WX_HTMLDEFS_H_ diff --git a/include/wx/html/htmprint.h b/include/wx/html/htmprint.h index 73239426d8..74024d433b 100644 --- a/include/wx/html/htmprint.h +++ b/include/wx/html/htmprint.h @@ -199,7 +199,6 @@ private: private: int m_NumPages; - //int m_PageBreaks[wxHTML_PRINT_MAX_PAGES]; wxArrayInt m_PageBreaks; wxString m_Document, m_BasePath; diff --git a/src/html/htmprint.cpp b/src/html/htmprint.cpp index c9d2609da2..4ce2e3b80a 100644 --- 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_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; @@ -492,7 +492,6 @@ void wxHtmlPrintout::CountPages() int pos = 0; m_NumPages = 0; - // m_PageBreaks[0] = 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); - 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()); }