]> git.saurik.com Git - wxWidgets.git/commitdiff
renamed treectrl sample
authorRon Lee <ron@debian.org>
Tue, 14 Mar 2000 18:37:46 +0000 (18:37 +0000)
committerRon Lee <ron@debian.org>
Tue, 14 Mar 2000 18:37:46 +0000 (18:37 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6706 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

19 files changed:
samples/treectrl/Makefile.in
samples/treectrl/makefile.b32
samples/treectrl/makefile.bcc
samples/treectrl/makefile.dos
samples/treectrl/makefile.g95
samples/treectrl/makefile.sc [new file with mode: 0644]
samples/treectrl/makefile.sl [new file with mode: 0644]
samples/treectrl/makefile.twn [new file with mode: 0644]
samples/treectrl/makefile.unx [new file with mode: 0644]
samples/treectrl/makefile.vc
samples/treectrl/makefile.wat
samples/treectrl/treectrl.cpp [new file with mode: 0644]
samples/treectrl/treectrl.def [new file with mode: 0644]
samples/treectrl/treectrl.h [new file with mode: 0644]
samples/treectrl/treectrl.rc [new file with mode: 0644]
samples/treectrl/treetest.cpp [deleted file]
samples/treectrl/treetest.def [deleted file]
samples/treectrl/treetest.h [deleted file]
samples/treectrl/treetest.rc [deleted file]

index fb2aa114c066bf09ad9e4074a4ac242ceb0af0fe..5a08e1e4279c2bec96729218c4c0d0275bc73b83 100644 (file)
@@ -1,19 +1,11 @@
-#
-# File:                makefile.unx
-# Author:      Julian Smart
-# Created:     1998
-# Updated:     
-# Copyright:   (c) 1998 Julian Smart
-#
-# "%W% %G%"
-#
-# Makefile for treectrl example (UNIX).
+# Purpose: makefile for treectrl example (UNIX).
+# Created: 2000-03-15
 
 top_srcdir = @top_srcdir@/..
 top_builddir = ../..
 program_dir = samples/treectrl
 
-PROGRAM=treetest
+PROGRAM=treectrl
 
 OBJECTS=$(PROGRAM).o
 
index ebd42c200db218e167a31b169918669b5fa66b7b..a773d2eca491fbb497018465e2613bc438ff66fe 100644 (file)
@@ -1,15 +1,9 @@
-#
-# File:                makefile.b32
-# Author:      Julian Smart
-# Created:     1999
-# Updated:     
-# Copyright:
-#
-# Makefile : Builds sample for 32-bit BC++
+# Purpose: makefile for treectrl example (BC++ 32bit)
+# Created: 2000-03-15
 
 WXDIR = $(WXWIN)
 
-TARGET=treetest
+TARGET=treectrl
 OBJECTS = $(TARGET).obj
 
 !include $(WXDIR)\src\makeprog.b32
index 6956ffe0d34c08e928179eed9a4773157693444a..1b873327e7e636f558cd4b6ce09e108561d94c6a 100644 (file)
@@ -1,10 +1,5 @@
-#
-# File:                makefile.bcc
-# Author:      Julian Smart
-# Created:     1998
-# Updated:     
-#
-# Builds a BC++ 16-bit sample
+# Purpose: makefile for treectrl example (BC++ 16bit)
+# Created: 2000-03-15
 
 !if "$(WXWIN)" == ""
 !error You must define the WXWIN variable in autoexec.bat, e.g. WXWIN=c:\wx
@@ -12,7 +7,7 @@
 
 WXDIR = $(WXWIN)
 
-TARGET=treetest
+TARGET=treectrl
 OBJECTS=$(TARGET).obj
 
 !include $(WXDIR)\src\makeprog.bcc
index c1d52b22bfc53abda153d53d1a312a215f8b1e81..5522bfd2d0659b4dc5d09a9cf18ee3ca3de48ddb 100644 (file)
@@ -1,17 +1,10 @@
-#
-# File:                makefile.dos
-# Author:      Julian Smart
-# Created:     1998
-# Updated:     
-#
-# Makefile : Builds 16-bit sample, VC++ 1.5
-# Use FINAL=1 argument to nmake to build final version with no debugging
-# info
+# Purpose: makefile for treectrl example (VC++ 1.5x)
+# Created: 2000-03-15
 
 WXDIR = $(WXWIN)
 
-TARGET=treetest
-OBJECTS = $(TARGET).obj
+TARGET=treectrl
+OBJECTS=$(TARGET).obj
 
 !include $(WXDIR)\src\makeprog.msc
 
index b6e6ff10af75c66c99252497f91021a1d07de648..431577814bd9986571ec85c5da53051764335c44 100644 (file)
@@ -1,16 +1,10 @@
-#
-# File:         makefile.g95
-# Author:       Julian Smart
-# Created:      1999
-# Updated:
-# Copyright:    (c) Julian Smart, 1999
-#
-# Makefile for wxWindows sample (Cygwin/Mingw32).
+# Purpose: makefile for treectrl example (Cygwin/Mingw32)
+# Created: #03.01.00
 
 WXDIR = ../..
 
-TARGET=treetest
+TARGET=treectrl
 OBJECTS = $(TARGET).o
 
-include $(WXDIR)/src/makeprog.g95
+include $(WXDIR)\src\makeprog.g95
 
diff --git a/samples/treectrl/makefile.sc b/samples/treectrl/makefile.sc
new file mode 100644 (file)
index 0000000..d45d3f8
--- /dev/null
@@ -0,0 +1,37 @@
+# Purpose: makefile for treectrl example (Symantec C++)
+# Created: 2000-03-15
+
+WXDIR = $(WXWIN)
+WXLIB = $(WXDIR)\lib\wx.lib
+INCDIR = $(WXDIR)\include
+INCLUDE=$(INCDIR)
+TARGET=treectrl
+
+include $(WXDIR)\src\makesc.env
+
+treectrl.exe: treectrl.obj $(DEFFILE) treectrl.res
+       *$(CC) $(LDFLAGS) -o$@ $** $(LIBS)
+    *$(RC) -k treectrl.res
+
+sc32.def:
+     echo EXETYPE NT > sc32.def
+     echo SUBSYSTEM WINDOWS >> sc32.def
+
+sc16.def:
+     echo NAME $(TARGET) > sc16.def
+     echo EXETYPE WINDOWS >> sc16.def
+     echo STUB         'WINSTUB.EXE' >> sc16.def
+     echo CODE         PRELOAD MOVEABLE DISCARDABLE >> sc16.def
+     echo DATA         PRELOAD MOVEABLE MULTIPLE >> sc16.def
+     echo HEAPSIZE     1024 >> sc16.def
+     echo STACKSIZE    8192 >> sc16.def
+
+clean:
+    -del *.obj
+       -del *.exe
+       -del *.res
+       -del *.map
+       -del *.rws
+    -del sc32.def
+    -del sc16.def
+
diff --git a/samples/treectrl/makefile.sl b/samples/treectrl/makefile.sl
new file mode 100644 (file)
index 0000000..6dc21d5
--- /dev/null
@@ -0,0 +1,14 @@
+# Purpose: makefile for treectrl example (Salford C++)
+# Created: 2000-03-15
+
+PROGRAM = treectrl
+OBJECTS = $(PROGRAM).obj
+
+include ..\..\src\makeprog.sl
+
+all:        wx $(TARGET)
+
+wx:
+    cd $(WXDIR)\src\msw ^ mk32 -f makefile.sl all
+    cd $(WXDIR)\samples\treectrl
+
diff --git a/samples/treectrl/makefile.twn b/samples/treectrl/makefile.twn
new file mode 100644 (file)
index 0000000..32e0d50
--- /dev/null
@@ -0,0 +1,35 @@
+# Purpose: makefile for treectrl example (TWIN)
+# Created: 2000-03-15
+
+WXDIR = ../..
+
+# All common UNIX compiler flags and options are now in
+# this central makefile.
+include $(WXDIR)/src/maketwin.env
+
+OBJECTS = $(OBJDIR)/treectrl.$(OBJSUFF) $(OBJDIR)/treectrl.$(OBJSUFF)
+
+all:    $(OBJDIR) treectrl$(GUISUFFIX)$(EXESUFF)
+
+wx:
+
+$(OBJDIR):
+       mkdir $(OBJDIR)
+
+treectrl$(GUISUFFIX)$(EXESUFF):        $(OBJECTS) $(WXLIB)
+       $(CC) $(LDFLAGS) -o treectrl$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(LDLIBS)
+
+$(OBJDIR)/treectrl.$(OBJSUFF): treectrl.$(SRCSUFF)
+       $(CC) -c $(CPPFLAGS) -o $@ treectrl.$(SRCSUFF)
+
+treectrl.c:  treectrl.rc
+       $(RESCOMP) $(RCINPUTSWITCH) treectrl.rc $(RCOUTPUTSWITCH) treectrl.c $(RESFLAGS)
+
+$(OBJDIR)/treectrl.$(OBJSUFF): treectrl.c
+       $(CC) -c $(CPPFLAGS) -o $@ treectrl.c
+
+#$(OBJDIR)/treectrl.o:  treectrl.rc
+#      $(RESCOMP) $(RCINPUTSWITCH) treectrl.rc $(RCOUTPUTSWITCH) $(OBJDIR)/treectrl.o $(RESFLAGS)
+
+clean:
+       rm -f $(OBJECTS) treectrl$(GUISUFFIX).exe core *.rsc *.res
diff --git a/samples/treectrl/makefile.unx b/samples/treectrl/makefile.unx
new file mode 100644 (file)
index 0000000..71b7088
--- /dev/null
@@ -0,0 +1,23 @@
+# Purpose: makefile for treectrl example (Unix)
+# Created: 2000-03-15
+
+CC = gcc
+
+PROGRAM = treectrl
+
+OBJECTS = $(PROGRAM).o
+
+# implementation
+
+.SUFFIXES:     .o .cpp
+
+.cpp.o :
+       $(CC) -c `wx-config --cflags` -o $@ $<
+
+all:    $(PROGRAM)
+
+$(PROGRAM):    $(OBJECTS)
+       $(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+
+clean:
+       rm -f *.o $(PROGRAM)
index e784412750336093b07cb1c1d5dc99b7ccbb150d..9617fc40257ebe60e89704834f60b198a0c8d526 100644 (file)
@@ -1,17 +1,10 @@
-#
-# File:                makefile.vc
-# Author:      Julian Smart
-# Created:     1999
-# Updated:     
-# Copyright:   (c) Julian Smart
-#
-# Makefile : Builds sample (VC++, WIN32)
-# Use FINAL=1 argument to nmake to build final version with no debug info.
+# Purpose: makefile for treectrl example (VC++ 32bit)
+# Created: 2000-03-15
 
 # Set WXDIR for your system
 WXDIR = $(WXWIN)
 
-PROGRAM=treetest
+PROGRAM=treectrl
 OBJECTS = $(PROGRAM).obj
 
 !include $(WXDIR)\src\makeprog.vc
index 1e789d7fc5f0949581cf84e3ebf5a1e49ef0f3b0..4c4dc94463da8c03018d72a609b1addc6b4c8bbc 100644 (file)
@@ -1,13 +1,9 @@
-#
-# Makefile for WATCOM
-#
-# Created by Julian Smart, January 1999
-# 
-#
+# Purpose: makefile for treectrl example (Watcom)
+# Created: 2000-03-15
 
 WXDIR = $(%WXWIN)
 
-PROGRAM = treetest
+PROGRAM = treectrl
 OBJECTS = $(PROGRAM).obj
 
 !include $(WXDIR)\src\makeprog.wat
diff --git a/samples/treectrl/treectrl.cpp b/samples/treectrl/treectrl.cpp
new file mode 100644 (file)
index 0000000..15a8cb2
--- /dev/null
@@ -0,0 +1,850 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        treectrl.cpp
+// Purpose:     wxTreeCtrl sample
+// Author:      Julian Smart
+// Modified by:
+// Created:     04/01/98
+// RCS-ID:      $Id$
+// Copyright:   (c) Julian Smart and Markus Holzem
+// Licence:     wxWindows license
+/////////////////////////////////////////////////////////////////////////////
+
+#ifdef __GNUG__
+  #pragma implementation
+  #pragma interface
+#endif
+
+// For compilers that support precompilation, includes "wx/wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+  #pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+  #include "wx/wx.h"
+#endif
+
+#include "wx/log.h"
+
+#include "wx/image.h"
+#include "wx/imaglist.h"
+#include "wx/treectrl.h"
+
+#include "math.h"
+
+#ifdef __WIN32__
+    // this is not supported by native control
+    #define NO_VARIABLE_HEIGHT
+#endif
+
+#include "treectrl.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"
+#endif
+
+// verify that the item is ok and insult the user if it is not
+#define CHECK_ITEM( item ) if ( !item.IsOk() ) {                            \
+                             wxMessageBox("Please select some item first!", \
+                                          "Tree sample error",              \
+                                          wxOK | wxICON_EXCLAMATION,        \
+                                          this);                            \
+                             return;                                        \
+                           }
+
+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)
+#ifndef NO_MULTIPLE_SELECTION
+    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)
+    EVT_MENU(TreeTest_CountRec, MyFrame::OnCountRec)
+    EVT_MENU(TreeTest_Sort, MyFrame::OnSort)
+    EVT_MENU(TreeTest_SortRev, MyFrame::OnSortRev)
+    EVT_MENU(TreeTest_Bold, MyFrame::OnSetBold)
+    EVT_MENU(TreeTest_UnBold, MyFrame::OnClearBold)
+    EVT_MENU(TreeTest_Delete, MyFrame::OnDelete)
+    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_InsertItem, MyFrame::OnInsertItem)
+    EVT_MENU(TreeTest_IncIndent, MyFrame::OnIncIndent)
+    EVT_MENU(TreeTest_DecIndent, MyFrame::OnDecIndent)
+    EVT_MENU(TreeTest_IncSpacing, MyFrame::OnIncSpacing)
+    EVT_MENU(TreeTest_DecSpacing, MyFrame::OnDecSpacing)
+    EVT_MENU(TreeTest_ToggleIcon, MyFrame::OnToggleIcon)
+END_EVENT_TABLE()
+
+BEGIN_EVENT_TABLE(MyTreeCtrl, wxTreeCtrl)
+    EVT_TREE_BEGIN_DRAG(TreeTest_Ctrl, MyTreeCtrl::OnBeginDrag)
+    EVT_TREE_BEGIN_RDRAG(TreeTest_Ctrl, MyTreeCtrl::OnBeginRDrag)
+    EVT_TREE_END_DRAG(TreeTest_Ctrl, MyTreeCtrl::OnEndDrag)
+    EVT_TREE_BEGIN_LABEL_EDIT(TreeTest_Ctrl, MyTreeCtrl::OnBeginLabelEdit)
+    EVT_TREE_END_LABEL_EDIT(TreeTest_Ctrl, MyTreeCtrl::OnEndLabelEdit)
+    EVT_TREE_DELETE_ITEM(TreeTest_Ctrl, MyTreeCtrl::OnDeleteItem)
+#if 0       // there are so many of those that logging them causes flicker
+    EVT_TREE_GET_INFO(TreeTest_Ctrl, MyTreeCtrl::OnGetInfo)
+#endif
+    EVT_TREE_SET_INFO(TreeTest_Ctrl, MyTreeCtrl::OnSetInfo)
+    EVT_TREE_ITEM_EXPANDED(TreeTest_Ctrl, MyTreeCtrl::OnItemExpanded)
+    EVT_TREE_ITEM_EXPANDING(TreeTest_Ctrl, MyTreeCtrl::OnItemExpanding)
+    EVT_TREE_ITEM_COLLAPSED(TreeTest_Ctrl, MyTreeCtrl::OnItemCollapsed)
+    EVT_TREE_ITEM_COLLAPSING(TreeTest_Ctrl, MyTreeCtrl::OnItemCollapsing)
+    EVT_TREE_SEL_CHANGED(TreeTest_Ctrl, MyTreeCtrl::OnSelChanged)
+    EVT_TREE_SEL_CHANGING(TreeTest_Ctrl, MyTreeCtrl::OnSelChanging)
+    EVT_TREE_KEY_DOWN(TreeTest_Ctrl, MyTreeCtrl::OnTreeKeyDown)
+    EVT_TREE_ITEM_ACTIVATED(TreeTest_Ctrl, MyTreeCtrl::OnItemActivated)
+    EVT_RIGHT_DCLICK(MyTreeCtrl::OnRMouseDClick)
+END_EVENT_TABLE()
+
+IMPLEMENT_APP(MyApp)
+
+bool MyApp::OnInit()
+{
+    // Create the main frame window
+    MyFrame *frame = new MyFrame("wxTreeCtrl Test", 50, 50, 450, 600);
+
+    // Show the frame
+    frame->Show(TRUE);
+    SetTopWindow(frame);
+
+    return TRUE;
+}
+
+
+// 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)),
+         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
+    // show or hidden, the frame is sent a background erase event.
+    SetBackgroundColour(wxColour(255, 255, 255));
+
+    // Give it an icon
+    SetIcon(wxICON(mondrian));
+
+    // Make a menubar
+    wxMenu *file_menu = new wxMenu,
+           *tree_menu = new wxMenu,
+           *item_menu = new wxMenu;
+
+    file_menu->Append(TreeTest_About, "&About...");
+    file_menu->AppendSeparator();
+    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_AddItem, "Append a &new item");
+    tree_menu->Append(TreeTest_InsertItem, "&Insert a new item");
+    tree_menu->Append(TreeTest_Delete, "&Delete this item");
+    tree_menu->Append(TreeTest_DeleteChildren, "Delete &children");
+    tree_menu->Append(TreeTest_DeleteAll, "Delete &all items");
+    tree_menu->AppendSeparator();
+    tree_menu->Append(TreeTest_Count, "Count children of current item");
+    tree_menu->Append(TreeTest_CountRec, "Recursively count children of current item");
+    tree_menu->AppendSeparator();
+    tree_menu->Append(TreeTest_Sort, "Sort children of current item");
+    tree_menu->Append(TreeTest_SortRev, "Sort in reversed order");
+    tree_menu->AppendSeparator();
+    tree_menu->Append(TreeTest_EnsureVisible, "Make the last item &visible");
+    tree_menu->AppendSeparator();
+    tree_menu->Append(TreeTest_IncIndent, "Add 5 points to indentation\tAlt-I");
+    tree_menu->Append(TreeTest_DecIndent, "Reduce indentation by 5 points\tAlt-R");
+    tree_menu->AppendSeparator();
+    tree_menu->Append(TreeTest_IncSpacing, "Add 5 points to spacing\tCtrl-I");
+    tree_menu->Append(TreeTest_DecSpacing, "Reduce spacing by 5 points\tCtrl-R");
+
+    item_menu->Append(TreeTest_Dump, "&Dump item children");
+    item_menu->Append(TreeTest_Rename, "&Rename item...");
+
+    item_menu->AppendSeparator();
+    item_menu->Append(TreeTest_Bold, "Make item &bold");
+    item_menu->Append(TreeTest_UnBold, "Make item &not bold");
+    item_menu->AppendSeparator();
+    item_menu->Append(TreeTest_ToggleIcon, "Toggle the items &icon");
+
+#ifndef NO_MULTIPLE_SELECTION
+    item_menu->AppendSeparator();
+    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 // NO_MULTIPLE_SELECTION
+
+    wxMenuBar *menu_bar = new wxMenuBar;
+    menu_bar->Append(file_menu, "&File");
+    menu_bar->Append(tree_menu, "&Tree");
+    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 |
+#ifndef NO_VARIABLE_HEIGHT
+                                wxTR_HAS_VARIABLE_ROW_HEIGHT |
+#endif
+                                wxSUNKEN_BORDER);
+
+    m_treeCtrl->SetBackgroundColour(wxColour(204, 205, 79));
+
+    m_textCtrl = new wxTextCtrl(this, -1, "",
+                                wxDefaultPosition, wxDefaultSize,
+                                wxTE_MULTILINE | wxSUNKEN_BORDER);
+
+    // create a status bar with 3 panes
+    CreateStatusBar(3);
+    SetStatusText("", 0);
+
+#ifdef __WXMOTIF__
+    // For some reason, we get a memcpy crash in wxLogStream::DoLogStream
+    // on gcc/wxMotif, if we use wxLogTextCtl. Maybe it's just gcc?
+    delete wxLog::SetActiveTarget(new wxLogStderr);
+#else
+    // set our text control as the log target
+    wxLogTextCtrl *logWindow = new wxLogTextCtrl(m_textCtrl);
+    delete wxLog::SetActiveTarget(logWindow);
+#endif
+}
+
+MyFrame::~MyFrame()
+{
+    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::OnAbout(wxCommandEvent& WXUNUSED(event))
+{
+    wxMessageBox("Tree test sample\n"
+                 "(c) Julian Smart 1997, Vadim Zeitlin 1998",
+                 "About tree test",
+                 wxOK | wxICON_INFORMATION, this);
+}
+
+void MyFrame::OnRename(wxCommandEvent& WXUNUSED(event))
+{
+    wxTreeItemId item = m_treeCtrl->GetSelection();
+
+    CHECK_ITEM( item );
+
+    // old code - now we edit in place
+#if 0
+    static wxString s_text;
+    s_text = wxGetTextFromUser("New name: ", "Tree sample question",
+            s_text, this);
+    if ( !s_text.IsEmpty() )
+    {
+        m_treeCtrl->SetItemText(item, s_text);
+    }
+#endif // 0
+
+    // TODO demonstrate creating a custom edit control...
+    (void)m_treeCtrl->EditLabel(item);
+}
+
+void MyFrame::OnCount(wxCommandEvent& WXUNUSED(event))
+{
+    wxTreeItemId item = m_treeCtrl->GetSelection();
+
+    CHECK_ITEM( item );
+
+    int i = m_treeCtrl->GetChildrenCount( item, FALSE );
+
+    wxLogMessage(wxT("%d children"), i);
+}
+
+void MyFrame::OnCountRec(wxCommandEvent& WXUNUSED(event))
+{
+    wxTreeItemId item = m_treeCtrl->GetSelection();
+
+    CHECK_ITEM( item );
+
+    int i = m_treeCtrl->GetChildrenCount( item );
+
+    wxLogMessage(wxT("%d children"), i);
+}
+
+void MyFrame::DoSort(bool reverse)
+{
+    wxTreeItemId item = m_treeCtrl->GetSelection();
+
+    CHECK_ITEM( item );
+
+    m_treeCtrl->DoSortChildren(item, reverse);
+}
+
+void MyFrame::OnDump(wxCommandEvent& WXUNUSED(event))
+{
+    wxTreeItemId root = m_treeCtrl->GetSelection();
+
+    CHECK_ITEM( root );
+
+    m_treeCtrl->GetItemsRecursively(root, -1);
+}
+
+#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;
+
+    size_t count = m_treeCtrl->GetSelections(array);
+    wxLogMessage(wxT("%u items selected"), count);
+
+    for ( size_t n = 0; n < count; n++ )
+    {
+        wxLogMessage("\t%s", m_treeCtrl->GetItemText(array.Item(n)).c_str());
+    }
+}
+
+void MyFrame::OnSelect(wxCommandEvent& event)
+{
+    m_treeCtrl->SelectItem(m_treeCtrl->GetSelection());
+}
+
+void MyFrame::OnUnselect(wxCommandEvent& event)
+{
+    m_treeCtrl->UnselectAll();
+}
+
+#endif // NO_MULTIPLE_SELECTION
+
+void MyFrame::DoSetBold(bool bold)
+{
+    wxTreeItemId item = m_treeCtrl->GetSelection();
+
+    CHECK_ITEM( item );
+
+    m_treeCtrl->SetItemBold(item, bold);
+}
+
+void MyFrame::OnDelete(wxCommandEvent& WXUNUSED(event))
+{
+    wxTreeItemId item = m_treeCtrl->GetSelection();
+
+    CHECK_ITEM( item );
+
+    m_treeCtrl->Delete(item);
+}
+
+void MyFrame::OnDeleteChildren(wxCommandEvent& WXUNUSED(event))
+{
+    wxTreeItemId item = m_treeCtrl->GetSelection();
+
+    CHECK_ITEM( item );
+
+    m_treeCtrl->DeleteChildren(item);
+}
+
+void MyFrame::OnDeleteAll(wxCommandEvent& WXUNUSED(event))
+{
+    m_treeCtrl->DeleteAllItems();
+}
+
+void MyFrame::OnRecreate(wxCommandEvent& event)
+{
+    OnDeleteAll(event);
+    m_treeCtrl->AddTestItemsToTree(3, 2);
+}
+
+void MyFrame::OnSetImageSize(wxCommandEvent& event)
+{
+    long size = wxGetNumberFromUser("Enter the size for the images to use",
+                                    "Size: ",
+                                    "TreeCtrl sample",
+                                    16);
+    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::OnEnsureVisible(wxCommandEvent& event)
+{
+    m_treeCtrl->DoEnsureVisible();
+}
+
+void MyFrame::OnInsertItem(wxCommandEvent& WXUNUSED(event))
+{
+    int image = wxGetApp().ShowImages() ? MyTreeCtrl::TreeCtrlIcon_File : -1;
+    m_treeCtrl->InsertItem(m_treeCtrl->GetRootItem(), image, "2nd item");
+}
+
+void MyFrame::OnAddItem(wxCommandEvent& WXUNUSED(event))
+{
+    static int s_num = 0;
+
+    wxString text;
+    text.Printf("Item #%d", ++s_num);
+
+    m_treeCtrl->AppendItem(m_treeCtrl->GetRootItem(),
+                           text /*,
+                           MyTreeCtrl::TreeCtrlIcon_File */ );
+}
+
+void MyFrame::OnIncIndent(wxCommandEvent& WXUNUSED(event))
+{
+    unsigned int indent = m_treeCtrl->GetIndent();
+    if (indent < 100)
+        m_treeCtrl->SetIndent( indent+5 );
+}
+
+void MyFrame::OnDecIndent(wxCommandEvent& WXUNUSED(event))
+{
+    unsigned int indent = m_treeCtrl->GetIndent();
+    if (indent > 10)
+        m_treeCtrl->SetIndent( indent-5 );
+}
+
+void MyFrame::OnIncSpacing(wxCommandEvent& WXUNUSED(event))
+{
+    unsigned int indent = m_treeCtrl->GetSpacing();
+    if (indent < 100)
+        m_treeCtrl->SetSpacing( indent+5 );
+}
+
+void MyFrame::OnDecSpacing(wxCommandEvent& WXUNUSED(event))
+{
+    unsigned int indent = m_treeCtrl->GetSpacing();
+    if (indent > 10)
+        m_treeCtrl->SetSpacing( indent-5 );
+}
+
+void MyFrame::OnToggleIcon(wxCommandEvent& WXUNUSED(event))
+{
+    wxTreeItemId item = m_treeCtrl->GetSelection();
+
+    CHECK_ITEM( item );
+
+    m_treeCtrl->DoToggleIcon(item);
+}
+
+// MyTreeCtrl implementation
+IMPLEMENT_DYNAMIC_CLASS(MyTreeCtrl, wxTreeCtrl)
+
+MyTreeCtrl::MyTreeCtrl(wxWindow *parent, const wxWindowID id,
+                       const wxPoint& pos, const wxSize& size,
+                       long style)
+          : wxTreeCtrl(parent, id, pos, size, style)
+{
+    m_reverseSort = FALSE;
+    m_imageListNormal = NULL;
+
+    CreateImageList();
+
+    // 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
+    m_imageListNormal = new wxImageList(size, size, TRUE);
+
+    // should correspond to TreeCtrlIcon_xxx enum
+#if defined(__WXMSW__) && defined(__WIN16__)
+    m_imageListNormal->Add(wxBitmap("bitmap1", wxBITMAP_TYPE_BMP_RESOURCE));
+    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
+    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);
+}
+
+MyTreeCtrl::~MyTreeCtrl()
+{
+    delete m_imageListNormal;
+}
+
+int MyTreeCtrl::OnCompareItems(const wxTreeItemId& item1,
+                               const wxTreeItemId& item2)
+{
+    if ( m_reverseSort )
+    {
+        // just exchange 1st and 2nd items
+        return wxTreeCtrl::OnCompareItems(item2, item1);
+    }
+    else
+    {
+        return wxTreeCtrl::OnCompareItems(item1, item2);
+    }
+}
+
+void MyTreeCtrl::AddItemsRecursively(const wxTreeItemId& idParent,
+                                     size_t numChildren,
+                                     size_t depth,
+                                     size_t folder)
+{
+    if ( depth > 0 )
+    {
+        bool hasChildren = depth > 1;
+
+        wxString str;
+        for ( size_t n = 0; n < numChildren; n++ )
+        {
+            // at depth 1 elements won't have any more children
+            if ( hasChildren )
+                str.Printf("%s child %d", "Folder", n + 1);
+            else
+                str.Printf("%s child %d.%d", "File", folder, n + 1);
+
+            // here we pass to AppendItem() normal and selected item images (we
+            // suppose that selected image follows the normal one in the enum)
+            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)
+            if ( hasChildren && wxGetApp().ShowImages() )
+            {
+                SetItemImage(id, TreeCtrlIcon_FolderOpened,
+                             wxTreeItemIcon_Expanded);
+            }
+
+            // remember the last child for OnEnsureVisible()
+            if ( !hasChildren && n == numChildren - 1 )
+            {
+                m_lastItem = id;
+            }
+
+            AddItemsRecursively(id, numChildren, depth - 1, n + 1);
+        }
+    }
+    //else: done!
+}
+
+void MyTreeCtrl::AddTestItemsToTree(size_t numChildren,
+                                    size_t depth)
+{
+    int image = wxGetApp().ShowImages() ? MyTreeCtrl::TreeCtrlIcon_Folder : -1;
+    wxTreeItemId rootId = AddRoot("Root",
+                                  image, image,
+                                  new MyTreeItemData("Root item"));
+    if ( image != -1 )
+    {
+        SetItemImage(rootId, TreeCtrlIcon_FolderOpened, wxTreeItemIcon_Expanded);
+    }
+
+    AddItemsRecursively(rootId, numChildren, depth, 0);
+
+    // set some colours/fonts for testing
+    SetItemFont(rootId, *wxITALIC_FONT);
+
+    long cookie;
+    wxTreeItemId id = GetFirstChild(rootId, cookie);
+    SetItemTextColour(id, *wxBLUE);
+
+    id = GetNextChild(rootId, cookie);
+    id = GetNextChild(rootId, cookie);
+    SetItemTextColour(id, *wxRED);
+    SetItemBackgroundColour(id, *wxLIGHT_GREY);
+}
+
+void MyTreeCtrl::GetItemsRecursively(const wxTreeItemId& idParent, long cookie)
+{
+    wxTreeItemId id;
+
+    if( cookie == -1 )
+        id = GetFirstChild(idParent, cookie);
+    else
+        id = GetNextChild(idParent, cookie);
+
+    if(id <= 0)
+        return;
+
+    wxString text = GetItemText(id);
+    wxLogMessage(text);
+
+    if (ItemHasChildren(id))
+        GetItemsRecursively(id,-1);
+
+    GetItemsRecursively(idParent, cookie);
+}
+
+void MyTreeCtrl::DoToggleIcon(const wxTreeItemId& item)
+{
+    int image = GetItemImage(item) == TreeCtrlIcon_Folder ? TreeCtrlIcon_File
+                                                          : TreeCtrlIcon_Folder;
+
+    SetItemImage(item, image);
+}
+
+
+// avoid repetition
+#define TREE_EVENT_HANDLER(name)                            \
+void MyTreeCtrl::name(wxTreeEvent& event)                   \
+{                                                           \
+    wxLogMessage(#name);                                    \
+    event.Skip();                                           \
+}
+
+TREE_EVENT_HANDLER(OnBeginRDrag)
+TREE_EVENT_HANDLER(OnDeleteItem)
+TREE_EVENT_HANDLER(OnGetInfo)
+TREE_EVENT_HANDLER(OnSetInfo)
+TREE_EVENT_HANDLER(OnItemExpanded)
+TREE_EVENT_HANDLER(OnItemExpanding)
+TREE_EVENT_HANDLER(OnItemCollapsed)
+TREE_EVENT_HANDLER(OnSelChanged)
+TREE_EVENT_HANDLER(OnSelChanging)
+TREE_EVENT_HANDLER(OnTreeKeyDown)
+
+#undef TREE_EVENT_HANDLER
+
+void MyTreeCtrl::OnBeginDrag(wxTreeEvent& event)
+{
+    // need to explicitly allow drag
+    if ( event.GetItem() != GetRootItem() )
+    {
+        m_draggedItem = event.GetItem();
+
+        wxLogMessage("OnBeginDrag: started dragging %s",
+                     GetItemText(m_draggedItem).c_str());
+
+        event.Allow();
+    }
+    else
+    {
+        wxLogMessage("OnBeginDrag: this item can't be dragged.");
+    }
+}
+
+void MyTreeCtrl::OnEndDrag(wxTreeEvent& event)
+{
+    wxTreeItemId itemSrc = m_draggedItem,
+                 itemDst = event.GetItem();
+    m_draggedItem = (wxTreeItemId)0l;
+
+    // where to copy the item?
+    if ( itemDst.IsOk() && !ItemHasChildren(itemDst) )
+    {
+        // copy to the parent then
+        itemDst = GetParent(itemDst);
+    }
+
+    if ( !itemDst.IsOk() )
+    {
+        wxLogMessage("OnEndDrag: can't drop here.");
+
+        return;
+    }
+
+    wxString text = GetItemText(itemSrc);
+    wxLogMessage("OnEndDrag: '%s' copied to '%s'.",
+                 text.c_str(), GetItemText(itemDst).c_str());
+
+    // just do append here - we could also insert it just before/after the item
+    // on which it was dropped, but this requires slightly more work... we also
+    // completely ignore the client data and icon of the old item but could
+    // copy them as well.
+    //
+    // Finally, we only copy one item here but we might copy the entire tree if
+    // we were dragging a folder.
+    int image = wxGetApp().ShowImages() ? TreeCtrlIcon_File : -1;
+    AppendItem(itemDst, text, image);
+}
+
+void MyTreeCtrl::OnBeginLabelEdit(wxTreeEvent& event)
+{
+    wxLogMessage("OnBeginLabelEdit");
+
+    // for testing, prevent this items label editing
+    wxTreeItemId itemId = event.GetItem();
+    if ( IsTestItem(itemId) )
+    {
+        wxMessageBox("You can't edit this item.");
+
+        event.Veto();
+    }
+}
+
+void MyTreeCtrl::OnEndLabelEdit(wxTreeEvent& event)
+{
+    wxLogMessage("OnEndLabelEdit");
+
+    // don't allow anything except letters in the labels
+    if ( !event.GetLabel().IsWord() )
+    {
+        wxMessageBox("The label should contain only letters.");
+
+        event.Veto();
+    }
+}
+
+void MyTreeCtrl::OnItemCollapsing(wxTreeEvent& event)
+{
+    wxLogMessage("OnItemCollapsing");
+
+    // for testing, prevent the user from collapsing the first child folder
+    wxTreeItemId itemId = event.GetItem();
+    if ( IsTestItem(itemId) )
+    {
+        wxMessageBox("You can't collapse this item.");
+
+        event.Veto();
+    }
+}
+
+void MyTreeCtrl::OnItemActivated(wxTreeEvent& event)
+{
+    // show some info about this item
+    wxTreeItemId itemId = event.GetItem();
+    MyTreeItemData *item = (MyTreeItemData *)GetItemData(itemId);
+
+    if ( item != NULL )
+    {
+        item->ShowInfo(this);
+    }
+
+    wxLogMessage("OnItemActivated");
+}
+
+void MyTreeCtrl::OnRMouseDClick(wxMouseEvent& event)
+{
+    wxTreeItemId id = HitTest(event.GetPosition());
+    if ( !id )
+        wxLogMessage("No item under mouse");
+    else
+    {
+        MyTreeItemData *item = (MyTreeItemData *)GetItemData(id);
+        if ( item )
+            wxLogMessage("Item '%s' under mouse", item->GetDesc());
+    }
+}
+
+static inline const char *Bool2String(bool b)
+{
+    return b ? "" : "not ";
+}
+
+void MyTreeItemData::ShowInfo(wxTreeCtrl *tree)
+{
+    wxLogMessage("Item '%s': %sselected, %sexpanded, %sbold,\n"
+                 "%u children (%u immediately under this item).",
+                 m_desc.c_str(),
+                 Bool2String(tree->IsSelected(GetId())),
+                 Bool2String(tree->IsExpanded(GetId())),
+                 Bool2String(tree->IsBold(GetId())),
+                 tree->GetChildrenCount(GetId()),
+                 tree->GetChildrenCount(GetId(), FALSE));
+}
diff --git a/samples/treectrl/treectrl.def b/samples/treectrl/treectrl.def
new file mode 100644 (file)
index 0000000..714586e
--- /dev/null
@@ -0,0 +1,8 @@
+NAME         TreeCtrl
+DESCRIPTION  'TreeCtrl wxWindows application'
+EXETYPE      WINDOWS
+STUB         'WINSTUB.EXE'
+CODE         PRELOAD MOVEABLE DISCARDABLE
+DATA         PRELOAD MOVEABLE MULTIPLE
+HEAPSIZE     1024
+STACKSIZE    8192
diff --git a/samples/treectrl/treectrl.h b/samples/treectrl/treectrl.h
new file mode 100644 (file)
index 0000000..6a6dc67
--- /dev/null
@@ -0,0 +1,215 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        treectrl.h
+// Purpose:     wxTreeCtrl sample
+// Author:      Julian Smart
+// Modified by:
+// Created:     04/01/98
+// RCS-ID:      $Id$
+// Copyright:   (c) Julian Smart and Markus Holzem
+// Licence:     wxWindows license
+/////////////////////////////////////////////////////////////////////////////
+
+// Define a new application type
+class MyApp : public wxApp
+{
+public:
+    MyApp() { m_showImages = TRUE; }
+
+    bool OnInit();
+
+    void SetShowImages(bool show) { m_showImages = show; }
+    bool ShowImages() const { return m_showImages; }
+
+private:
+    bool m_showImages;
+};
+
+class MyTreeItemData : public wxTreeItemData
+{
+public:
+    MyTreeItemData(const wxString& desc) : m_desc(desc) { }
+
+    void ShowInfo(wxTreeCtrl *tree);
+    const char *GetDesc() const { return m_desc.c_str(); }
+
+private:
+    wxString m_desc;
+};
+
+class MyTreeCtrl : public wxTreeCtrl
+{
+public:
+    enum
+    {
+        TreeCtrlIcon_File,
+        TreeCtrlIcon_FileSelected,
+        TreeCtrlIcon_Folder,
+        TreeCtrlIcon_FolderSelected,
+        TreeCtrlIcon_FolderOpened
+    };
+
+    MyTreeCtrl() { }
+    MyTreeCtrl(wxWindow *parent, const wxWindowID id,
+               const wxPoint& pos, const wxSize& size,
+               long style);
+    virtual ~MyTreeCtrl();
+
+    void OnBeginDrag(wxTreeEvent& event);
+    void OnBeginRDrag(wxTreeEvent& event);
+    void OnEndDrag(wxTreeEvent& event);
+    void OnBeginLabelEdit(wxTreeEvent& event);
+    void OnEndLabelEdit(wxTreeEvent& event);
+    void OnDeleteItem(wxTreeEvent& event);
+    void OnGetInfo(wxTreeEvent& event);
+    void OnSetInfo(wxTreeEvent& event);
+    void OnItemExpanded(wxTreeEvent& event);
+    void OnItemExpanding(wxTreeEvent& event);
+    void OnItemCollapsed(wxTreeEvent& event);
+    void OnItemCollapsing(wxTreeEvent& event);
+    void OnSelChanged(wxTreeEvent& event);
+    void OnSelChanging(wxTreeEvent& event);
+    void OnTreeKeyDown(wxTreeEvent& event);
+    void OnItemActivated(wxTreeEvent& event);
+    void OnRMouseDClick(wxMouseEvent& event);
+
+    void GetItemsRecursively(const wxTreeItemId& idParent, long cookie);
+
+    void CreateImageList(int size = 16);
+
+    void AddTestItemsToTree(size_t numChildren, size_t depth);
+
+    void DoSortChildren(const wxTreeItemId& item, bool reverse = FALSE)
+        { m_reverseSort = reverse; wxTreeCtrl::SortChildren(item); }
+    void DoEnsureVisible() { EnsureVisible(m_lastItem); }
+
+    void DoToggleIcon(const wxTreeItemId& item);
+
+protected:
+    virtual int OnCompareItems(const wxTreeItemId& i1, const wxTreeItemId& i2);
+
+    // is this the test item which we use in several event handlers?
+    bool IsTestItem(const wxTreeItemId& item)
+    {
+        // the test item is the first child folder
+        return GetParent(item) == GetRootItem() && !GetPrevSibling(item);
+    }
+
+private:
+    void AddItemsRecursively(const wxTreeItemId& idParent,
+                             size_t nChildren,
+                             size_t depth,
+                             size_t folder);
+
+    wxImageList *m_imageListNormal;
+    bool         m_reverseSort;             // flag for OnCompareItems
+    wxTreeItemId m_lastItem,                // for OnEnsureVisible()
+                 m_draggedItem;             // item being dragged right now
+
+    // NB: due to an ugly wxMSW hack you _must_ use DECLARE_DYNAMIC_CLASS()
+    //     if you want your overloaded OnCompareItems() to be called.
+    //     OTOH, if you don't want it you may omit the next line - this will
+    //     make default (alphabetical) sorting much faster under wxMSW.
+    DECLARE_DYNAMIC_CLASS(MyTreeCtrl)
+    DECLARE_EVENT_TABLE()
+};
+
+// Define a new frame type
+class MyFrame: public wxFrame
+{
+public:
+    // ctor and dtor
+    MyFrame(const wxString& title, int x, int y, int w, int h);
+    virtual ~MyFrame();
+
+    // menu callbacks
+    void OnQuit(wxCommandEvent& event);
+    void OnAbout(wxCommandEvent& event);
+
+    void OnDump(wxCommandEvent& event);
+#ifndef NO_MULTIPLE_SELECTION
+    void OnDumpSelected(wxCommandEvent& event);
+    void OnSelect(wxCommandEvent& event);
+    void OnUnselect(wxCommandEvent& event);
+    void OnToggleSel(wxCommandEvent& event);
+#endif // NO_MULTIPLE_SELECTION
+    void OnDelete(wxCommandEvent& event);
+    void OnDeleteChildren(wxCommandEvent& event);
+    void OnDeleteAll(wxCommandEvent& event);
+
+    void OnRecreate(wxCommandEvent& event);
+    void OnToggleImages(wxCommandEvent& event);
+    void OnSetImageSize(wxCommandEvent& event);
+    void OnCollapseAndReset(wxCommandEvent& event);
+
+    void OnSetBold(wxCommandEvent& WXUNUSED(event)) { DoSetBold(TRUE); }
+    void OnClearBold(wxCommandEvent& WXUNUSED(event)) { DoSetBold(FALSE); }
+
+    void OnEnsureVisible(wxCommandEvent& event);
+
+    void OnCount(wxCommandEvent& event);
+    void OnCountRec(wxCommandEvent& event);
+
+    void OnRename(wxCommandEvent& event);
+    void OnSort(wxCommandEvent& event) { DoSort(); }
+    void OnSortRev(wxCommandEvent& event) { DoSort(TRUE); }
+
+    void OnAddItem(wxCommandEvent& event);
+    void OnInsertItem(wxCommandEvent& event);
+
+    void OnIncIndent(wxCommandEvent& event);
+    void OnDecIndent(wxCommandEvent& event);
+
+    void OnIncSpacing(wxCommandEvent& event);
+    void OnDecSpacing(wxCommandEvent& event);
+
+    void OnToggleIcon(wxCommandEvent& event);
+
+    void OnSize(wxSizeEvent& event);
+
+private:
+    void DoSort(bool reverse = FALSE);
+
+    void Resize(const wxSize& size);
+
+    MyTreeCtrl *m_treeCtrl;
+    wxTextCtrl *m_textCtrl;
+
+    void DoSetBold(bool bold = TRUE);
+
+    DECLARE_EVENT_TABLE()
+};
+
+// menu and control ids
+enum
+{
+    TreeTest_Quit,
+    TreeTest_About,
+    TreeTest_Dump,
+    TreeTest_DumpSelected,
+    TreeTest_Count,
+    TreeTest_CountRec,
+    TreeTest_Sort,
+    TreeTest_SortRev,
+    TreeTest_Bold,
+    TreeTest_UnBold,
+    TreeTest_Rename,
+    TreeTest_Delete,
+    TreeTest_DeleteChildren,
+    TreeTest_DeleteAll,
+    TreeTest_Recreate,
+    TreeTest_ToggleImages,
+    TreeTest_SetImageSize,
+    TreeTest_ToggleSel,
+    TreeTest_CollapseAndReset,
+    TreeTest_EnsureVisible,
+    TreeTest_AddItem,
+    TreeTest_InsertItem,
+    TreeTest_IncIndent,
+    TreeTest_DecIndent,
+    TreeTest_IncSpacing,
+    TreeTest_DecSpacing,
+    TreeTest_ToggleIcon,
+    TreeTest_Select,
+    TreeTest_Unselect,
+    TreeTest_Ctrl = 1000
+};
diff --git a/samples/treectrl/treectrl.rc b/samples/treectrl/treectrl.rc
new file mode 100644 (file)
index 0000000..ba4cb54
--- /dev/null
@@ -0,0 +1,17 @@
+mondrian ICON "mondrian.ico"
+aaaa     ICON "mondrian.ico"
+
+#include "wx/msw/wx.rc"
+
+icon1   ICON "bitmaps/file1.ico"
+icon2   ICON "bitmaps/file2.ico"
+icon3   ICON "bitmaps/folder1.ico"
+icon4   ICON "bitmaps/folder2.ico"
+icon5   ICON "bitmaps/folder3.ico"
+
+bitmap1   BITMAP "bitmaps/file1.bmp"
+bitmap2   BITMAP "bitmaps/file2.bmp"
+bitmap3   BITMAP "bitmaps/folder1.bmp"
+bitmap4   BITMAP "bitmaps/folder2.bmp"
+bitmap5   BITMAP "bitmaps/folder3.bmp"
+
diff --git a/samples/treectrl/treetest.cpp b/samples/treectrl/treetest.cpp
deleted file mode 100644 (file)
index 716b2b3..0000000
+++ /dev/null
@@ -1,850 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        treetest.cpp
-// Purpose:     wxTreeCtrl sample
-// Author:      Julian Smart
-// Modified by:
-// Created:     04/01/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:     wxWindows license
-/////////////////////////////////////////////////////////////////////////////
-
-#ifdef __GNUG__
-  #pragma implementation
-  #pragma interface
-#endif
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-  #pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-  #include "wx/wx.h"
-#endif
-
-#include "wx/log.h"
-
-#include "wx/image.h"
-#include "wx/imaglist.h"
-#include "wx/treectrl.h"
-
-#include "math.h"
-
-#ifdef __WIN32__
-    // this is not supported by native control
-    #define NO_VARIABLE_HEIGHT
-#endif
-
-#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"
-#endif
-
-// verify that the item is ok and insult the user if it is not
-#define CHECK_ITEM( item ) if ( !item.IsOk() ) {                            \
-                             wxMessageBox("Please select some item first!", \
-                                          "Tree sample error",              \
-                                          wxOK | wxICON_EXCLAMATION,        \
-                                          this);                            \
-                             return;                                        \
-                           }
-
-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)
-#ifndef NO_MULTIPLE_SELECTION
-    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)
-    EVT_MENU(TreeTest_CountRec, MyFrame::OnCountRec)
-    EVT_MENU(TreeTest_Sort, MyFrame::OnSort)
-    EVT_MENU(TreeTest_SortRev, MyFrame::OnSortRev)
-    EVT_MENU(TreeTest_Bold, MyFrame::OnSetBold)
-    EVT_MENU(TreeTest_UnBold, MyFrame::OnClearBold)
-    EVT_MENU(TreeTest_Delete, MyFrame::OnDelete)
-    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_InsertItem, MyFrame::OnInsertItem)
-    EVT_MENU(TreeTest_IncIndent, MyFrame::OnIncIndent)
-    EVT_MENU(TreeTest_DecIndent, MyFrame::OnDecIndent)
-    EVT_MENU(TreeTest_IncSpacing, MyFrame::OnIncSpacing)
-    EVT_MENU(TreeTest_DecSpacing, MyFrame::OnDecSpacing)
-    EVT_MENU(TreeTest_ToggleIcon, MyFrame::OnToggleIcon)
-END_EVENT_TABLE()
-
-BEGIN_EVENT_TABLE(MyTreeCtrl, wxTreeCtrl)
-    EVT_TREE_BEGIN_DRAG(TreeTest_Ctrl, MyTreeCtrl::OnBeginDrag)
-    EVT_TREE_BEGIN_RDRAG(TreeTest_Ctrl, MyTreeCtrl::OnBeginRDrag)
-    EVT_TREE_END_DRAG(TreeTest_Ctrl, MyTreeCtrl::OnEndDrag)
-    EVT_TREE_BEGIN_LABEL_EDIT(TreeTest_Ctrl, MyTreeCtrl::OnBeginLabelEdit)
-    EVT_TREE_END_LABEL_EDIT(TreeTest_Ctrl, MyTreeCtrl::OnEndLabelEdit)
-    EVT_TREE_DELETE_ITEM(TreeTest_Ctrl, MyTreeCtrl::OnDeleteItem)
-#if 0       // there are so many of those that logging them causes flicker
-    EVT_TREE_GET_INFO(TreeTest_Ctrl, MyTreeCtrl::OnGetInfo)
-#endif
-    EVT_TREE_SET_INFO(TreeTest_Ctrl, MyTreeCtrl::OnSetInfo)
-    EVT_TREE_ITEM_EXPANDED(TreeTest_Ctrl, MyTreeCtrl::OnItemExpanded)
-    EVT_TREE_ITEM_EXPANDING(TreeTest_Ctrl, MyTreeCtrl::OnItemExpanding)
-    EVT_TREE_ITEM_COLLAPSED(TreeTest_Ctrl, MyTreeCtrl::OnItemCollapsed)
-    EVT_TREE_ITEM_COLLAPSING(TreeTest_Ctrl, MyTreeCtrl::OnItemCollapsing)
-    EVT_TREE_SEL_CHANGED(TreeTest_Ctrl, MyTreeCtrl::OnSelChanged)
-    EVT_TREE_SEL_CHANGING(TreeTest_Ctrl, MyTreeCtrl::OnSelChanging)
-    EVT_TREE_KEY_DOWN(TreeTest_Ctrl, MyTreeCtrl::OnTreeKeyDown)
-    EVT_TREE_ITEM_ACTIVATED(TreeTest_Ctrl, MyTreeCtrl::OnItemActivated)
-    EVT_RIGHT_DCLICK(MyTreeCtrl::OnRMouseDClick)
-END_EVENT_TABLE()
-
-IMPLEMENT_APP(MyApp)
-
-bool MyApp::OnInit()
-{
-    // Create the main frame window
-    MyFrame *frame = new MyFrame("wxTreeCtrl Test", 50, 50, 450, 600);
-
-    // Show the frame
-    frame->Show(TRUE);
-    SetTopWindow(frame);
-
-    return TRUE;
-}
-
-
-// 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)),
-         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
-    // show or hidden, the frame is sent a background erase event.
-    SetBackgroundColour(wxColour(255, 255, 255));
-
-    // Give it an icon
-    SetIcon(wxICON(mondrian));
-
-    // Make a menubar
-    wxMenu *file_menu = new wxMenu,
-           *tree_menu = new wxMenu,
-           *item_menu = new wxMenu;
-
-    file_menu->Append(TreeTest_About, "&About...");
-    file_menu->AppendSeparator();
-    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_AddItem, "Append a &new item");
-    tree_menu->Append(TreeTest_InsertItem, "&Insert a new item");
-    tree_menu->Append(TreeTest_Delete, "&Delete this item");
-    tree_menu->Append(TreeTest_DeleteChildren, "Delete &children");
-    tree_menu->Append(TreeTest_DeleteAll, "Delete &all items");
-    tree_menu->AppendSeparator();
-    tree_menu->Append(TreeTest_Count, "Count children of current item");
-    tree_menu->Append(TreeTest_CountRec, "Recursively count children of current item");
-    tree_menu->AppendSeparator();
-    tree_menu->Append(TreeTest_Sort, "Sort children of current item");
-    tree_menu->Append(TreeTest_SortRev, "Sort in reversed order");
-    tree_menu->AppendSeparator();
-    tree_menu->Append(TreeTest_EnsureVisible, "Make the last item &visible");
-    tree_menu->AppendSeparator();
-    tree_menu->Append(TreeTest_IncIndent, "Add 5 points to indentation\tAlt-I");
-    tree_menu->Append(TreeTest_DecIndent, "Reduce indentation by 5 points\tAlt-R");
-    tree_menu->AppendSeparator();
-    tree_menu->Append(TreeTest_IncSpacing, "Add 5 points to spacing\tCtrl-I");
-    tree_menu->Append(TreeTest_DecSpacing, "Reduce spacing by 5 points\tCtrl-R");
-
-    item_menu->Append(TreeTest_Dump, "&Dump item children");
-    item_menu->Append(TreeTest_Rename, "&Rename item...");
-
-    item_menu->AppendSeparator();
-    item_menu->Append(TreeTest_Bold, "Make item &bold");
-    item_menu->Append(TreeTest_UnBold, "Make item &not bold");
-    item_menu->AppendSeparator();
-    item_menu->Append(TreeTest_ToggleIcon, "Toggle the items &icon");
-
-#ifndef NO_MULTIPLE_SELECTION
-    item_menu->AppendSeparator();
-    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 // NO_MULTIPLE_SELECTION
-
-    wxMenuBar *menu_bar = new wxMenuBar;
-    menu_bar->Append(file_menu, "&File");
-    menu_bar->Append(tree_menu, "&Tree");
-    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 |
-#ifndef NO_VARIABLE_HEIGHT
-                                wxTR_HAS_VARIABLE_ROW_HEIGHT |
-#endif
-                                wxSUNKEN_BORDER);
-
-    m_treeCtrl->SetBackgroundColour(wxColour(204, 205, 79));
-
-    m_textCtrl = new wxTextCtrl(this, -1, "",
-                                wxDefaultPosition, wxDefaultSize,
-                                wxTE_MULTILINE | wxSUNKEN_BORDER);
-
-    // create a status bar with 3 panes
-    CreateStatusBar(3);
-    SetStatusText("", 0);
-
-#ifdef __WXMOTIF__
-    // For some reason, we get a memcpy crash in wxLogStream::DoLogStream
-    // on gcc/wxMotif, if we use wxLogTextCtl. Maybe it's just gcc?
-    delete wxLog::SetActiveTarget(new wxLogStderr);
-#else
-    // set our text control as the log target
-    wxLogTextCtrl *logWindow = new wxLogTextCtrl(m_textCtrl);
-    delete wxLog::SetActiveTarget(logWindow);
-#endif
-}
-
-MyFrame::~MyFrame()
-{
-    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::OnAbout(wxCommandEvent& WXUNUSED(event))
-{
-    wxMessageBox("Tree test sample\n"
-                 "(c) Julian Smart 1997, Vadim Zeitlin 1998",
-                 "About tree test",
-                 wxOK | wxICON_INFORMATION, this);
-}
-
-void MyFrame::OnRename(wxCommandEvent& WXUNUSED(event))
-{
-    wxTreeItemId item = m_treeCtrl->GetSelection();
-
-    CHECK_ITEM( item );
-
-    // old code - now we edit in place
-#if 0
-    static wxString s_text;
-    s_text = wxGetTextFromUser("New name: ", "Tree sample question",
-            s_text, this);
-    if ( !s_text.IsEmpty() )
-    {
-        m_treeCtrl->SetItemText(item, s_text);
-    }
-#endif // 0
-
-    // TODO demonstrate creating a custom edit control...
-    (void)m_treeCtrl->EditLabel(item);
-}
-
-void MyFrame::OnCount(wxCommandEvent& WXUNUSED(event))
-{
-    wxTreeItemId item = m_treeCtrl->GetSelection();
-
-    CHECK_ITEM( item );
-
-    int i = m_treeCtrl->GetChildrenCount( item, FALSE );
-
-    wxLogMessage(wxT("%d children"), i);
-}
-
-void MyFrame::OnCountRec(wxCommandEvent& WXUNUSED(event))
-{
-    wxTreeItemId item = m_treeCtrl->GetSelection();
-
-    CHECK_ITEM( item );
-
-    int i = m_treeCtrl->GetChildrenCount( item );
-
-    wxLogMessage(wxT("%d children"), i);
-}
-
-void MyFrame::DoSort(bool reverse)
-{
-    wxTreeItemId item = m_treeCtrl->GetSelection();
-
-    CHECK_ITEM( item );
-
-    m_treeCtrl->DoSortChildren(item, reverse);
-}
-
-void MyFrame::OnDump(wxCommandEvent& WXUNUSED(event))
-{
-    wxTreeItemId root = m_treeCtrl->GetSelection();
-
-    CHECK_ITEM( root );
-
-    m_treeCtrl->GetItemsRecursively(root, -1);
-}
-
-#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;
-
-    size_t count = m_treeCtrl->GetSelections(array);
-    wxLogMessage(wxT("%u items selected"), count);
-
-    for ( size_t n = 0; n < count; n++ )
-    {
-        wxLogMessage("\t%s", m_treeCtrl->GetItemText(array.Item(n)).c_str());
-    }
-}
-
-void MyFrame::OnSelect(wxCommandEvent& event)
-{
-    m_treeCtrl->SelectItem(m_treeCtrl->GetSelection());
-}
-
-void MyFrame::OnUnselect(wxCommandEvent& event)
-{
-    m_treeCtrl->UnselectAll();
-}
-
-#endif // NO_MULTIPLE_SELECTION
-
-void MyFrame::DoSetBold(bool bold)
-{
-    wxTreeItemId item = m_treeCtrl->GetSelection();
-
-    CHECK_ITEM( item );
-
-    m_treeCtrl->SetItemBold(item, bold);
-}
-
-void MyFrame::OnDelete(wxCommandEvent& WXUNUSED(event))
-{
-    wxTreeItemId item = m_treeCtrl->GetSelection();
-
-    CHECK_ITEM( item );
-
-    m_treeCtrl->Delete(item);
-}
-
-void MyFrame::OnDeleteChildren(wxCommandEvent& WXUNUSED(event))
-{
-    wxTreeItemId item = m_treeCtrl->GetSelection();
-
-    CHECK_ITEM( item );
-
-    m_treeCtrl->DeleteChildren(item);
-}
-
-void MyFrame::OnDeleteAll(wxCommandEvent& WXUNUSED(event))
-{
-    m_treeCtrl->DeleteAllItems();
-}
-
-void MyFrame::OnRecreate(wxCommandEvent& event)
-{
-    OnDeleteAll(event);
-    m_treeCtrl->AddTestItemsToTree(3, 2);
-}
-
-void MyFrame::OnSetImageSize(wxCommandEvent& event)
-{
-    long size = wxGetNumberFromUser("Enter the size for the images to use",
-                                    "Size: ",
-                                    "TreeCtrl sample",
-                                    16);
-    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::OnEnsureVisible(wxCommandEvent& event)
-{
-    m_treeCtrl->DoEnsureVisible();
-}
-
-void MyFrame::OnInsertItem(wxCommandEvent& WXUNUSED(event))
-{
-    int image = wxGetApp().ShowImages() ? MyTreeCtrl::TreeCtrlIcon_File : -1;
-    m_treeCtrl->InsertItem(m_treeCtrl->GetRootItem(), image, "2nd item");
-}
-
-void MyFrame::OnAddItem(wxCommandEvent& WXUNUSED(event))
-{
-    static int s_num = 0;
-
-    wxString text;
-    text.Printf("Item #%d", ++s_num);
-
-    m_treeCtrl->AppendItem(m_treeCtrl->GetRootItem(),
-                           text /*,
-                           MyTreeCtrl::TreeCtrlIcon_File */ );
-}
-
-void MyFrame::OnIncIndent(wxCommandEvent& WXUNUSED(event))
-{
-    unsigned int indent = m_treeCtrl->GetIndent();
-    if (indent < 100)
-        m_treeCtrl->SetIndent( indent+5 );
-}
-
-void MyFrame::OnDecIndent(wxCommandEvent& WXUNUSED(event))
-{
-    unsigned int indent = m_treeCtrl->GetIndent();
-    if (indent > 10)
-        m_treeCtrl->SetIndent( indent-5 );
-}
-
-void MyFrame::OnIncSpacing(wxCommandEvent& WXUNUSED(event))
-{
-    unsigned int indent = m_treeCtrl->GetSpacing();
-    if (indent < 100)
-        m_treeCtrl->SetSpacing( indent+5 );
-}
-
-void MyFrame::OnDecSpacing(wxCommandEvent& WXUNUSED(event))
-{
-    unsigned int indent = m_treeCtrl->GetSpacing();
-    if (indent > 10)
-        m_treeCtrl->SetSpacing( indent-5 );
-}
-
-void MyFrame::OnToggleIcon(wxCommandEvent& WXUNUSED(event))
-{
-    wxTreeItemId item = m_treeCtrl->GetSelection();
-
-    CHECK_ITEM( item );
-
-    m_treeCtrl->DoToggleIcon(item);
-}
-
-// MyTreeCtrl implementation
-IMPLEMENT_DYNAMIC_CLASS(MyTreeCtrl, wxTreeCtrl)
-
-MyTreeCtrl::MyTreeCtrl(wxWindow *parent, const wxWindowID id,
-                       const wxPoint& pos, const wxSize& size,
-                       long style)
-          : wxTreeCtrl(parent, id, pos, size, style)
-{
-    m_reverseSort = FALSE;
-    m_imageListNormal = NULL;
-
-    CreateImageList();
-
-    // 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
-    m_imageListNormal = new wxImageList(size, size, TRUE);
-
-    // should correspond to TreeCtrlIcon_xxx enum
-#if defined(__WXMSW__) && defined(__WIN16__)
-    m_imageListNormal->Add(wxBitmap("bitmap1", wxBITMAP_TYPE_BMP_RESOURCE));
-    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
-    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);
-}
-
-MyTreeCtrl::~MyTreeCtrl()
-{
-    delete m_imageListNormal;
-}
-
-int MyTreeCtrl::OnCompareItems(const wxTreeItemId& item1,
-                               const wxTreeItemId& item2)
-{
-    if ( m_reverseSort )
-    {
-        // just exchange 1st and 2nd items
-        return wxTreeCtrl::OnCompareItems(item2, item1);
-    }
-    else
-    {
-        return wxTreeCtrl::OnCompareItems(item1, item2);
-    }
-}
-
-void MyTreeCtrl::AddItemsRecursively(const wxTreeItemId& idParent,
-                                     size_t numChildren,
-                                     size_t depth,
-                                     size_t folder)
-{
-    if ( depth > 0 )
-    {
-        bool hasChildren = depth > 1;
-
-        wxString str;
-        for ( size_t n = 0; n < numChildren; n++ )
-        {
-            // at depth 1 elements won't have any more children
-            if ( hasChildren )
-                str.Printf("%s child %d", "Folder", n + 1);
-            else
-                str.Printf("%s child %d.%d", "File", folder, n + 1);
-
-            // here we pass to AppendItem() normal and selected item images (we
-            // suppose that selected image follows the normal one in the enum)
-            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)
-            if ( hasChildren && wxGetApp().ShowImages() )
-            {
-                SetItemImage(id, TreeCtrlIcon_FolderOpened,
-                             wxTreeItemIcon_Expanded);
-            }
-
-            // remember the last child for OnEnsureVisible()
-            if ( !hasChildren && n == numChildren - 1 )
-            {
-                m_lastItem = id;
-            }
-
-            AddItemsRecursively(id, numChildren, depth - 1, n + 1);
-        }
-    }
-    //else: done!
-}
-
-void MyTreeCtrl::AddTestItemsToTree(size_t numChildren,
-                                    size_t depth)
-{
-    int image = wxGetApp().ShowImages() ? MyTreeCtrl::TreeCtrlIcon_Folder : -1;
-    wxTreeItemId rootId = AddRoot("Root",
-                                  image, image,
-                                  new MyTreeItemData("Root item"));
-    if ( image != -1 )
-    {
-        SetItemImage(rootId, TreeCtrlIcon_FolderOpened, wxTreeItemIcon_Expanded);
-    }
-
-    AddItemsRecursively(rootId, numChildren, depth, 0);
-
-    // set some colours/fonts for testing
-    SetItemFont(rootId, *wxITALIC_FONT);
-
-    long cookie;
-    wxTreeItemId id = GetFirstChild(rootId, cookie);
-    SetItemTextColour(id, *wxBLUE);
-
-    id = GetNextChild(rootId, cookie);
-    id = GetNextChild(rootId, cookie);
-    SetItemTextColour(id, *wxRED);
-    SetItemBackgroundColour(id, *wxLIGHT_GREY);
-}
-
-void MyTreeCtrl::GetItemsRecursively(const wxTreeItemId& idParent, long cookie)
-{
-    wxTreeItemId id;
-
-    if( cookie == -1 )
-        id = GetFirstChild(idParent, cookie);
-    else
-        id = GetNextChild(idParent, cookie);
-
-    if(id <= 0)
-        return;
-
-    wxString text = GetItemText(id);
-    wxLogMessage(text);
-
-    if (ItemHasChildren(id))
-        GetItemsRecursively(id,-1);
-
-    GetItemsRecursively(idParent, cookie);
-}
-
-void MyTreeCtrl::DoToggleIcon(const wxTreeItemId& item)
-{
-    int image = GetItemImage(item) == TreeCtrlIcon_Folder ? TreeCtrlIcon_File
-                                                          : TreeCtrlIcon_Folder;
-
-    SetItemImage(item, image);
-}
-
-
-// avoid repetition
-#define TREE_EVENT_HANDLER(name)                            \
-void MyTreeCtrl::name(wxTreeEvent& event)                   \
-{                                                           \
-    wxLogMessage(#name);                                    \
-    event.Skip();                                           \
-}
-
-TREE_EVENT_HANDLER(OnBeginRDrag)
-TREE_EVENT_HANDLER(OnDeleteItem)
-TREE_EVENT_HANDLER(OnGetInfo)
-TREE_EVENT_HANDLER(OnSetInfo)
-TREE_EVENT_HANDLER(OnItemExpanded)
-TREE_EVENT_HANDLER(OnItemExpanding)
-TREE_EVENT_HANDLER(OnItemCollapsed)
-TREE_EVENT_HANDLER(OnSelChanged)
-TREE_EVENT_HANDLER(OnSelChanging)
-TREE_EVENT_HANDLER(OnTreeKeyDown)
-
-#undef TREE_EVENT_HANDLER
-
-void MyTreeCtrl::OnBeginDrag(wxTreeEvent& event)
-{
-    // need to explicitly allow drag
-    if ( event.GetItem() != GetRootItem() )
-    {
-        m_draggedItem = event.GetItem();
-
-        wxLogMessage("OnBeginDrag: started dragging %s",
-                     GetItemText(m_draggedItem).c_str());
-
-        event.Allow();
-    }
-    else
-    {
-        wxLogMessage("OnBeginDrag: this item can't be dragged.");
-    }
-}
-
-void MyTreeCtrl::OnEndDrag(wxTreeEvent& event)
-{
-    wxTreeItemId itemSrc = m_draggedItem,
-                 itemDst = event.GetItem();
-    m_draggedItem = (wxTreeItemId)0l;
-
-    // where to copy the item?
-    if ( itemDst.IsOk() && !ItemHasChildren(itemDst) )
-    {
-        // copy to the parent then
-        itemDst = GetParent(itemDst);
-    }
-
-    if ( !itemDst.IsOk() )
-    {
-        wxLogMessage("OnEndDrag: can't drop here.");
-
-        return;
-    }
-
-    wxString text = GetItemText(itemSrc);
-    wxLogMessage("OnEndDrag: '%s' copied to '%s'.",
-                 text.c_str(), GetItemText(itemDst).c_str());
-
-    // just do append here - we could also insert it just before/after the item
-    // on which it was dropped, but this requires slightly more work... we also
-    // completely ignore the client data and icon of the old item but could
-    // copy them as well.
-    //
-    // Finally, we only copy one item here but we might copy the entire tree if
-    // we were dragging a folder.
-    int image = wxGetApp().ShowImages() ? TreeCtrlIcon_File : -1;
-    AppendItem(itemDst, text, image);
-}
-
-void MyTreeCtrl::OnBeginLabelEdit(wxTreeEvent& event)
-{
-    wxLogMessage("OnBeginLabelEdit");
-
-    // for testing, prevent this items label editing
-    wxTreeItemId itemId = event.GetItem();
-    if ( IsTestItem(itemId) )
-    {
-        wxMessageBox("You can't edit this item.");
-
-        event.Veto();
-    }
-}
-
-void MyTreeCtrl::OnEndLabelEdit(wxTreeEvent& event)
-{
-    wxLogMessage("OnEndLabelEdit");
-
-    // don't allow anything except letters in the labels
-    if ( !event.GetLabel().IsWord() )
-    {
-        wxMessageBox("The label should contain only letters.");
-
-        event.Veto();
-    }
-}
-
-void MyTreeCtrl::OnItemCollapsing(wxTreeEvent& event)
-{
-    wxLogMessage("OnItemCollapsing");
-
-    // for testing, prevent the user from collapsing the first child folder
-    wxTreeItemId itemId = event.GetItem();
-    if ( IsTestItem(itemId) )
-    {
-        wxMessageBox("You can't collapse this item.");
-
-        event.Veto();
-    }
-}
-
-void MyTreeCtrl::OnItemActivated(wxTreeEvent& event)
-{
-    // show some info about this item
-    wxTreeItemId itemId = event.GetItem();
-    MyTreeItemData *item = (MyTreeItemData *)GetItemData(itemId);
-
-    if ( item != NULL )
-    {
-        item->ShowInfo(this);
-    }
-
-    wxLogMessage("OnItemActivated");
-}
-
-void MyTreeCtrl::OnRMouseDClick(wxMouseEvent& event)
-{
-    wxTreeItemId id = HitTest(event.GetPosition());
-    if ( !id )
-        wxLogMessage("No item under mouse");
-    else
-    {
-        MyTreeItemData *item = (MyTreeItemData *)GetItemData(id);
-        if ( item )
-            wxLogMessage("Item '%s' under mouse", item->GetDesc());
-    }
-}
-
-static inline const char *Bool2String(bool b)
-{
-    return b ? "" : "not ";
-}
-
-void MyTreeItemData::ShowInfo(wxTreeCtrl *tree)
-{
-    wxLogMessage("Item '%s': %sselected, %sexpanded, %sbold,\n"
-                 "%u children (%u immediately under this item).",
-                 m_desc.c_str(),
-                 Bool2String(tree->IsSelected(GetId())),
-                 Bool2String(tree->IsExpanded(GetId())),
-                 Bool2String(tree->IsBold(GetId())),
-                 tree->GetChildrenCount(GetId()),
-                 tree->GetChildrenCount(GetId(), FALSE));
-}
diff --git a/samples/treectrl/treetest.def b/samples/treectrl/treetest.def
deleted file mode 100644 (file)
index 714586e..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-NAME         TreeCtrl
-DESCRIPTION  'TreeCtrl wxWindows application'
-EXETYPE      WINDOWS
-STUB         'WINSTUB.EXE'
-CODE         PRELOAD MOVEABLE DISCARDABLE
-DATA         PRELOAD MOVEABLE MULTIPLE
-HEAPSIZE     1024
-STACKSIZE    8192
diff --git a/samples/treectrl/treetest.h b/samples/treectrl/treetest.h
deleted file mode 100644 (file)
index 3e7a37e..0000000
+++ /dev/null
@@ -1,215 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        treetest.h
-// Purpose:     wxTreeCtrl sample
-// Author:      Julian Smart
-// Modified by:
-// Created:     04/01/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:     wxWindows license
-/////////////////////////////////////////////////////////////////////////////
-
-// Define a new application type
-class MyApp : public wxApp
-{
-public:
-    MyApp() { m_showImages = TRUE; }
-
-    bool OnInit();
-
-    void SetShowImages(bool show) { m_showImages = show; }
-    bool ShowImages() const { return m_showImages; }
-
-private:
-    bool m_showImages;
-};
-
-class MyTreeItemData : public wxTreeItemData
-{
-public:
-    MyTreeItemData(const wxString& desc) : m_desc(desc) { }
-
-    void ShowInfo(wxTreeCtrl *tree);
-    const char *GetDesc() const { return m_desc.c_str(); }
-
-private:
-    wxString m_desc;
-};
-
-class MyTreeCtrl : public wxTreeCtrl
-{
-public:
-    enum
-    {
-        TreeCtrlIcon_File,
-        TreeCtrlIcon_FileSelected,
-        TreeCtrlIcon_Folder,
-        TreeCtrlIcon_FolderSelected,
-        TreeCtrlIcon_FolderOpened
-    };
-
-    MyTreeCtrl() { }
-    MyTreeCtrl(wxWindow *parent, const wxWindowID id,
-               const wxPoint& pos, const wxSize& size,
-               long style);
-    virtual ~MyTreeCtrl();
-
-    void OnBeginDrag(wxTreeEvent& event);
-    void OnBeginRDrag(wxTreeEvent& event);
-    void OnEndDrag(wxTreeEvent& event);
-    void OnBeginLabelEdit(wxTreeEvent& event);
-    void OnEndLabelEdit(wxTreeEvent& event);
-    void OnDeleteItem(wxTreeEvent& event);
-    void OnGetInfo(wxTreeEvent& event);
-    void OnSetInfo(wxTreeEvent& event);
-    void OnItemExpanded(wxTreeEvent& event);
-    void OnItemExpanding(wxTreeEvent& event);
-    void OnItemCollapsed(wxTreeEvent& event);
-    void OnItemCollapsing(wxTreeEvent& event);
-    void OnSelChanged(wxTreeEvent& event);
-    void OnSelChanging(wxTreeEvent& event);
-    void OnTreeKeyDown(wxTreeEvent& event);
-    void OnItemActivated(wxTreeEvent& event);
-    void OnRMouseDClick(wxMouseEvent& event);
-
-    void GetItemsRecursively(const wxTreeItemId& idParent, long cookie);
-
-    void CreateImageList(int size = 16);
-
-    void AddTestItemsToTree(size_t numChildren, size_t depth);
-
-    void DoSortChildren(const wxTreeItemId& item, bool reverse = FALSE)
-        { m_reverseSort = reverse; wxTreeCtrl::SortChildren(item); }
-    void DoEnsureVisible() { EnsureVisible(m_lastItem); }
-
-    void DoToggleIcon(const wxTreeItemId& item);
-
-protected:
-    virtual int OnCompareItems(const wxTreeItemId& i1, const wxTreeItemId& i2);
-
-    // is this the test item which we use in several event handlers?
-    bool IsTestItem(const wxTreeItemId& item)
-    {
-        // the test item is the first child folder
-        return GetParent(item) == GetRootItem() && !GetPrevSibling(item);
-    }
-
-private:
-    void AddItemsRecursively(const wxTreeItemId& idParent,
-                             size_t nChildren,
-                             size_t depth,
-                             size_t folder);
-
-    wxImageList *m_imageListNormal;
-    bool         m_reverseSort;             // flag for OnCompareItems
-    wxTreeItemId m_lastItem,                // for OnEnsureVisible()
-                 m_draggedItem;             // item being dragged right now
-
-    // NB: due to an ugly wxMSW hack you _must_ use DECLARE_DYNAMIC_CLASS()
-    //     if you want your overloaded OnCompareItems() to be called.
-    //     OTOH, if you don't want it you may omit the next line - this will
-    //     make default (alphabetical) sorting much faster under wxMSW.
-    DECLARE_DYNAMIC_CLASS(MyTreeCtrl)
-    DECLARE_EVENT_TABLE()
-};
-
-// Define a new frame type
-class MyFrame: public wxFrame
-{
-public:
-    // ctor and dtor
-    MyFrame(const wxString& title, int x, int y, int w, int h);
-    virtual ~MyFrame();
-
-    // menu callbacks
-    void OnQuit(wxCommandEvent& event);
-    void OnAbout(wxCommandEvent& event);
-
-    void OnDump(wxCommandEvent& event);
-#ifndef NO_MULTIPLE_SELECTION
-    void OnDumpSelected(wxCommandEvent& event);
-    void OnSelect(wxCommandEvent& event);
-    void OnUnselect(wxCommandEvent& event);
-    void OnToggleSel(wxCommandEvent& event);
-#endif // NO_MULTIPLE_SELECTION
-    void OnDelete(wxCommandEvent& event);
-    void OnDeleteChildren(wxCommandEvent& event);
-    void OnDeleteAll(wxCommandEvent& event);
-
-    void OnRecreate(wxCommandEvent& event);
-    void OnToggleImages(wxCommandEvent& event);
-    void OnSetImageSize(wxCommandEvent& event);
-    void OnCollapseAndReset(wxCommandEvent& event);
-
-    void OnSetBold(wxCommandEvent& WXUNUSED(event)) { DoSetBold(TRUE); }
-    void OnClearBold(wxCommandEvent& WXUNUSED(event)) { DoSetBold(FALSE); }
-
-    void OnEnsureVisible(wxCommandEvent& event);
-
-    void OnCount(wxCommandEvent& event);
-    void OnCountRec(wxCommandEvent& event);
-
-    void OnRename(wxCommandEvent& event);
-    void OnSort(wxCommandEvent& event) { DoSort(); }
-    void OnSortRev(wxCommandEvent& event) { DoSort(TRUE); }
-
-    void OnAddItem(wxCommandEvent& event);
-    void OnInsertItem(wxCommandEvent& event);
-
-    void OnIncIndent(wxCommandEvent& event);
-    void OnDecIndent(wxCommandEvent& event);
-
-    void OnIncSpacing(wxCommandEvent& event);
-    void OnDecSpacing(wxCommandEvent& event);
-
-    void OnToggleIcon(wxCommandEvent& event);
-
-    void OnSize(wxSizeEvent& event);
-
-private:
-    void DoSort(bool reverse = FALSE);
-
-    void Resize(const wxSize& size);
-
-    MyTreeCtrl *m_treeCtrl;
-    wxTextCtrl *m_textCtrl;
-
-    void DoSetBold(bool bold = TRUE);
-
-    DECLARE_EVENT_TABLE()
-};
-
-// menu and control ids
-enum
-{
-    TreeTest_Quit,
-    TreeTest_About,
-    TreeTest_Dump,
-    TreeTest_DumpSelected,
-    TreeTest_Count,
-    TreeTest_CountRec,
-    TreeTest_Sort,
-    TreeTest_SortRev,
-    TreeTest_Bold,
-    TreeTest_UnBold,
-    TreeTest_Rename,
-    TreeTest_Delete,
-    TreeTest_DeleteChildren,
-    TreeTest_DeleteAll,
-    TreeTest_Recreate,
-    TreeTest_ToggleImages,
-    TreeTest_SetImageSize,
-    TreeTest_ToggleSel,
-    TreeTest_CollapseAndReset,
-    TreeTest_EnsureVisible,
-    TreeTest_AddItem,
-    TreeTest_InsertItem,
-    TreeTest_IncIndent,
-    TreeTest_DecIndent,
-    TreeTest_IncSpacing,
-    TreeTest_DecSpacing,
-    TreeTest_ToggleIcon,
-    TreeTest_Select,
-    TreeTest_Unselect,
-    TreeTest_Ctrl = 1000
-};
diff --git a/samples/treectrl/treetest.rc b/samples/treectrl/treetest.rc
deleted file mode 100644 (file)
index ba4cb54..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-mondrian ICON "mondrian.ico"
-aaaa     ICON "mondrian.ico"
-
-#include "wx/msw/wx.rc"
-
-icon1   ICON "bitmaps/file1.ico"
-icon2   ICON "bitmaps/file2.ico"
-icon3   ICON "bitmaps/folder1.ico"
-icon4   ICON "bitmaps/folder2.ico"
-icon5   ICON "bitmaps/folder3.ico"
-
-bitmap1   BITMAP "bitmaps/file1.bmp"
-bitmap2   BITMAP "bitmaps/file2.bmp"
-bitmap3   BITMAP "bitmaps/folder1.bmp"
-bitmap4   BITMAP "bitmaps/folder2.bmp"
-bitmap5   BITMAP "bitmaps/folder3.bmp"
-