From: Robert Roebling <robert@roebling.de>
Date: Wed, 19 May 1999 10:27:11 +0000 (+0000)
Subject:   Corrected tree ctrl behaviour.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/ea5c6ca7f7c3dc448da4be353a1153a792d01db4

  Corrected tree ctrl behaviour.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2509 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/generic/scrolwin.cpp b/src/generic/scrolwin.cpp
index de7ed95ef1..6786900ccd 100644
--- a/src/generic/scrolwin.cpp
+++ b/src/generic/scrolwin.cpp
@@ -94,9 +94,9 @@ void wxScrolledWindow::SetScrollbars (int pixelsPerUnitX, int pixelsPerUnitY,
     bool do_refresh =
     (
       (noUnitsX != 0 && m_xScrollLines == 0) ||
-      (noUnitsX < m_xScrollPosition) ||
+      (noUnitsX < m_xScrollLines) ||
       (noUnitsY != 0 && m_yScrollLines == 0) ||
-      (noUnitsY < m_yScrollPosition) ||
+      (noUnitsY < m_yScrollLines) ||
       (xPos != m_xScrollPosition) ||
       (yPos != m_yScrollPosition) ||
       (pixelsPerUnitX != m_xScrollPixelsPerLine) ||
@@ -145,7 +145,8 @@ void wxScrolledWindow::SetScrollbars (int pixelsPerUnitX, int pixelsPerUnitY,
       
     AdjustScrollbars();
    
-   if (do_refresh && !noRefresh) Refresh();
+    if (do_refresh && !noRefresh) 
+	Refresh(); 
    
 #ifdef __WXMSW__
    // Necessary?
@@ -456,7 +457,7 @@ void wxScrolledWindow::Scroll( int x_pos, int y_pos )
         SetScrollPos( wxVERTICAL, m_yScrollPosition, TRUE );
     }
     
-    // BAD, BAD, can cause event loops if called from OnPaint(). (KB)
+    // BAD, BAD, can cause event loops if called from OnPaint(). KB.
     // Refresh();
     
 #ifdef __WXMSW__
diff --git a/src/generic/treectrl.cpp b/src/generic/treectrl.cpp
index 698488be06..e81bbabc66 100644
--- a/src/generic/treectrl.cpp
+++ b/src/generic/treectrl.cpp
@@ -950,7 +950,7 @@ void wxTreeCtrl::EnsureVisible(const wxTreeItemId& item)
         int x_pos = GetScrollPos( wxHORIZONTAL );
         SetScrollbars( 10, 10, x/10, y/10, x_pos, (item_y-client_h/2)/10 );
     }
-    else if (item_y > start_y+client_h-16)
+    else if (item_y > start_y+client_h-20)
     {
        int x = 0;
        int y = 0;
diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 8a4523630a..7326273401 100644
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -2857,6 +2857,14 @@ void wxWindow::ScrollWindow( int dx, int dy, const wxRect* WXUNUSED(rect) )
         m_scrollGC = gdk_gc_new( m_wxwindow->window );
         gdk_gc_set_exposures( m_scrollGC, TRUE );
     }
+    
+    wxNode *node = m_children.First();
+    while (node)
+    {
+        wxWindow *child = (wxWindow*) node->Data();
+	child->Move( child->m_x + dx, child->m_y + dy );
+	node = node->Next();
+    }
 
     int cw = 0;
     int ch = 0;
@@ -2890,14 +2898,6 @@ void wxWindow::ScrollWindow( int dx, int dy, const wxRect* WXUNUSED(rect) )
 
         Refresh( TRUE, &rect );
     }
-    
-    wxNode *node = m_children.First();
-    while (node)
-    {
-        wxWindow *child = (wxWindow*) node->Data();
-	child->Move( child->m_x + dx, child->m_y + dy );
-	node = node->Next();
-    }
 }
 
 void wxWindow::SetScrolling(bool scroll)
diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index 8a4523630a..7326273401 100644
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -2857,6 +2857,14 @@ void wxWindow::ScrollWindow( int dx, int dy, const wxRect* WXUNUSED(rect) )
         m_scrollGC = gdk_gc_new( m_wxwindow->window );
         gdk_gc_set_exposures( m_scrollGC, TRUE );
     }
+    
+    wxNode *node = m_children.First();
+    while (node)
+    {
+        wxWindow *child = (wxWindow*) node->Data();
+	child->Move( child->m_x + dx, child->m_y + dy );
+	node = node->Next();
+    }
 
     int cw = 0;
     int ch = 0;
@@ -2890,14 +2898,6 @@ void wxWindow::ScrollWindow( int dx, int dy, const wxRect* WXUNUSED(rect) )
 
         Refresh( TRUE, &rect );
     }
-    
-    wxNode *node = m_children.First();
-    while (node)
-    {
-        wxWindow *child = (wxWindow*) node->Data();
-	child->Move( child->m_x + dx, child->m_y + dy );
-	node = node->Next();
-    }
 }
 
 void wxWindow::SetScrolling(bool scroll)