Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove hard limit on number of pages in wxHtmlPrintout.

Browse Source 
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
This commit is contained in:
Vadim Zeitlin
2010-07-24 12:27:18 +00:00
parent e39877cdb7
commit 9899a70bc0
3 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/html/htmldefs.h
View File

@@ -95,9 +95,6 @@
/* size of temporary buffer used during parsing */ /* size of temporary buffer used during parsing */
#define wxHTML_BUFLEN 1024 #define wxHTML_BUFLEN 1024
/* maximum number of pages printable via html printing */
#define wxHTML_PRINT_MAX_PAGES 999
#endif // wxUSE_HTML #endif // wxUSE_HTML
#endif // _WX_HTMLDEFS_H_ #endif // _WX_HTMLDEFS_H_

1
include/wx/html/htmprint.h
View File

@@ -199,7 +199,6 @@ private:
private: private:
int m_NumPages; int m_NumPages;
//int m_PageBreaks[wxHTML_PRINT_MAX_PAGES];
wxArrayInt m_PageBreaks; wxArrayInt m_PageBreaks;
wxString m_Document, m_BasePath; wxString m_Document, m_BasePath;

9
src/html/htmprint.cpp
View File

@@ -196,7 +196,7 @@ wxHtmlPrintout::wxHtmlPrintout(const wxString& title) : wxPrintout(title)
{ {
m_Renderer = new wxHtmlDCRenderer; m_Renderer = new wxHtmlDCRenderer;
m_RendererHdr = 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_Document = m_BasePath = wxEmptyString; m_BasePathIsDir = true;
m_Headers[0] = m_Headers[1] = wxEmptyString; m_Headers[0] = m_Headers[1] = wxEmptyString;
m_Footers[0] = m_Footers[1] = wxEmptyString; m_Footers[0] = m_Footers[1] = wxEmptyString;
@@ -492,7 +492,6 @@ void wxHtmlPrintout::CountPages()
int pos = 0; int pos = 0;
m_NumPages = 0; m_NumPages = 0;
// m_PageBreaks[0] = 0;
m_PageBreaks.Clear(); m_PageBreaks.Clear();
m_PageBreaks.Add( 0); m_PageBreaks.Add( 0);
@@ -503,12 +502,6 @@ void wxHtmlPrintout::CountPages()
m_PageBreaks, m_PageBreaks,
pos, true, INT_MAX); pos, true, INT_MAX);
m_PageBreaks.Add( pos); 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());
} }