*** empty log message ***

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1998-05-22 19:57:05 +00:00
parent 69d2886dfe
commit 457814b5aa
294 changed files with 22682 additions and 0 deletions
--- a/samples/treectrl/aiai.ico
+++ b/samples/treectrl/aiai.ico
--- a/samples/treectrl/makefile.b32
+++ b/samples/treectrl/makefile.b32
@@ -0,0 +1,62 @@
+#
+# File:		makefile.bcc
+# Author:	Julian Smart
+# Created:	1993
+# Updated:	
+# Copyright:	(c) 1993, AIAI, University of Edinburgh
+#
+# "%W% %G%"
+#
+# Makefile : Builds treetest example (DOS).
+
+# WXWIN and BCCDIR are set by parent make
+
+WXDIR = $(WXWIN)
+!include $(WXDIR)\src\makeb32.env
+
+WXLIBDIR = $(WXDIR)\lib
+WXLIB = $(WXLIBDIR)\wx32.lib
+LIBS=$(WXLIB) cw32 import32
+
+TARGET=treetest
+
+!if "$(FINAL)" == "0"
+LINKFLAGS=/v /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
+OPT = -Od
+DEBUG_FLAGS= -v
+!else
+LINKFLAGS=/Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
+OPT = -Od
+DEBUG_FLAGS =
+!endif
+CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
+
+OBJECTS = treetest.obj
+
+$(TARGET).exe:	$(OBJECTS) $(TARGET).def $(TARGET).res
+  tlink32 $(LINKFLAGS) @&&!
+c0w32.obj $(OBJECTS)
+$(TARGET)
+nul
+$(LIBS)
+!
+        brc32 -K $(TARGET).res
+
+.$(SRCSUFF).obj:
+	bcc32 $(CPPFLAGS) -c {$< }
+
+.c.obj:
+	bcc32 $(CPPFLAGS) -P- -c {$< }
+
+treetest.obj:      treetest.$(SRCSUFF)
+
+$(TARGET).res :      $(TARGET).rc $(WXDIR)\include\wx\msw\wx.rc
+    brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include $(TARGET)
+
+clean:
+        -erase *.obj
+        -erase *.exe
+        -erase *.res
+        -erase *.map
+        -erase *.rws
+
--- a/samples/treectrl/makefile.bcc
+++ b/samples/treectrl/makefile.bcc
@@ -0,0 +1,73 @@
+#
+# File:		makefile.bcc
+# Author:	Julian Smart
+# Created:	1993
+# Updated:	
+# Copyright:	(c) 1993, AIAI, University of Edinburgh
+#
+# "%W% %G%"
+#
+# Makefile : Builds minimal example (DOS).
+
+!if "$(BCCDIR)" == ""
+!error You must define the BCCDIR variable in autoexec.bat, e.g. BCCDIR=d:\bc4
+!endif
+
+!if "$(WXWIN)" == ""
+!error You must define the WXWIN variable in autoexec.bat, e.g. WXWIN=c:\wx
+!endif
+
+WXDIR = $(WXWIN)
+!include $(WXDIR)\src\makebcc.env
+
+THISDIR = $(WXDIR)\samples\minimal
+WXLIB = $(WXDIR)\lib\wx.lib
+LIBS=$(WXLIB) mathwl cwl import
+INC=-I$(WXDIR)\include\base -I$(WXDIR)\include\msw
+CFG=$(WXDIR)\src\wxwin.cfg
+
+!ifndef FINAL
+FINAL=0
+!endif
+
+!if "$(FINAL)" == "0"
+LINKFLAGS=/v/Vt /Twe /L$(WXDIR)\lib;$(BCCDIR)\lib
+OPT = -Od
+DEBUG_FLAGS= -v
+!else
+LINKFLAGS=/Twe /L$(WXDIR)\lib;$(BCCDIR)\lib
+OPT = -O2
+DEBUG_FLAGS=
+!endif
+CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
+
+OBJECTS = minimal.obj
+
+minimal:    minimal.exe
+
+all:    minimal.exe
+
+minimal.exe:    $(WXLIB) minimal.obj minimal.def minimal.res
+        tlink $(LINKFLAGS) @&&!
+c0wl.obj minimal.obj
+minimal
+nul
+$(LIBS)
+minimal.def
+!
+        rc -31 -K minimal.res
+
+.$(SRCSUFF).obj:
+	bcc $(CPPFLAGS) -c {$< }
+
+minimal.obj:      minimal.$(SRCSUFF)
+
+minimal.res :      minimal.rc $(WXDIR)\include\msw\wx.rc
+    rc -r /i$(BCCDIR)\include /i$(WXDIR)\include\msw /i$(WXDIR)\contrib\fafa minimal
+
+clean:
+        -erase *.obj
+        -erase *.exe
+        -erase *.res
+        -erase *.map
+        -erase *.rws
--- a/samples/treectrl/makefile.dos
+++ b/samples/treectrl/makefile.dos
@@ -0,0 +1,81 @@
+#
+# File:		makefile.dos
+# Author:	Julian Smart
+# Created:	1993
+# Updated:	
+# Copyright:	(c) 1993, AIAI, University of Edinburgh
+#
+# "%W% %G%"
+#
+# Makefile : Builds minimal example (DOS).
+# Use FINAL=1 argument to nmake to build final version with no debugging
+# info
+
+WXDIR = $(WXWIN)
+
+!include $(WXDIR)\src\makemsc.env
+
+THISDIR = $(WXDIR)\samples\minimal
+WXLIB = $(WXDIR)\lib\wx.lib
+LIBS=$(WXLIB) oldnames libw llibcew commdlg shell ddeml
+
+!ifndef FINAL
+FINAL=0
+!endif
+
+INC=/I$(WXDIR)\include\msw /I$(WXDIR)\include\base
+
+# Set this to nothing if using MS C++ 7
+ZOPTION=/Z7
+
+!if "$(FINAL)" == "0"
+CPPFLAGS=/AL /W3 /Zi $(ZOPTION) /G2sw /Od /YuWX_PREC.H /Dwx_msw /Fp$(WXDIR)\src\msw\wx.pch $(INC)
+LINKFLAGS=/NOD /CO /ONERROR:NOEXE /SEG:512
+!else
+CPPFLAGS=/AL /W3 /G2sw /Ox /YuWX_PREC.H /Dwx_msw /Fp$(WXDIR)\src\msw\wx.pch $(INC)
+LINKFLAGS=/NOD /ONERROR:NOEXE /SEG:512
+!endif
+
+HEADERS =
+SOURCES = minimal.$(SRCSUFF)
+OBJECTS = minimal.obj
+
+all:    minimal.exe
+
+wx:
+        cd $(WXDIR)\src\msw
+        nmake -f makefile.dos FINAL=$(FINAL)
+        cd $(THISDIR)
+
+wxclean:
+        cd $(WXDIR)\src\msw
+        nmake -f makefile.dos clean
+        cd $(THISDIR)
+
+
+minimal.exe:      $(WXDIR)\src\msw\dummy.obj $(WXLIB) minimal.obj minimal.def minimal.res
+        link $(LINKFLAGS) @<<
+minimal.obj $(WXDIR)\src\msw\dummy.obj,
+minimal,
+NUL,
+$(LIBS),
+minimal.def
+;
+<<
+        rc -30 -K minimal.res
+
+minimal.obj:      minimal.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF)
+<<
+
+minimal.res :      minimal.rc $(WXDIR)\include\msw\wx.rc
+    rc -r /dFAFA_LIB /i$(WXDIR)\contrib\fafa /i$(WXDIR)\include\msw minimal
+
+clean:
+        -erase *.obj
+        -erase *.exe
+        -erase *.res
+        -erase *.map
+        -erase *.sbr
+        -erase *.pdb
--- a/samples/treectrl/makefile.g95
+++ b/samples/treectrl/makefile.g95
@@ -0,0 +1,38 @@
+#
+# File:		makefile.unx
+# Author:	Julian Smart
+# Created:	1993
+# Updated:	
+# Copyright:	(c) 1993, AIAI, University of Edinburgh
+#
+# "%W% %G%"
+#
+# Makefile for treetest example (UNIX).
+
+WXDIR = ../..
+
+# All common UNIX compiler flags and options are now in
+# this central makefile.
+include $(WXDIR)/src/makeg95.env
+
+OBJECTS = $(OBJDIR)/treetest.$(OBJSUFF) $(OBJDIR)/treetest_resources.$(OBJSUFF)
+
+all:    $(OBJDIR) treetest$(GUISUFFIX)$(EXESUFF)
+
+wx:
+
+$(OBJDIR):
+	mkdir $(OBJDIR)
+
+treetest$(GUISUFFIX)$(EXESUFF):	$(OBJECTS) $(WXLIB)
+	$(CC) $(LDFLAGS) -o treetest$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(LDLIBS)
+
+$(OBJDIR)/treetest.$(OBJSUFF):	treetest.$(SRCSUFF)
+	$(CC) -c $(CPPFLAGS) -o $@ treetest.$(SRCSUFF)
+
+$(OBJDIR)/treetest_resources.o:  treetest.rc
+	$(RESCOMP) -i treetest.rc -o $(OBJDIR)/treetest_resources.o $(RESFLAGS)
+
+
+clean:
+	rm -f $(OBJECTS) treetest$(GUISUFFIX).exe core *.rsc *.res
--- a/samples/treectrl/makefile.nt
+++ b/samples/treectrl/makefile.nt
@@ -0,0 +1,64 @@
+#
+# File:		makefile.nt
+# Author:	Julian Smart
+# Created:	1997
+# Updated:	
+# Copyright:
+#
+# "%W% %G%"
+#
+# Makefile : Builds wxTreeCtrl example (MS VC++).
+# Use FINAL=1 argument to nmake to build final version with no debugging
+# info
+
+# Set WXDIR for your system
+WXDIR = $(WXWIN)
+
+WXUSINGDLL=0
+
+!include $(WXDIR)\src\ntwxwin.mak
+
+THISDIR = $(WXDIR)\samples\treectrl
+PROGRAM=treetest
+
+OBJECTS = $(PROGRAM).obj
+
+$(PROGRAM):    $(PROGRAM).exe
+
+all:    wx $(PROGRAM).exe
+
+wx:
+        cd $(WXDIR)\src\msw
+        nmake -f makefile.nt FINAL=$(FINAL)
+        cd $(THISDIR)
+
+wxclean:
+        cd $(WXDIR)\src\msw
+        nmake -f makefile.nt clean
+        cd $(THISDIR)
+
+$(PROGRAM).exe:      $(DUMMYOBJ) $(WXLIB) $(OBJECTS) $(PROGRAM).res
+	$(link) @<<
+-out:$(PROGRAM).exe
+$(LINKFLAGS)
+$(DUMMYOBJ) $(OBJECTS) $(PROGRAM).res
+$(LIBS)
+<<
+
+
+$(PROGRAM).obj:      $(PROGRAM).$(SRCSUFF) $(DUMMYOBJ)
+        $(cc) @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF)
+<<
+
+$(PROGRAM).res :      $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc
+    $(rc) -r /i$(WXDIR)\include -fo$@ $(PROGRAM).rc
+
+
+clean:
+        -erase *.obj
+        -erase *.exe
+        -erase *.res
+        -erase *.map
+        -erase *.sbr
+        -erase *.pdb
--- a/samples/treectrl/makefile.sc
+++ b/samples/treectrl/makefile.sc
@@ -0,0 +1,35 @@
+# Symantec C++ makefile for minimal example
+# NOTE that peripheral libraries are now dealt in main wxWindows makefile.
+
+WXDIR = $(WXWIN)
+!include $(WXDIR)\src\makesc.env
+
+WXLIB = $(WXDIR)\lib\wx.lib
+INCDIR = $(WXDIR)\include
+MSWINC = $(INCDIR)\msw
+BASEINC = $(INCDIR)\base
+
+CC=sc
+RC=rc
+CFLAGS = -o -ml -W -Dwx_msw
+LDFLAGS = -ml -W
+
+INCLUDE=$(BASEINC);$(MSWINC)
+
+LIBS=$(WXLIB) libw.lib commdlg.lib shell.lib
+
+.$(SRCSUFF).obj:
+	*$(CC) -c $(CFLAGS) -I$(INCLUDE) $<
+
+.rc.res:
+	*$(RC) -r -I$(INCLUDE) $<
+
+minimal.exe: minimal.obj minimal.def minimal.res
+	*$(CC) $(LDFLAGS) -o$@ $** $(LIBS)
+
+clean:
+        -del *.obj
+	-del *.exe
+	-del *.res
+	-del *.map
+	-del *.rws
--- a/samples/treectrl/makefile.unx
+++ b/samples/treectrl/makefile.unx
@@ -0,0 +1,58 @@
+#
+# File:		makefile.unx
+# Author:	Julian Smart
+# Created:	1993
+# Updated:	
+# Copyright:	(c) 1993, AIAI, University of Edinburgh
+#
+# "%W% %G%"
+#
+# Makefile for minimal example (UNIX).
+
+WXDIR = ../..
+
+# All common UNIX compiler flags and options are now in
+# this central makefile.
+include $(WXDIR)/src/make.env
+
+OBJECTS = $(OBJDIR)/minimal.$(OBJSUFF)
+
+.SUFFIXES:
+
+all:    $(OBJDIR) minimal$(GUISUFFIX)
+
+wx:
+
+
+motif:
+	$(MAKE) -f makefile.unx GUISUFFIX=_motif GUI=-Dwx_motif GUISUFFIX=_motif OPT='$(OPT)' LDLIBS='$(MOTIFLDLIBS)' WXLIB=$(WXDIR)/lib/libwx_motif.a  OPTIONS='$(OPTIONS)' DEBUG='$(DEBUG)' WARN='$(WARN)' XLIB='$(XLIB)' XINCLUDE='$(XINCLUDE)' XVIEW_LINK=
+
+xview:
+	cd $(WXDIR)/src/x; $(MAKE) -f makefile.unx xview
+	$(MAKE) -f makefile.unx GUI=-Dwx_xview GUISUFFIX=_ol CC=$(CC) OPTIONS='$(OPTIONS)' DEBUG='$(DEBUG)' WARN='$(WARN)' XLIB='$(XLIB)' XINCLUDE='$(XINCLUDE)'
+
+hp:
+	cd $(WXDIR)/src/x; $(MAKE) -f makefile.unx hp
+	$(MAKE) -f makefile.unx GUI=-Dwx_motif GUISUFFIX=_hp CC=CC DEBUG='$(DEBUG)' WARN='-w' \
+         XINCLUDE='$(HPXINCLUDE)' XLIB='$(HPXLIB)' XVIEW_LINK='' LDLIBS='$(HPLDLIBS)'
+
+$(OBJDIR):
+	mkdir $(OBJDIR)
+
+minimal$(GUISUFFIX):	$(OBJDIR)/minimal.$(OBJSUFF) $(WXLIB)
+	$(CC) $(LDFLAGS) -o minimal$(GUISUFFIX) $(OBJDIR)/minimal.$(OBJSUFF) $(XVIEW_LINK) $(LDLIBS)
+
+$(OBJDIR)/minimal.$(OBJSUFF):	minimal.$(SRCSUFF)
+	$(CC) -c $(CPPFLAGS) -o $@ minimal.$(SRCSUFF)
+
+clean_motif:
+	$(MAKE) -f makefile.unx GUISUFFIX=_motif cleanany
+
+clean_ol:
+	$(MAKE) -f makefile.unx GUISUFFIX=_ol cleanany
+
+clean_hp:
+	$(MAKE) -f makefile.unx GUISUFFIX=_hp cleanany
+
+cleanany:
+	rm -f $(OBJECTS) minimal$(GUISUFFIX) core
--- a/samples/treectrl/makefile.vms
+++ b/samples/treectrl/makefile.vms
@@ -0,0 +1,38 @@
+#************************************************************************
+# Makefile for MINIMAL under VMS
+# by Stefan Hammes
+# (incomplete) update history:
+# 11.04.95
+#************************************************************************
+
+#************************************************************************
+# Definition section
+# (cave: definitions and includes must begin with ',')
+#************************************************************************
+
+APPOPTS = 
+APPDEFS = 
+APPINCS = 
+
+#************************************************************************
+# Module section
+#************************************************************************
+
+# Name of main module
+MAIN = minimal
+
+# Object modules of the application.
+OBJS = minimal.obj
+OBJLIST =minimal.obj
+
+.include [--.src]makevms.env
+
+# main dependency
+$(MAIN).exe : $(OBJS)
+    $(LINK) $(LINKFLAGS) /exec=$(MAIN).exe $(OBJLIST),$(WXLIB)/lib,$(OPTSFILE)/option
+    - purge *.exe
+
+#************************************************************************
+# Header file depedencies following
+#************************************************************************
+
--- a/samples/treectrl/makefile.wat
+++ b/samples/treectrl/makefile.wat
@@ -0,0 +1,43 @@
+#
+# Makefile for WATCOM
+#
+# Created by D.Chubraev, chubraev@iem.ee.ethz.ch
+# 8 Nov 1994
+#
+
+WXDIR = ..\.. 
+
+!include $(WXDIR)\src\makewat.env
+
+WXLIB = $(WXDIR)\lib
+NAME = minimal
+LNK = $(name).lnk
+OBJS = $(name).obj 
+
+all: $(name).exe
+
+$(name).exe : $(OBJS) $(name).res $(LNK) $(WXLIB)\wx$(LEVEL).lib
+    wlink @$(LNK)
+    $(BINDCOMMAND) $(name).res
+
+$(name).res :      $(name).rc $(WXDIR)\include\msw\wx.rc
+     $(RC) $(RESFLAGS1) $(name).rc
+
+$(LNK) : makefile.wat
+    %create $(LNK)
+    @%append $(LNK) debug all
+    @%append $(LNK) system $(LINKOPTION)
+    @%append $(LNK) $(MINDATA)
+    @%append $(LNK) $(MAXDATA)
+    @%append $(LNK) $(STACK)
+    @%append $(LNK) name $(name)
+    @%append $(LNK) file $(WXLIB)\wx$(LEVEL).lib
+    @for %i in ($(EXTRALIBS)) do @%append $(LNK) file %i
+    @for %i in ($(OBJS)) do @%append $(LNK) file %i
+
+thing: .SYMBOLIC
+    echo $(WATLIBDIR)
+
+clean:   .SYMBOLIC
+    -erase *.obj *.bak *.err *.pch *.lib *.lnk *.res *.exe
+
--- a/samples/treectrl/mondrian.ico
+++ b/samples/treectrl/mondrian.ico
--- a/samples/treectrl/treetest.cpp
+++ b/samples/treectrl/treetest.cpp
@@ -0,0 +1,383 @@
+/////////////////////////////////////////////////////////////////////////////
+// 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/treectrl.h"
+
+#include "treetest.h"
+
+BEGIN_EVENT_TABLE(MyFrame, wxFrame)
+	EVT_MENU(TREE_QUIT, MyFrame::OnQuit)
+	EVT_MENU(TREE_ABOUT, MyFrame::OnAbout)
+END_EVENT_TABLE()
+
+BEGIN_EVENT_TABLE(MyTreeCtrl, wxTreeCtrl)
+	EVT_TREE_BEGIN_DRAG(TREE_CTRL, MyTreeCtrl::OnBeginDrag)
+	EVT_TREE_BEGIN_RDRAG(TREE_CTRL, MyTreeCtrl::OnBeginRDrag)
+	EVT_TREE_BEGIN_LABEL_EDIT(TREE_CTRL, MyTreeCtrl::OnBeginLabelEdit)
+	EVT_TREE_END_LABEL_EDIT(TREE_CTRL, MyTreeCtrl::OnEndLabelEdit)
+	EVT_TREE_DELETE_ITEM(TREE_CTRL, MyTreeCtrl::OnDeleteItem)
+	EVT_TREE_GET_INFO(TREE_CTRL, MyTreeCtrl::OnGetInfo)
+	EVT_TREE_SET_INFO(TREE_CTRL, MyTreeCtrl::OnSetInfo)
+	EVT_TREE_ITEM_EXPANDED(TREE_CTRL, MyTreeCtrl::OnItemExpanded)
+	EVT_TREE_ITEM_EXPANDING(TREE_CTRL, MyTreeCtrl::OnItemExpanding)
+	EVT_TREE_SEL_CHANGED(TREE_CTRL, MyTreeCtrl::OnSelChanged)
+	EVT_TREE_SEL_CHANGING(TREE_CTRL, MyTreeCtrl::OnSelChanging)
+	EVT_TREE_KEY_DOWN(TREE_CTRL, MyTreeCtrl::OnKeyDown)
+END_EVENT_TABLE()
+
+IMPLEMENT_APP(MyApp)
+
+// `Main program' equivalent, creating windows and returning main app frame
+bool MyApp::OnInit(void)
+{
+  // Create the main frame window
+  MyFrame *frame = new MyFrame(NULL, "wxTreeCtrl Test", 50, 50, 450, 340);
+
+  // 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.
+  frame->SetBackgroundColour(wxColour(255, 255, 255));
+
+  // Give it an icon
+#ifdef __WINDOWS__
+  frame->SetIcon(wxIcon("mondrian"));
+#endif
+#ifdef __X__
+  frame->SetIcon(wxIcon("aiai.xbm"));
+#endif
+
+  // Make an image list containing large icons
+  m_imageListNormal = new wxImageList(16, 16, TRUE);
+
+  wxIcon *icon = new wxIcon("icon1", wxBITMAP_TYPE_ICO_RESOURCE);
+  m_imageListNormal->Add(*icon);
+  delete icon;
+  icon = new wxIcon("icon2", wxBITMAP_TYPE_ICO_RESOURCE);
+  m_imageListNormal->Add(*icon);
+  delete icon;
+
+  // Make a menubar
+  wxMenu *file_menu = new wxMenu;
+
+  file_menu->Append(TREE_ABOUT, "&About");
+  file_menu->Append(TREE_QUIT, "E&xit");
+  wxMenuBar *menu_bar = new wxMenuBar;
+  menu_bar->Append(file_menu, "&File");
+  frame->SetMenuBar(menu_bar);
+
+  // Make a panel with a message
+  frame->m_treeCtrl = new MyTreeCtrl(frame, TREE_CTRL, wxPoint(0, 0), wxSize(400, 200),
+  	wxTR_HAS_BUTTONS|wxSUNKEN_BORDER);
+  frame->m_logWindow = new wxTextCtrl(frame, -1, "", wxPoint(0, 0), wxSize(400, 200),
+  	wxTE_MULTILINE|wxSUNKEN_BORDER);
+
+  wxLayoutConstraints *c = new wxLayoutConstraints;
+  c->top.SameAs			(frame, wxTop);
+  c->left.SameAs		(frame, wxLeft);
+  c->right.SameAs		(frame, wxRight);
+  c->height.PercentOf	(frame, wxHeight, 66);
+  frame->m_treeCtrl->SetConstraints(c);
+
+  c = new wxLayoutConstraints;
+  c->top.Below			(frame->m_treeCtrl);
+  c->left.SameAs		(frame, wxLeft);
+  c->right.SameAs		(frame, wxRight);
+  c->bottom.SameAs		(frame, wxBottom);
+  frame->m_logWindow->SetConstraints(c);
+  frame->SetAutoLayout(TRUE);
+
+  frame->m_treeCtrl->SetImageList(wxGetApp().m_imageListNormal, wxIMAGE_LIST_NORMAL);
+
+  long rootId = frame->m_treeCtrl->InsertItem(0, "Root", 0);
+
+  char buf[20];
+  int i;
+  wxString str;
+
+  for ( i = 0; i < 10; i++)
+  {
+	sprintf(buf, "Folder child %d", i);
+    str = buf;
+    long id = frame->m_treeCtrl->InsertItem(rootId, str, 0);
+	int j;
+    for ( j = 0; j < 5; j++)
+    {
+	  sprintf(buf, "File child %d", j);
+      str = buf;
+      frame->m_treeCtrl->InsertItem(id, str, 1);
+    }
+  }
+  for ( i = 0; i < 10; i++)
+  {
+	sprintf(buf, "File child %d", i);
+    str = buf;
+    frame->m_treeCtrl->InsertItem(rootId, str, 1);
+  }
+
+  frame->CreateStatusBar(3);
+  frame->SetStatusText("", 0);
+
+  // Show the frame
+  frame->Show(TRUE);
+  
+  SetTopWindow(frame);
+
+  return TRUE;
+}
+
+// My frame constructor
+MyFrame::MyFrame(wxFrame *frame, char *title, int x, int y, int w, int h):
+  wxFrame(frame, -1, title, wxPoint(x, y), wxSize(w, h))
+{
+	m_treeCtrl = NULL;
+	m_logWindow = NULL;
+}
+
+MyFrame::~MyFrame(void)
+{
+	delete wxGetApp().m_imageListNormal;
+}
+
+void MyFrame::OnQuit(wxCommandEvent& event)
+{
+  Close(TRUE);
+}
+
+void MyFrame::OnAbout(wxCommandEvent& event)
+{
+  wxMessageDialog dialog(this, "Tree test sample\nJulian Smart (c) 1997",
+  	"About tree test", wxOK|wxCANCEL);
+
+  dialog.ShowModal();
+}
+
+// MyTreeCtrl
+
+void MyTreeCtrl::OnBeginDrag(wxTreeEvent& event)
+{
+	if ( !wxGetApp().GetTopWindow() )
+		return;
+
+	wxTextCtrl *text = ((MyFrame *)wxGetApp().GetTopWindow())->m_logWindow;
+	if ( !text )
+		return;
+
+#ifndef __GNUWIN32__
+	ostream str(text);
+
+	str << "OnBeginDrag\n";
+	str.flush();
+#endif
+}
+
+void MyTreeCtrl::OnBeginRDrag(wxTreeEvent& event)
+{
+	if ( !wxGetApp().GetTopWindow() )
+		return;
+
+	wxTextCtrl *text = ((MyFrame *)wxGetApp().GetTopWindow())->m_logWindow;
+	if ( !text )
+		return;
+
+#ifndef __GNUWIN32__
+	ostream str(text);
+
+	str << "OnBeginRDrag\n";
+	str.flush();
+#endif
+}
+
+void MyTreeCtrl::OnBeginLabelEdit(wxTreeEvent& event)
+{
+	if ( !wxGetApp().GetTopWindow() )
+		return;
+
+	wxTextCtrl *text = ((MyFrame *)wxGetApp().GetTopWindow())->m_logWindow;
+	if ( !text )
+		return;
+
+#ifndef __GNUWIN32__
+	ostream str(text);
+
+	str << "OnBeginLabelEdit\n";
+	str.flush();
+#endif
+}
+
+void MyTreeCtrl::OnEndLabelEdit(wxTreeEvent& event)
+{
+	if ( !wxGetApp().GetTopWindow() )
+		return;
+
+	wxTextCtrl *text = ((MyFrame *)wxGetApp().GetTopWindow())->m_logWindow;
+	if ( !text )
+		return;
+
+#ifndef __GNUWIN32__
+	ostream str(text);
+
+	str << "OnEndLabelEdit\n";
+	str.flush();
+#endif
+}
+
+void MyTreeCtrl::OnDeleteItem(wxTreeEvent& event)
+{
+	if ( !wxGetApp().GetTopWindow() )
+		return;
+
+	wxTextCtrl *text = ((MyFrame *)wxGetApp().GetTopWindow())->m_logWindow;
+	if ( !text )
+		return;
+
+#ifndef __GNUWIN32__
+	ostream str(text);
+
+	str << "OnDeleteItem\n";
+	str.flush();
+#endif
+}
+
+void MyTreeCtrl::OnGetInfo(wxTreeEvent& event)
+{
+	if ( !wxGetApp().GetTopWindow() )
+		return;
+
+	wxTextCtrl *text = ((MyFrame *)wxGetApp().GetTopWindow())->m_logWindow;
+	if ( !text )
+		return;
+
+#ifndef __GNUWIN32__
+	ostream str(text);
+
+	str << "OnGetInfo\n";
+	str.flush();
+#endif
+}
+
+void MyTreeCtrl::OnSetInfo(wxTreeEvent& event)
+{
+	if ( !wxGetApp().GetTopWindow() )
+		return;
+
+	wxTextCtrl *text = ((MyFrame *)wxGetApp().GetTopWindow())->m_logWindow;
+	if ( !text )
+		return;
+
+#ifndef __GNUWIN32__
+	ostream str(text);
+
+	str << "OnSetInfo\n";
+	str.flush();
+#endif
+}
+
+void MyTreeCtrl::OnItemExpanded(wxTreeEvent& event)
+{
+	if ( !wxGetApp().GetTopWindow() )
+		return;
+
+	wxTextCtrl *text = ((MyFrame *)wxGetApp().GetTopWindow())->m_logWindow;
+	if ( !text )
+		return;
+
+#ifndef __GNUWIN32__
+	ostream str(text);
+
+	str << "OnItemExpanded\n";
+	str.flush();
+#endif
+}
+
+void MyTreeCtrl::OnItemExpanding(wxTreeEvent& event)
+{
+	if ( !wxGetApp().GetTopWindow() )
+		return;
+
+	wxTextCtrl *text = ((MyFrame *)wxGetApp().GetTopWindow())->m_logWindow;
+	if ( !text )
+		return;
+
+#ifndef __GNUWIN32__
+	ostream str(text);
+
+	str << "OnItemExpanding\n";
+	str.flush();
+#endif
+}
+
+void MyTreeCtrl::OnSelChanged(wxTreeEvent& event)
+{
+	if ( !wxGetApp().GetTopWindow() )
+		return;
+
+	wxTextCtrl *text = ((MyFrame *)wxGetApp().GetTopWindow())->m_logWindow;
+	if ( !text )
+		return;
+
+#ifndef __GNUWIN32__
+	ostream str(text);
+
+	str << "OnSelChanged\n";
+	str.flush();
+#endif
+}
+
+void MyTreeCtrl::OnSelChanging(wxTreeEvent& event)
+{
+	if ( !wxGetApp().GetTopWindow() )
+		return;
+
+	wxTextCtrl *text = ((MyFrame *)wxGetApp().GetTopWindow())->m_logWindow;
+	if ( !text )
+		return;
+
+#ifndef __GNUWIN32__
+	ostream str(text);
+
+	str << "OnSelChanging\n";
+	str.flush();
+#endif
+}
+
+void MyTreeCtrl::OnKeyDown(wxTreeEvent& event)
+{
+	if ( !wxGetApp().GetTopWindow() )
+		return;
+
+	wxTextCtrl *text = ((MyFrame *)wxGetApp().GetTopWindow())->m_logWindow;
+	if ( !text )
+		return;
+
+#ifndef __GNUWIN32__
+	ostream str(text);
+
+	str << "OnKeyDown\n";
+	str.flush();
+#endif
+}
+
--- a/samples/treectrl/treetest.def
+++ b/samples/treectrl/treetest.def
@@ -0,0 +1,9 @@
+      *   Last change:  JS   28 Apr 97    1:45 pm
+NAME         TreeCtrl
+DESCRIPTION  'TreeCtrl wxWindows application'
+EXETYPE      WINDOWS
+STUB         'WINSTUB.EXE'
+CODE         PRELOAD MOVEABLE DISCARDABLE
+DATA         PRELOAD MOVEABLE MULTIPLE
+HEAPSIZE     1024
+STACKSIZE    8192
--- a/samples/treectrl/treetest.h
+++ b/samples/treectrl/treetest.h
@@ -0,0 +1,69 @@
+/////////////////////////////////////////////////////////////////////////////
+// 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:
+    bool OnInit(void);
+
+    wxImageList *m_imageListNormal;
+};
+
+class MyTreeCtrl: public wxTreeCtrl
+{
+public:
+   MyTreeCtrl(wxWindow *parent, const wxWindowID id, const wxPoint& pos,
+    const wxSize& size, long style):
+        wxTreeCtrl(parent, id, pos, size, style)
+   {
+   }
+
+	void OnBeginDrag(wxTreeEvent& event);
+	void OnBeginRDrag(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 OnSelChanged(wxTreeEvent& event);
+	void OnSelChanging(wxTreeEvent& event);
+	void OnKeyDown(wxTreeEvent& event);
+
+   DECLARE_EVENT_TABLE()
+};
+
+// Define a new frame type
+class MyFrame: public wxFrame
+{ public:
+    MyTreeCtrl *m_treeCtrl;
+    wxTextCtrl *m_logWindow;
+
+    MyFrame(wxFrame *frame, char *title, int x, int y, int w, int h);
+    ~MyFrame(void);
+    
+ public:
+    void OnQuit(wxCommandEvent& event);
+    void OnAbout(wxCommandEvent& event);
+	bool OnClose(void) { return TRUE; }
+
+   DECLARE_EVENT_TABLE()
+};
+
+
+// ID for the menu quit command
+#define TREE_QUIT 	1
+#define TREE_ABOUT 	102
+
+#define TREE_CTRL   1000
+
+
--- a/samples/treectrl/treetest.rc
+++ b/samples/treectrl/treetest.rc
@@ -0,0 +1,7 @@
+mondrian ICON "mondrian.ico"
+aaaa     ICON "mondrian.ico"
+#include "wx/msw/wx.rc"
+
+icon1   ICON "bitmaps\\folder1.ico"
+icon2   ICON "bitmaps\\file1.ico"
+