virtualized m_row/col height/widths arrays

[wxWidgets.git] / src / generic / listctrl.cpp

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index d2897ce3b91537bf43820a5a797581eb7f974833..8e582c5b55a735859d7a0c8203271fa8e750b470 100644 (file)
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -618,15 +618,14 @@ void wxListLineData::SetAttributes(wxDC *dc,
 
 void wxListLineData::DoDraw( wxDC *dc, bool hilight, bool paintBG )
 {
 
 void wxListLineData::DoDraw( wxDC *dc, bool hilight, bool paintBG )
 {

-    wxCoord dev_x = dc->LogicalToDeviceX( m_bound_all.x-2 );
-    wxCoord dev_y = dc->LogicalToDeviceY( m_bound_all.y-2 );
-    wxCoord dev_w = dc->LogicalToDeviceXRel( m_bound_all.width+4 );
-    wxCoord dev_h = dc->LogicalToDeviceYRel( m_bound_all.height+4 );
+    wxCoord dev_x = 0;
+    wxCoord dev_y = 0;
+    m_owner->CalcScrolledPosition( m_bound_all.x, m_bound_all.y, &dev_x, &dev_y );
+    wxCoord dev_w = m_bound_all.width;
+    wxCoord dev_h = m_bound_all.height;

 
     if (!m_owner->IsExposed( dev_x, dev_y, dev_w, dev_h ))
 
     if (!m_owner->IsExposed( dev_x, dev_y, dev_w, dev_h ))

-    {

         return;
         return;

-    }

 
     wxWindow *listctrl = m_owner->GetParent();
 
 
     wxWindow *listctrl = m_owner->GetParent();
 


@@ -884,9 +883,9 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
         dc.SetPen( *wxWHITE_PEN );
 
         DoDrawRect( &dc, x, y, cw, h-2 );
         dc.SetPen( *wxWHITE_PEN );
 
         DoDrawRect( &dc, x, y, cw, h-2 );

-        dc.SetClippingRegion( x, y, cw-5, h-4 );
+//        dc.SetClippingRegion( x, y, cw-5, h-4 );

         dc.DrawText( item.m_text, x+4, y+3 );
         dc.DrawText( item.m_text, x+4, y+3 );

-        dc.DestroyClippingRegion();
+//        dc.DestroyClippingRegion();

         x += item.m_width;
 #if wxUSE_GENERIC_LIST_EXTENSIONS
         if (dc.LogicalToDeviceX(x) > w+5) break;
         x += item.m_width;
 #if wxUSE_GENERIC_LIST_EXTENSIONS
         if (dc.LogicalToDeviceX(x) > w+5) break;


@@ -1106,7 +1105,7 @@ BEGIN_EVENT_TABLE(wxListMainWindow,wxScrolledWindow)
   EVT_KEY_DOWN       (wxListMainWindow::OnKeyDown)
   EVT_SET_FOCUS      (wxListMainWindow::OnSetFocus)
   EVT_KILL_FOCUS     (wxListMainWindow::OnKillFocus)
   EVT_KEY_DOWN       (wxListMainWindow::OnKeyDown)
   EVT_SET_FOCUS      (wxListMainWindow::OnSetFocus)
   EVT_KILL_FOCUS     (wxListMainWindow::OnKillFocus)

-  EVT_SCROLL                 (wxListMainWindow::OnScroll)
+  EVT_SCROLLWIN      (wxListMainWindow::OnScroll)

 END_EVENT_TABLE()
 
 wxListMainWindow::wxListMainWindow()
 END_EVENT_TABLE()
 
 wxListMainWindow::wxListMainWindow()


@@ -1191,22 +1190,16 @@ void wxListMainWindow::RefreshLine( wxListLineData *line )
 {
     if (m_dirty) return;
 
 {
     if (m_dirty) return;
 

+    if (!line) return;
+    

     int x = 0;
     int y = 0;
     int w = 0;
     int h = 0;
     int x = 0;
     int y = 0;
     int w = 0;
     int h = 0;

-    if (line)
-    {
-        wxClientDC dc(this);
-        PrepareDC( dc );
-        line->GetExtent( x, y, w, h );
-        wxRect rect(
-          dc.LogicalToDeviceX(x-3),
-          dc.LogicalToDeviceY(y-3),
-          dc.LogicalToDeviceXRel(w+6),
-          dc.LogicalToDeviceXRel(h+6) );
-        Refresh( TRUE, &rect );
-    }
+    line->GetExtent( x, y, w, h );
+    CalcScrolledPosition( x, y, &x, &y );
+    wxRect rect( x, y, w, h );
+    Refresh( TRUE, &rect );

 }
 
 void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
 }
 
 void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )