Don't scroll the grid when starting a cell editor if it will already

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

diff --git a/src/generic/treectlg.cpp b/src/generic/treectlg.cpp
index 31b1d054a66d0f089c623b84c343ee9aa3077fa0..577ecbc4e1615e58d728763662f142675ac6ec01 100644 (file)
--- a/src/generic/treectlg.cpp
+++ b/src/generic/treectlg.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        treectlg.cpp
+// Name:        src/generic/treectlg.cpp
 // Purpose:     generic tree control implementation
 // Author:      Robert Roebling
 // Created:     01/02/97
@@ -26,14 +26,17 @@
 
 #if wxUSE_TREECTRL
 
-#include "wx/treebase.h"
 #include "wx/treectrl.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/dcclient.h"
+#endif
+
 #include "wx/generic/treectlg.h"
 #include "wx/timer.h"
 #include "wx/textctrl.h"
 #include "wx/imaglist.h"
 #include "wx/settings.h"
-#include "wx/dcclient.h"
 
 #include "wx/renderer.h"
 
@@ -2323,7 +2326,7 @@ void wxGenericTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level
 
     if (IsExposed(exposed_x, exposed_y, 10000, h))  // 10000 = very much
     {
-        wxPen *pen =
+        const wxPen *pen =
 #ifndef __WXMAC__
             // don't draw rect outline if we already have the
             // background color under Mac
@@ -2909,11 +2912,7 @@ bool wxGenericTreeCtrl::GetBoundingRect(const wxTreeItemId& item,
     rect.height = GetLineHeight(i);
 
     // we have to return the logical coordinates, not physical ones
-    int startX, startY;
-    GetViewStart(& startX, & startY);
-
-    rect.x -= startX*PIXELS_PER_UNIT;
-    rect.y -= startY*PIXELS_PER_UNIT;
+    rect.SetTopLeft(CalcScrolledPosition(rect.GetTopLeft()));
 
     return true;
 }