centralized the handling of border styles; added borders support for wxListBox and...

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

diff --git a/src/generic/treectlg.cpp b/src/generic/treectlg.cpp
index fd499ea6feb3e5db3110a2c0dcfa1497d5fd0cfc..a53683327480208a01bba972be59382afe753e0b 100644 (file)
--- a/src/generic/treectlg.cpp
+++ b/src/generic/treectlg.cpp
@@ -863,7 +863,7 @@ wxGenericTreeCtrl::~wxGenericTreeCtrl()
 // accessors
 // -----------------------------------------------------------------------------
 
 // accessors
 // -----------------------------------------------------------------------------
 

-size_t wxGenericTreeCtrl::GetCount() const
+unsigned int wxGenericTreeCtrl::GetCount() const

 {
     if ( !m_anchor )
     {
 {
     if ( !m_anchor )
     {


@@ -871,7 +871,7 @@ size_t wxGenericTreeCtrl::GetCount() const
         return 0;
     }
 
         return 0;
     }
 

-    size_t count = m_anchor->GetChildrenCount();
+    unsigned int count = m_anchor->GetChildrenCount();

     if ( !HasFlag(wxTR_HIDE_ROOT) )
     {
         // take the root itself into account
     if ( !HasFlag(wxTR_HIDE_ROOT) )
     {
         // take the root itself into account


@@ -2323,7 +2323,7 @@ void wxGenericTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level
 
     if (IsExposed(exposed_x, exposed_y, 10000, h))  // 10000 = very much
     {
 
     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
 #ifndef __WXMAC__
             // don't draw rect outline if we already have the
             // background color under Mac


@@ -2887,12 +2887,9 @@ bool wxGenericTreeCtrl::GetBoundingRect(const wxTreeItemId& item,
 
     wxGenericTreeItem *i = (wxGenericTreeItem*) item.m_pItem;
 
 
     wxGenericTreeItem *i = (wxGenericTreeItem*) item.m_pItem;
 

-    int startX, startY;
-    GetViewStart(& startX, & startY);
-

     if ( textOnly )
     {
     if ( textOnly )
     {

-        rect.x = i->GetX() - startX*PIXELS_PER_UNIT;
+        rect.x = i->GetX();

         rect.width = i->GetWidth();
 
         if ( m_imageListNormal )
         rect.width = i->GetWidth();
 
         if ( m_imageListNormal )


@@ -2908,9 +2905,12 @@ bool wxGenericTreeCtrl::GetBoundingRect(const wxTreeItemId& item,
         rect.width = GetClientSize().x;
     }
 
         rect.width = GetClientSize().x;
     }
 

-    rect.y = i->GetY() - startY*PIXELS_PER_UNIT;
+    rect.y = i->GetY();

     rect.height = GetLineHeight(i);
 
     rect.height = GetLineHeight(i);
 

+    // we have to return the logical coordinates, not physical ones
+    rect.SetTopLeft(CalcScrolledPosition(rect.GetTopLeft()));
+

     return true;
 }
 
     return true;
 }