Added SetSelectionMode

[wxWidgets.git] / samples / treectrl / treetest.cpp

diff --git a/samples/treectrl/treetest.cpp b/samples/treectrl/treetest.cpp
index 46e44ed2388d346224e0595721b38e3863e32512..2b46734d3fc6429701b20dae67be268411293724 100644 (file)
--- a/samples/treectrl/treetest.cpp
+++ b/samples/treectrl/treetest.cpp
@@ -33,24 +33,21 @@
 
 #include "math.h"
 
 
 #include "math.h"
 

-#ifdef __WXMSW__
-    // comment out this line to test multiple selection even under MSW (where
-    // it looks ugly - but works)
-    #define NO_MULTIPLE_SELECTION
+#ifdef __WIN32__
+    // this is not supported by native control
+    #define NO_VARIABLE_HEIGHT

 #endif
 
 #endif
 

-#define NO_VARIABLE_HEIGHT
-

 #include "treetest.h"
 
 // under Windows the icons are in the .rc file
 #ifndef __WXMSW__
 #include "treetest.h"
 
 // under Windows the icons are in the .rc file
 #ifndef __WXMSW__

-  #include "icon1.xpm"
-  #include "icon2.xpm"
-  #include "icon3.xpm"
-  #include "icon4.xpm"
-  #include "icon5.xpm"
-  #include "mondrian.xpm"
+    #include "icon1.xpm"
+    #include "icon2.xpm"
+    #include "icon3.xpm"
+    #include "icon4.xpm"
+    #include "icon5.xpm"
+    #include "mondrian.xpm"

 #endif
 
 // verify that the item is ok and insult the user if it is not
 #endif
 
 // verify that the item is ok and insult the user if it is not


@@ -63,6 +60,8 @@
                            }
 
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
                            }
 
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)

+    EVT_SIZE(MyFrame::OnSize)
+

     EVT_MENU(TreeTest_Quit, MyFrame::OnQuit)
     EVT_MENU(TreeTest_About, MyFrame::OnAbout)
     EVT_MENU(TreeTest_Dump, MyFrame::OnDump)
     EVT_MENU(TreeTest_Quit, MyFrame::OnQuit)
     EVT_MENU(TreeTest_About, MyFrame::OnAbout)
     EVT_MENU(TreeTest_Dump, MyFrame::OnDump)


@@ -70,6 +69,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(TreeTest_DumpSelected, MyFrame::OnDumpSelected)
     EVT_MENU(TreeTest_Select, MyFrame::OnSelect)
     EVT_MENU(TreeTest_Unselect, MyFrame::OnUnselect)
     EVT_MENU(TreeTest_DumpSelected, MyFrame::OnDumpSelected)
     EVT_MENU(TreeTest_Select, MyFrame::OnSelect)
     EVT_MENU(TreeTest_Unselect, MyFrame::OnUnselect)

+    EVT_MENU(TreeTest_ToggleSel, MyFrame::OnToggleSel)

 #endif // NO_MULTIPLE_SELECTION
     EVT_MENU(TreeTest_Rename, MyFrame::OnRename)
     EVT_MENU(TreeTest_Count, MyFrame::OnCount)
 #endif // NO_MULTIPLE_SELECTION
     EVT_MENU(TreeTest_Rename, MyFrame::OnRename)
     EVT_MENU(TreeTest_Count, MyFrame::OnCount)


@@ -82,6 +82,8 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(TreeTest_DeleteChildren, MyFrame::OnDeleteChildren)
     EVT_MENU(TreeTest_DeleteAll, MyFrame::OnDeleteAll)
     EVT_MENU(TreeTest_Recreate, MyFrame::OnRecreate)
     EVT_MENU(TreeTest_DeleteChildren, MyFrame::OnDeleteChildren)
     EVT_MENU(TreeTest_DeleteAll, MyFrame::OnDeleteAll)
     EVT_MENU(TreeTest_Recreate, MyFrame::OnRecreate)

+    EVT_MENU(TreeTest_ToggleImages, MyFrame::OnToggleImages)
+    EVT_MENU(TreeTest_SetImageSize, MyFrame::OnSetImageSize)

     EVT_MENU(TreeTest_CollapseAndReset, MyFrame::OnCollapseAndReset)
     EVT_MENU(TreeTest_EnsureVisible, MyFrame::OnEnsureVisible)
     EVT_MENU(TreeTest_AddItem, MyFrame::OnAddItem)
     EVT_MENU(TreeTest_CollapseAndReset, MyFrame::OnCollapseAndReset)
     EVT_MENU(TreeTest_EnsureVisible, MyFrame::OnEnsureVisible)
     EVT_MENU(TreeTest_AddItem, MyFrame::OnAddItem)


