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

use dynamic array for the page breaks positions (patch 1483976)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39396 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-05-28 22:56:28 +00:00
parent db759dde87
commit fd0bab4353
6 changed files with 69 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/html/htmlcell.h
View File

@@ -277,8 +277,7 @@ public:
// Returned value : true if pagebreak was modified, false otherwise
// Usage : while (container->AdjustPagebreak(&p)) {}
virtual bool AdjustPagebreak(int *pagebreak,
int *known_pagebreaks = NULL,
int number_of_pages = 0) const;
wxArrayInt& known_pagebreaks) const;
// Sets cell's behaviour on pagebreaks (see AdjustPagebreak). Default
// is true - the cell can be split on two pages
@@ -411,7 +410,8 @@ public:
wxHtmlRenderingInfo& info);
virtual void DrawInvisible(wxDC& dc, int x, int y,
wxHtmlRenderingInfo& info);
virtual bool AdjustPagebreak(int *pagebreak, int *known_pagebreaks = NULL, int number_of_pages = 0) const;
/* virtual bool AdjustPagebreak(int *pagebreak, int *known_pagebreaks = NULL, int number_of_pages = 0) const;*/
virtual bool AdjustPagebreak(int *pagebreak, wxArrayInt& known_pagebreaks) const;
// insert cell at the end of m_Cells list
void InsertCell(wxHtmlCell *cell);

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

@@ -77,9 +77,8 @@ public:
// set the same pagebreak twice.
//
// CAUTION! Render() changes DC's user scale and does NOT restore it!
int Render(int x, int y, int from = 0, int dont_render = FALSE,
int maxHeight = INT_MAX,
int *known_pagebreaks = NULL, int number_of_pages = 0);
int Render(int x, int y, wxArrayInt& known_pagebreaks, int from = 0,
int dont_render = FALSE, int to = INT_MAX);
// returns total height of the html document
// (compare Render's return value with this)
@@ -181,7 +180,8 @@ private:
private:
int m_NumPages;
int m_PageBreaks[wxHTML_PRINT_MAX_PAGES];
//int m_PageBreaks[wxHTML_PRINT_MAX_PAGES];
wxArrayInt m_PageBreaks;
wxString m_Document, m_BasePath;
bool m_BasePathIsDir;