[GB.GUI.BASE]

* BUG: Fix TreeView renaming box position.
* BUG: Fix removing of items having children.


git-svn-id: svn://localhost/gambas/trunk@5252 867c0c6c-44f3-4631-809d-bfa615b0a4ec

comp/src/gb.gui.base/.project

@@ -6,7 +6,7 @@ Version=3.3.90
 VersionFile=1
 Component=gb.image
 Component=gb.gui
-Environment="GB_GUI=gb.gtk"
+Environment="GB_GUI=gb.qt4"
 TabSize=2
 Type=Component
 Packager=1

comp/src/gb.gui.base/.src/Test/FTreeView.form

@@ -20,5 +20,6 @@
   { tvwTest ColumnView
     MoveScaled(14,12,24,19)
     Expand = True
+    Editable = True
   }
 }

comp/src/gb.gui.base/.src/TreeView/_TreeView.class

@@ -171,13 +171,12 @@ Private Sub RemoveRec(Key As String)
   hItem = $cItem[Key]
   
   If hItem.Count Then
-    For Each sKey In hItem._GetChildren()
+    For Each sKey In hItem._GetChildren().Copy()
       RemoveRec(sKey)
     Next
   Endif
   
   hParent = GetParentItem(hItem)
-  $cItem.Remove(Key)
   
   hParent._RemoveChild(Key)
   While hParent.Expanded 
@@ -189,6 +188,8 @@ Private Sub RemoveRec(Key As String)
     Endif
   Wend
   
+  $cItem.Remove(Key)
+  
 End
 
 

comp/src/gb.gui.base/.src/TreeView/_TreeView_Item.class

@@ -181,7 +181,8 @@ End
 
 Private Function X_Read() As Integer
 
-  Return GetTree()._GetItemX(Me) - GetView().ScrollX
+  Dim hView As GridView = GetView()
+  Return GetTree()._GetItemX(Me) - hView.ScrollX + hView.ClientX
 
 End
 
@@ -189,7 +190,7 @@ Private Function Y_Read() As Integer
 
   Dim hTree As _TreeView = GetTree()
   Dim hView As GridView = GetView()
-  Return hView.Rows[hTree._ItemToRow(Me)].Y - hView.ScrollY
+  Return hView.Rows[hTree._ItemToRow(Me)].Y - hView.ScrollY + hView.Columns.Height + hView.ClientY
 
 End