X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/744d91d41f4756ca4ec61f0a375068a239a6126f..6d2190fcb4ba8c0a297a90ac233e88ad0c5cd13f:/tests/controls/treectrltest.cpp

diff --git a/tests/controls/treectrltest.cpp b/tests/controls/treectrltest.cpp
index c2a791c0a3..37e254a3a6 100644
--- a/tests/controls/treectrltest.cpp
+++ b/tests/controls/treectrltest.cpp
@@ -3,7 +3,6 @@
 // Purpose:     wxTreeCtrl unit test
 // Author:      Vadim Zeitlin
 // Created:     2008-11-26
-// RCS-ID:      $Id$
 // Copyright:   (c) 2008 Vadim Zeitlin <vadim@wxwidgets.org>
 //              (c) 2010 Steven Lamerton
 ///////////////////////////////////////////////////////////////////////////////
@@ -239,8 +238,8 @@ void TreeCtrlTestCase::SelectItemMulti()
 void TreeCtrlTestCase::ItemClick()
 {
 #if wxUSE_UIACTIONSIMULATOR
-    EventCounter activated(m_tree, wxEVT_COMMAND_TREE_ITEM_ACTIVATED);
-    EventCounter rclick(m_tree, wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK);
+    EventCounter activated(m_tree, wxEVT_TREE_ITEM_ACTIVATED);
+    EventCounter rclick(m_tree, wxEVT_TREE_ITEM_RIGHT_CLICK);
 
     wxUIActionSimulator sim;
 
@@ -266,7 +265,7 @@ void TreeCtrlTestCase::ItemClick()
 
 void TreeCtrlTestCase::DeleteItem()
 {
-    EventCounter deleteitem(m_tree, wxEVT_COMMAND_TREE_DELETE_ITEM);
+    EventCounter deleteitem(m_tree, wxEVT_TREE_DELETE_ITEM);
 
     wxTreeItemId todelete = m_tree->AppendItem(m_root, "deleteme");
     m_tree->Delete(todelete);
@@ -280,8 +279,8 @@ void TreeCtrlTestCase::DeleteItem()
 
 void TreeCtrlTestCase::LabelEdit()
 {
-    EventCounter beginedit(m_tree, wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT);
-    EventCounter endedit(m_tree, wxEVT_COMMAND_TREE_END_LABEL_EDIT);
+    EventCounter beginedit(m_tree, wxEVT_TREE_BEGIN_LABEL_EDIT);
+    EventCounter endedit(m_tree, wxEVT_TREE_END_LABEL_EDIT);
 
     wxUIActionSimulator sim;
 
@@ -301,7 +300,7 @@ void TreeCtrlTestCase::LabelEdit()
 
 void TreeCtrlTestCase::KeyDown()
 {
-    EventCounter keydown(m_tree, wxEVT_COMMAND_TREE_KEY_DOWN);
+    EventCounter keydown(m_tree, wxEVT_TREE_KEY_DOWN);
 
     wxUIActionSimulator sim;
 
@@ -318,10 +317,10 @@ void TreeCtrlTestCase::CollapseExpandEvents()
 {
     m_tree->CollapseAll();
 
-    EventCounter collapsed(m_tree, wxEVT_COMMAND_TREE_ITEM_COLLAPSED);
-    EventCounter collapsing(m_tree, wxEVT_COMMAND_TREE_ITEM_COLLAPSING);
-    EventCounter expanded(m_tree, wxEVT_COMMAND_TREE_ITEM_EXPANDED);
-    EventCounter expanding(m_tree, wxEVT_COMMAND_TREE_ITEM_EXPANDING);
+    EventCounter collapsed(m_tree, wxEVT_TREE_ITEM_COLLAPSED);
+    EventCounter collapsing(m_tree, wxEVT_TREE_ITEM_COLLAPSING);
+    EventCounter expanded(m_tree, wxEVT_TREE_ITEM_EXPANDED);
+    EventCounter expanding(m_tree, wxEVT_TREE_ITEM_EXPANDING);
 
     wxUIActionSimulator sim;
 
@@ -352,14 +351,14 @@ void TreeCtrlTestCase::SelectionChange()
     m_tree->ExpandAll();
     m_tree->UnselectAll();
 
-    EventCounter changed(m_tree, wxEVT_COMMAND_TREE_SEL_CHANGED);
-    EventCounter changing(m_tree, wxEVT_COMMAND_TREE_SEL_CHANGING);
+    EventCounter changed(m_tree, wxEVT_TREE_SEL_CHANGED);
+    EventCounter changing(m_tree, wxEVT_TREE_SEL_CHANGING);
 
     wxUIActionSimulator sim;
 
     wxRect poschild1, poschild2;
     m_tree->GetBoundingRect(m_child1, poschild1, true);
-    m_tree->GetBoundingRect(m_child1, poschild2, true);
+    m_tree->GetBoundingRect(m_child2, poschild2, true);
 
     // We move in slightly so we are not on the edge
     wxPoint point1 = m_tree->ClientToScreen(poschild1.GetPosition()) + wxPoint(4, 4);
@@ -385,7 +384,7 @@ void TreeCtrlTestCase::SelectionChange()
 
 void TreeCtrlTestCase::Menu()
 {
-    EventCounter menu(m_tree, wxEVT_COMMAND_TREE_ITEM_MENU);
+    EventCounter menu(m_tree, wxEVT_TREE_ITEM_MENU);
     wxUIActionSimulator sim;
 
     wxRect pos;