renamed Render's argument to not obfuscate its meaning

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

diff --git a/include/wx/html/htmprint.h b/include/wx/html/htmprint.h
index 5b6ab89c87a834083482985463881958efe5734a..df90a47dce40aa01c73d90063606620028f62979 100644 (file)
--- a/include/wx/html/htmprint.h
+++ b/include/wx/html/htmprint.h
@@ -81,7 +81,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 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);
 
     // returns total height of the html document

diff --git a/src/html/htmprint.cpp b/src/html/htmprint.cpp
index ca4787987899588ebe0eaf82c1b6ad80491278ce..ce67a52c691dfc473a11c1f9bb24f54ddd632eb4 100644 (file)
--- a/src/html/htmprint.cpp
+++ b/src/html/htmprint.cpp
@@ -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;
 
@@ -121,8 +123,8 @@ int wxHtmlDCRenderer::Render(int x, int y, int from, int dont_render, int to, in
     pbreak = (int)(from + m_Height);
     while (m_Cells->AdjustPagebreak(&pbreak, known_pagebreaks, number_of_pages)) {}
     hght = pbreak - from;
-    if(to < hght)
-        hght = to;
+    if (maxHeight < hght)
+        hght = maxHeight;
 
     if (!dont_render)
     {