fixed handling of the accelerators of menu items added to already attached submenus

[wxWidgets.git] / src / html / htmprint.cpp

diff --git a/src/html/htmprint.cpp b/src/html/htmprint.cpp
index c094e0ead32e7c84ee97049a37e27748dc1b3072..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;
 
 {
     int pbreak, hght;
 


@@ -121,9 +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;
     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)
     {
 
     if (!dont_render)
     {


@@ -131,10 +132,12 @@ int wxHtmlDCRenderer::Render(int x, int y, int from, int dont_render, int to, in
         wxDefaultHtmlRenderingStyle rstyle;
         rinfo.SetStyle(&rstyle);
         m_DC->SetBrush(*wxWHITE_BRUSH);
         wxDefaultHtmlRenderingStyle rstyle;
         rinfo.SetStyle(&rstyle);
         m_DC->SetBrush(*wxWHITE_BRUSH);

+        m_DC->SetClippingRegion(x, y, m_Width, hght);

         m_Cells->Draw(*m_DC,
                       x, (y - from),
         m_Cells->Draw(*m_DC,
                       x, (y - from),

-                      y, y + hght,
+                      y, pbreak + (y /*- from*/),

                       rinfo);
                       rinfo);

+        m_DC->DestroyClippingRegion();

     }
 
     if (pbreak < m_Cells->GetHeight()) return pbreak;
     }
 
     if (pbreak < m_Cells->GetHeight()) return pbreak;