atsu for textctrl

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

diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index 57d8ae6d58da1356ca0aa58b3267c462631b86ea..8804aad3f527ce9477d468b0cf8d42bfed928d05 100644 (file)
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -2276,7 +2276,8 @@ void wxDataViewMainWindow::ScrollTo( int rows, int column )
 void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
 {
     wxDataViewModel *model = GetOwner()->GetModel();
 void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
 {
     wxDataViewModel *model = GetOwner()->GetModel();

-    wxAutoBufferedPaintDC dc( this );
+    //wxAutoBufferedPaintDC dc( this );
+    wxPaintDC dc(this);

 
     // prepare the DC
     dc.SetBackground(GetBackgroundColour());
 
     // prepare the DC
     dc.SetBackground(GetBackgroundColour());


@@ -2291,7 +2292,7 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
     unsigned int item_start = wxMax( 0, (update.y / m_lineHeight) );
     unsigned int item_count =
         wxMin( (int)(((update.y + update.height) / m_lineHeight) - item_start + 1),
     unsigned int item_start = wxMax( 0, (update.y / m_lineHeight) );
     unsigned int item_count =
         wxMin( (int)(((update.y + update.height) / m_lineHeight) - item_start + 1),

-               (int)(GetRowCount( )- item_start) );
+               (int)(GetRowCount( ) - item_start));

     unsigned int item_last = item_start + item_count;
 
     // compute which columns needs to be redrawn
     unsigned int item_last = item_start + item_count;
 
     // compute which columns needs to be redrawn


@@ -3157,7 +3158,11 @@ int wxDataViewMainWindow::RecalculateCount()
     if (!m_root)
     {
         wxDataViewIndexListModel *list_model = (wxDataViewIndexListModel*) GetOwner()->GetModel();
     if (!m_root)
     {
         wxDataViewIndexListModel *list_model = (wxDataViewIndexListModel*) GetOwner()->GetModel();

-        return list_model->GetLastIndex();
+#ifndef __WXMAC__
+        return list_model->GetLastIndex() + 1;
+#else
+        return list_model->GetLastIndex() - 1;
+#endif

     }
     else
     {
     }
     else
     {