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

renamed Render's argument to not obfuscate its meaning

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30798 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2004-11-27 22:40:05 +00:00
parent 39a77f4cd9
commit 4ac725a3b3
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -81,7 +81,8 @@ public:
// set the same pagebreak twice. // set the same pagebreak twice.
// //
// CAUTION! Render() changes DC's user scale and does NOT restore it! // 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 to = INT_MAX, 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 *known_pagebreaks = NULL, int number_of_pages = 0);
// returns total height of the html document // returns total height of the html document

8
src/html/htmprint.cpp
View File

@@ -112,7 +112,9 @@ void wxHtmlDCRenderer::SetStandardFonts(int size,
} }
int wxHtmlDCRenderer::Render(int x, int y, int from, int dont_render, int to, int *known_pagebreaks, int number_of_pages) int wxHtmlDCRenderer::Render(int x, int y, int from, int dont_render,
int maxHeight,
int *known_pagebreaks, int number_of_pages)
{ {
int pbreak, hght; int pbreak, hght;
@@ -121,8 +123,8 @@ int wxHtmlDCRenderer::Render(int x, int y, int from, int dont_render, int to, in
pbreak = (int)(from + m_Height); pbreak = (int)(from + m_Height);
while (m_Cells->AdjustPagebreak(&pbreak, known_pagebreaks, number_of_pages)) {} while (m_Cells->AdjustPagebreak(&pbreak, known_pagebreaks, number_of_pages)) {}
hght = pbreak - from; hght = pbreak - from;
if(to < hght) if (maxHeight < hght)
hght = to; hght = maxHeight;
if (!dont_render) if (!dont_render)
{ {