@@ -120,7 +122,7 @@ IMPLEMENT_APP(MyApp)
 bool MyApp::OnInit()
 {
     // Create the main frame window
 bool MyApp::OnInit()
 {
     // Create the main frame window

-    MyFrame *frame = new MyFrame("wxTreeCtrl Test", 50, 50, 450, 340);
+    MyFrame *frame = new MyFrame("wxTreeCtrl Test", 50, 50, 450, 600);

 
     // Show the frame
     frame->Show(TRUE);
 
     // Show the frame
     frame->Show(TRUE);


@@ -132,7 +134,8 @@ bool MyApp::OnInit()
 
 // My frame constructor
 MyFrame::MyFrame(const wxString& title, int x, int y, int w, int h)
 
 // My frame constructor
 MyFrame::MyFrame(const wxString& title, int x, int y, int w, int h)

-       : wxFrame((wxFrame *)NULL, -1, title, wxPoint(x, y), wxSize(w, h))
+       : wxFrame((wxFrame *)NULL, -1, title, wxPoint(x, y), wxSize(w, h)),
+         m_treeCtrl(NULL), m_textCtrl(NULL)

 {
     // This reduces flicker effects - even better would be to define
     // OnEraseBackground to do nothing. When the tree control's scrollbars are
 {
     // This reduces flicker effects - even better would be to define
     // OnEraseBackground to do nothing. When the tree control's scrollbars are


@@ -149,8 +152,13 @@ MyFrame::MyFrame(const wxString& title, int x, int y, int w, int h)
 
     file_menu->Append(TreeTest_About, "&About...");
     file_menu->AppendSeparator();
 
     file_menu->Append(TreeTest_About, "&About...");
     file_menu->AppendSeparator();

-    file_menu->Append(TreeTest_Quit, "E&xit");
+    file_menu->Append(TreeTest_Quit, "E&xit\tAlt-X");

 
 

+#ifndef NO_MULTIPLE_SELECTION
+    tree_menu->Append(TreeTest_ToggleSel, "&Toggle selection mode");
+#endif // NO_MULTIPLE_SELECTION
+    tree_menu->Append(TreeTest_ToggleImages, "&Show images", "", TRUE);
+    tree_menu->Append(TreeTest_SetImageSize, "Set image si&ze...");

     tree_menu->Append(TreeTest_Recreate, "&Recreate the tree");
     tree_menu->Append(TreeTest_CollapseAndReset, "C&ollapse and reset");
     tree_menu->AppendSeparator();
     tree_menu->Append(TreeTest_Recreate, "&Recreate the tree");
     tree_menu->Append(TreeTest_CollapseAndReset, "C&ollapse and reset");
     tree_menu->AppendSeparator();


@@ -188,7 +196,7 @@ MyFrame::MyFrame(const wxString& title, int x, int y, int w, int h)
     item_menu->Append(TreeTest_DumpSelected, "Dump selected items\tAlt-D");
     item_menu->Append(TreeTest_Select, "Select current item\tAlt-S");
     item_menu->Append(TreeTest_Unselect, "Unselect everything\tAlt-U");
     item_menu->Append(TreeTest_DumpSelected, "Dump selected items\tAlt-D");
     item_menu->Append(TreeTest_Select, "Select current item\tAlt-S");
     item_menu->Append(TreeTest_Unselect, "Unselect everything\tAlt-U");

-#endif
+#endif // NO_MULTIPLE_SELECTION

 
     wxMenuBar *menu_bar = new wxMenuBar;
     menu_bar->Append(file_menu, "&File");
 
     wxMenuBar *menu_bar = new wxMenuBar;
     menu_bar->Append(file_menu, "&File");


@@ -196,13 +204,12 @@ MyFrame::MyFrame(const wxString& title, int x, int y, int w, int h)
     menu_bar->Append(item_menu, "&Item");
     SetMenuBar(menu_bar);
 
     menu_bar->Append(item_menu, "&Item");
     SetMenuBar(menu_bar);
 

+    menu_bar->Check(TreeTest_ToggleImages, TRUE);
+

     m_treeCtrl = new MyTreeCtrl(this, TreeTest_Ctrl,
                                 wxDefaultPosition, wxDefaultSize,
                                 wxTR_HAS_BUTTONS |
                                 wxTR_EDIT_LABELS |
     m_treeCtrl = new MyTreeCtrl(this, TreeTest_Ctrl,
                                 wxDefaultPosition, wxDefaultSize,
                                 wxTR_HAS_BUTTONS |
                                 wxTR_EDIT_LABELS |

-#ifndef NO_MULTIPLE_SELECTION
-                                wxTR_MULTIPLE |
-#endif

 #ifndef NO_VARIABLE_HEIGHT
                                 wxTR_HAS_VARIABLE_ROW_HEIGHT |
 #endif
 #ifndef NO_VARIABLE_HEIGHT
                                 wxTR_HAS_VARIABLE_ROW_HEIGHT |
 #endif


@@ -210,25 +217,10 @@ MyFrame::MyFrame(const wxString& title, int x, int y, int w, int h)
 
     m_treeCtrl->SetBackgroundColour(wxColour(204, 205, 79));
 
 
     m_treeCtrl->SetBackgroundColour(wxColour(204, 205, 79));
 

-    wxTextCtrl *textCtrl = new wxTextCtrl(this, -1, "",
+    m_textCtrl = new wxTextCtrl(this, -1, "",

                                 wxDefaultPosition, wxDefaultSize,
                                 wxTE_MULTILINE | wxSUNKEN_BORDER);
 
                                 wxDefaultPosition, wxDefaultSize,
                                 wxTE_MULTILINE | wxSUNKEN_BORDER);
 

-    wxLayoutConstraints *c = new wxLayoutConstraints;
-    c->top.SameAs(this, wxTop);
-    c->left.SameAs(this, wxLeft);
-    c->right.SameAs(this, wxRight);
-    c->height.PercentOf(this, wxHeight, 66);
-    m_treeCtrl->SetConstraints(c);
-
-    c = new wxLayoutConstraints;
-    c->top.Below(m_treeCtrl);
-    c->left.SameAs(this, wxLeft);
-    c->right.SameAs(this, wxRight);
-    c->bottom.SameAs(this, wxBottom);
-    textCtrl->SetConstraints(c);
-    SetAutoLayout(TRUE);
-

     // create a status bar with 3 panes
     CreateStatusBar(3);
     SetStatusText("", 0);
     // create a status bar with 3 panes
     CreateStatusBar(3);
     SetStatusText("", 0);


@@ -239,7 +231,7 @@ MyFrame::MyFrame(const wxString& title, int x, int y, int w, int h)
     delete wxLog::SetActiveTarget(new wxLogStderr);
 #else
     // set our text control as the log target
     delete wxLog::SetActiveTarget(new wxLogStderr);
 #else
     // set our text control as the log target

-    wxLogTextCtrl *logWindow = new wxLogTextCtrl(textCtrl);
+    wxLogTextCtrl *logWindow = new wxLogTextCtrl(m_textCtrl);

     delete wxLog::SetActiveTarget(logWindow);
 #endif
 }
     delete wxLog::SetActiveTarget(logWindow);
 #endif
 }


@@ -249,6 +241,22 @@ MyFrame::~MyFrame()
     delete wxLog::SetActiveTarget(NULL);
 }
 
     delete wxLog::SetActiveTarget(NULL);
 }
 

+void MyFrame::OnSize(wxSizeEvent& event)
+{
+    if ( m_treeCtrl && m_textCtrl )
+    {
+        Resize(GetClientSize());
+    }
+
+    event.Skip();
+}
+
+void MyFrame::Resize(const wxSize& size)
+{
+    m_treeCtrl->SetSize(0, 0, size.x, 2*size.y/3);
+    m_textCtrl->SetSize(0, 2*size.y/3, size.x, size.y/3);
+}
+

 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
     Close(TRUE);
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
     Close(TRUE);


@@ -325,6 +333,22 @@ void MyFrame::OnDump(wxCommandEvent& WXUNUSED(event))
 
 #ifndef NO_MULTIPLE_SELECTION
 
 
 #ifndef NO_MULTIPLE_SELECTION
 

+void MyFrame::OnToggleSel(wxCommandEvent& WXUNUSED(event))
+{
+    long style = m_treeCtrl->GetWindowStyle();
+    if ( style & wxTR_MULTIPLE )
+        style &= ~wxTR_MULTIPLE;
+    else
+        style |= wxTR_MULTIPLE;
+
+    delete m_treeCtrl;
+
+    m_treeCtrl = new MyTreeCtrl(this, TreeTest_Ctrl,
+                                wxDefaultPosition, wxDefaultSize,
+                                style);
+    Resize(GetClientSize());
+}
+

 void MyFrame::OnDumpSelected(wxCommandEvent& WXUNUSED(event))
 {
     wxArrayTreeItemIds array;
 void MyFrame::OnDumpSelected(wxCommandEvent& WXUNUSED(event))
 {
     wxArrayTreeItemIds array;


@@ -388,6 +412,27 @@ void MyFrame::OnRecreate(wxCommandEvent& event)
     m_treeCtrl->AddTestItemsToTree(3, 2);
 }
 
     m_treeCtrl->AddTestItemsToTree(3, 2);
 }
 

+void MyFrame::OnSetImageSize(wxCommandEvent& event)
+{
+    long size = wxGetNumberFromUser("Enter the size for the images to use",
+                                    "Size: ",
+                                    "TreeCtrl sample",
+                                    32);
+    if ( size == -1 )
+        return;
+
+    m_treeCtrl->CreateImageList((int)size);
+
+    OnRecreate(event);
+}
+
+void MyFrame::OnToggleImages(wxCommandEvent& event)
+{
+    wxGetApp().SetShowImages(!wxGetApp().ShowImages());
+
+    OnRecreate(event);
+}
+

 void MyFrame::OnCollapseAndReset(wxCommandEvent& event)
 {
     m_treeCtrl->CollapseAndReset(m_treeCtrl->GetRootItem());
 void MyFrame::OnCollapseAndReset(wxCommandEvent& event)
 {
     m_treeCtrl->CollapseAndReset(m_treeCtrl->GetRootItem());


@@ -400,7 +445,8 @@ void MyFrame::OnEnsureVisible(wxCommandEvent& event)
 
 void MyFrame::OnInsertItem(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnInsertItem(wxCommandEvent& WXUNUSED(event))
 {

-    m_treeCtrl->InsertItem(m_treeCtrl->GetRootItem(), 1, "2nd item");
+    int image = wxGetApp().ShowImages() ? MyTreeCtrl::TreeCtrlIcon_File : -1;
+    m_treeCtrl->InsertItem(m_treeCtrl->GetRootItem(), image, "2nd item");

 }
 
 void MyFrame::OnAddItem(wxCommandEvent& WXUNUSED(event))
 }
 
 void MyFrame::OnAddItem(wxCommandEvent& WXUNUSED(event))


@@ -460,49 +506,59 @@ MyTreeCtrl::MyTreeCtrl(wxWindow *parent, const wxWindowID id,
                        long style)
           : wxTreeCtrl(parent, id, pos, size, style)
 {
                        long style)
           : wxTreeCtrl(parent, id, pos, size, style)
 {

-#ifndef NO_VARIABLE_HEIGHT
-#if wxUSE_LIBJPEG
-    wxImage::AddHandler(new wxJPEGHandler);
-    wxImage image;
+    m_reverseSort = FALSE;

 
 

-    image.LoadFile(wxString("horse.jpg"), wxBITMAP_TYPE_JPEG );
-#endif
-#endif
+    CreateImageList();

 
 

-    m_reverseSort = FALSE;
+    // Add some items to the tree
+    AddTestItemsToTree(3, 2);
+}
+
+void MyTreeCtrl::CreateImageList(int size)
+{
+    delete m_imageListNormal;
+
+    if ( size == -1 )
+    {
+        m_imageListNormal = NULL;
+
+        return;
+    }

 
     // Make an image list containing small icons
 
     // Make an image list containing small icons

-    m_imageListNormal = new wxImageList(16, 16, TRUE);
+    m_imageListNormal = new wxImageList(size, size, TRUE);

 
     // should correspond to TreeCtrlIcon_xxx enum
 #if defined(__WXMSW__) && defined(__WIN16__)
 
     // should correspond to TreeCtrlIcon_xxx enum
 #if defined(__WXMSW__) && defined(__WIN16__)

-    // This is required in 16-bit Windows mode only because we can't load a specific (16x16)
-    // icon image, so it comes out stretched
-#  ifndef NO_VARIABLE_HEIGHT
-    m_imageListNormal->Add(image.ConvertToBitmap());
-#  else

     m_imageListNormal->Add(wxBitmap("bitmap1", wxBITMAP_TYPE_BMP_RESOURCE));
     m_imageListNormal->Add(wxBitmap("bitmap1", wxBITMAP_TYPE_BMP_RESOURCE));

-#  endif

     m_imageListNormal->Add(wxBitmap("bitmap2", wxBITMAP_TYPE_BMP_RESOURCE));
     m_imageListNormal->Add(wxBitmap("bitmap3", wxBITMAP_TYPE_BMP_RESOURCE));
     m_imageListNormal->Add(wxBitmap("bitmap4", wxBITMAP_TYPE_BMP_RESOURCE));
     m_imageListNormal->Add(wxBitmap("bitmap5", wxBITMAP_TYPE_BMP_RESOURCE));
 #else
     m_imageListNormal->Add(wxBitmap("bitmap2", wxBITMAP_TYPE_BMP_RESOURCE));
     m_imageListNormal->Add(wxBitmap("bitmap3", wxBITMAP_TYPE_BMP_RESOURCE));
     m_imageListNormal->Add(wxBitmap("bitmap4", wxBITMAP_TYPE_BMP_RESOURCE));
     m_imageListNormal->Add(wxBitmap("bitmap5", wxBITMAP_TYPE_BMP_RESOURCE));
 #else

-#  ifndef NO_VARIABLE_HEIGHT
-    m_imageListNormal->Add(image.ConvertToBitmap());
-#  else
-    m_imageListNormal->Add(wxICON(icon1));
-#  endif
-    m_imageListNormal->Add(wxICON(icon2));
-    m_imageListNormal->Add(wxICON(icon3));
-    m_imageListNormal->Add(wxICON(icon4));
-    m_imageListNormal->Add(wxICON(icon5));
+    wxIcon icons[5];
+    icons[0] = wxICON(icon1);
+    icons[1] = wxICON(icon2);
+    icons[2] = wxICON(icon3);
+    icons[3] = wxICON(icon4);
+    icons[4] = wxICON(icon5);
+
+    int sizeOrig = icons[0].GetWidth();
+    for ( size_t i = 0; i < WXSIZEOF(icons); i++ )
+    {
+        if ( size == sizeOrig )
+        {
+            m_imageListNormal->Add(icons[i]);
+        }
+        else
+        {
+            m_imageListNormal->Add(wxImage(icons[i]).Rescale(size, size).
+                                    ConvertToBitmap());
+        }
+    }

 #endif
 
     SetImageList(m_imageListNormal);
 #endif
 
     SetImageList(m_imageListNormal);

-
-    // Add some items to the tree
-    AddTestItemsToTree(3, 2);

 }
 
 MyTreeCtrl::~MyTreeCtrl()
 }
 
 MyTreeCtrl::~MyTreeCtrl()


@@ -544,12 +600,21 @@ void MyTreeCtrl::AddItemsRecursively(const wxTreeItemId& idParent,
 
             // here we pass to AppendItem() normal and selected item images (we
             // suppose that selected image follows the normal one in the enum)
 
             // here we pass to AppendItem() normal and selected item images (we
             // suppose that selected image follows the normal one in the enum)

-            int image = depth == 1 ? TreeCtrlIcon_File : TreeCtrlIcon_Folder;
-            wxTreeItemId id = AppendItem(idParent, str, image, image + 1,
+            int image, imageSel;
+            if ( wxGetApp().ShowImages() )
+            {
+                image = depth == 1 ? TreeCtrlIcon_File : TreeCtrlIcon_Folder;
+                imageSel = image + 1;
+            }
+            else
+            {
+                image = imageSel = -1;
+            }
+            wxTreeItemId id = AppendItem(idParent, str, image, imageSel,

                                          new MyTreeItemData(str));
 
             // and now we also set the expanded one (only for the folders)
                                          new MyTreeItemData(str));
 
             // and now we also set the expanded one (only for the folders)

-            if ( hasChildren )
+            if ( hasChildren && wxGetApp().ShowImages() )

             {
                 SetItemImage(id, TreeCtrlIcon_FolderOpened,
                              wxTreeItemIcon_Expanded);
             {
                 SetItemImage(id, TreeCtrlIcon_FolderOpened,
                              wxTreeItemIcon_Expanded);


@@ -570,10 +635,14 @@ void MyTreeCtrl::AddItemsRecursively(const wxTreeItemId& idParent,
 void MyTreeCtrl::AddTestItemsToTree(size_t numChildren,
                                     size_t depth)
 {
 void MyTreeCtrl::AddTestItemsToTree(size_t numChildren,
                                     size_t depth)
 {

+    int image = wxGetApp().ShowImages() ? MyTreeCtrl::TreeCtrlIcon_Folder : -1;

     wxTreeItemId rootId = AddRoot("Root",
     wxTreeItemId rootId = AddRoot("Root",

-                                  TreeCtrlIcon_Folder, TreeCtrlIcon_Folder,
+                                  image, image,

                                   new MyTreeItemData("Root item"));
                                   new MyTreeItemData("Root item"));

-    SetItemImage(rootId, TreeCtrlIcon_FolderOpened, wxTreeItemIcon_Expanded);
+    if ( image != -1 )
+    {
+        SetItemImage(rootId, TreeCtrlIcon_FolderOpened, wxTreeItemIcon_Expanded);
+    }

 
     AddItemsRecursively(rootId, numChildren, depth, 0);
 
 
     AddItemsRecursively(rootId, numChildren, depth, 0);
 


@@ -622,9 +691,10 @@ void MyTreeCtrl::DoToggleIcon(const wxTreeItemId& item)
 
 // avoid repetition
 #define TREE_EVENT_HANDLER(name)                            \
 
 // avoid repetition
 #define TREE_EVENT_HANDLER(name)                            \

-void MyTreeCtrl::name(wxTreeEvent& WXUNUSED(event))         \
+void MyTreeCtrl::name(wxTreeEvent& event)                   \

 {                                                           \
     wxLogMessage(#name);                                    \
 {                                                           \
     wxLogMessage(#name);                                    \

+    event.Skip();                                           \

 }
 
 TREE_EVENT_HANDLER(OnBeginRDrag)
 }
 
 TREE_EVENT_HANDLER(OnBeginRDrag)


@@ -636,6 +706,7 @@ TREE_EVENT_HANDLER(OnItemExpanding)
 TREE_EVENT_HANDLER(OnItemCollapsed)
 TREE_EVENT_HANDLER(OnSelChanged)
 TREE_EVENT_HANDLER(OnSelChanging)
 TREE_EVENT_HANDLER(OnItemCollapsed)
 TREE_EVENT_HANDLER(OnSelChanged)
 TREE_EVENT_HANDLER(OnSelChanging)

+TREE_EVENT_HANDLER(OnTreeKeyDown)

 
 #undef TREE_EVENT_HANDLER
 
 
 #undef TREE_EVENT_HANDLER
 


@@ -688,7 +759,8 @@ void MyTreeCtrl::OnEndDrag(wxTreeEvent& event)
     //
     // Finally, we only copy one item here but we might copy the entire tree if
     // we were dragging a folder.
     //
     // Finally, we only copy one item here but we might copy the entire tree if
     // we were dragging a folder.

-    AppendItem(itemDst, text);
+    int image = wxGetApp().ShowImages() ? TreeCtrlIcon_File : -1;
+    AppendItem(itemDst, text, image);

 }
 
 void MyTreeCtrl::OnBeginLabelEdit(wxTreeEvent& event)
 }
 
 void MyTreeCtrl::OnBeginLabelEdit(wxTreeEvent& event)


@@ -732,15 +804,10 @@ void MyTreeCtrl::OnItemCollapsing(wxTreeEvent& event)
     }
 }
 
     }
 }
 

-void MyTreeCtrl::OnTreeKeyDown(wxTreeEvent&WXUNUSED(event))
-{
-    wxLogMessage("OnTreeKeyDown");
-}
-
-void MyTreeCtrl::OnItemActivated(wxTreeEvent&WXUNUSED(event))
+void MyTreeCtrl::OnItemActivated(wxTreeEvent& event)

 {
     // show some info about this item
 {
     // show some info about this item

-    wxTreeItemId itemId = GetSelection();
+    wxTreeItemId itemId = event.GetItem();

     MyTreeItemData *item = (MyTreeItemData *)GetItemData(itemId);
 
     if ( item != NULL )
     MyTreeItemData *item = (MyTreeItemData *)GetItemData(itemId);
 
     if ( item != NULL )