renamed treectrl sample

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6706 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-03-14 18:37:46 +00:00 · 2000-03-14 18:37:46 +00:00 · 5301d93336
commit 5301d93336
parent e72007907a
15 changed files with 135 additions and 69 deletions
--- a/samples/treectrl/Makefile.in
+++ b/samples/treectrl/Makefile.in
@ -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

--- a/samples/treectrl/makefile.b32
+++ b/samples/treectrl/makefile.b32
@ -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
--- a/samples/treectrl/makefile.bcc
+++ b/samples/treectrl/makefile.bcc
@ -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
--- a/samples/treectrl/makefile.dos
+++ b/samples/treectrl/makefile.dos
@ -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

--- a/samples/treectrl/makefile.g95
+++ b/samples/treectrl/makefile.g95
@ -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

--- a/samples/treectrl/makefile.sc
+++ b/samples/treectrl/makefile.sc
@ -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
+
--- a/samples/treectrl/makefile.sl
+++ b/samples/treectrl/makefile.sl
@ -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
+
--- a/samples/treectrl/makefile.twn
+++ b/samples/treectrl/makefile.twn
@ -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
--- a/samples/treectrl/makefile.unx
+++ b/samples/treectrl/makefile.unx
@ -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)
--- a/samples/treectrl/makefile.vc
+++ b/samples/treectrl/makefile.vc
@ -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
--- a/samples/treectrl/makefile.wat
+++ b/samples/treectrl/makefile.wat
@ -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
--- a/samples/treectrl/treectrl.cpp
+++ b/samples/treectrl/treectrl.cpp
@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        treetest.cpp
+// Name:        treectrl.cpp
 // Purpose:     wxTreeCtrl sample
 // Author:      Julian Smart
 // Modified by:
@ -38,7 +38,7 @@
    #define NO_VARIABLE_HEIGHT
 #endif

-#include "treetest.h"
+#include "treectrl.h"

 // under Windows the icons are in the .rc file
 #ifndef __WXMSW__
--- a/samples/treectrl/treectrl.def
+++ b/samples/treectrl/treectrl.def
--- a/samples/treectrl/treectrl.h
+++ b/samples/treectrl/treectrl.h
@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        treetest.h
+// Name:        treectrl.h
 // Purpose:     wxTreeCtrl sample
 // Author:      Julian Smart
 // Modified by:
--- a/samples/treectrl/treectrl.rc
+++ b/samples/treectrl/treectrl.rc