fixed erroneous debug error message

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

diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp
index 0f5fc11366aae060807e9cf4eea4cb7b5b0fdfd1..7d79fe5523c97a1d7de1c31ea4af8f642d1cb929 100644 (file)
--- a/src/html/htmlwin.cpp
+++ b/src/html/htmlwin.cpp
@@ -632,23 +632,18 @@ void wxHtmlWindow::OnCellMouseHover(wxHtmlCell * WXUNUSED(cell),
 
 void wxHtmlWindow::OnDraw(wxDC& dc)
 {
 
 void wxHtmlWindow::OnDraw(wxDC& dc)
 {

-    int x, y;
-    wxRegionIterator upd(GetUpdateRegion()); // get the update rect list
-    int v_y, v_h;
+    if (m_tmpCanDrawLocks > 0 || m_Cell == NULL) return;

 
 

-    if (m_tmpCanDrawLocks > 0) return;
+    int x, y;
+    wxRect rect = GetUpdateRegion().GetBox();

 
     dc.SetMapMode(wxMM_TEXT);
     dc.SetBackgroundMode(wxTRANSPARENT);
     GetViewStart(&x, &y);
 
 
     dc.SetMapMode(wxMM_TEXT);
     dc.SetBackgroundMode(wxTRANSPARENT);
     GetViewStart(&x, &y);
 

-    while (upd)
-    {
-        v_y = upd.GetY();
-        v_h = upd.GetH();
-        if (m_Cell) m_Cell->Draw(dc, 0, 0, y * wxHTML_SCROLL_STEP + v_y, y * wxHTML_SCROLL_STEP + v_h + v_y);
-        upd++;
-    }
+    m_Cell->Draw(dc, 0, 0, 
+                 y * wxHTML_SCROLL_STEP + rect.GetTop(), 
+                 y * wxHTML_SCROLL_STEP + rect.GetBottom());

 }
 
 
 }
 
 


@@ -785,4 +780,4 @@ IMPLEMENT_DYNAMIC_CLASS(wxHtmlWinModule, wxModule)
 #include "wx/html/forcelnk.h"
 FORCE_WXHTML_MODULES()
 
 #include "wx/html/forcelnk.h"
 FORCE_WXHTML_MODULES()
 

-#endif
\ No newline at end of file
+#endif