From 5301d9333612e6d80f285752d26718475fce6c98 Mon Sep 17 00:00:00 2001
From: Ron Lee <ron@debian.org>
Date: Tue, 14 Mar 2000 18:37:46 +0000
Subject: [PATCH] renamed treectrl sample

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6706 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 samples/treectrl/Makefile.in                  | 14 ++-----
 samples/treectrl/makefile.b32                 | 12 ++----
 samples/treectrl/makefile.bcc                 | 11 ++----
 samples/treectrl/makefile.dos                 | 15 ++------
 samples/treectrl/makefile.g95                 | 14 ++-----
 samples/treectrl/makefile.sc                  | 37 +++++++++++++++++++
 samples/treectrl/makefile.sl                  | 14 +++++++
 samples/treectrl/makefile.twn                 | 35 ++++++++++++++++++
 samples/treectrl/makefile.unx                 | 23 ++++++++++++
 samples/treectrl/makefile.vc                  | 13 ++-----
 samples/treectrl/makefile.wat                 | 10 ++---
 .../treectrl/{treetest.cpp => treectrl.cpp}   |  4 +-
 .../treectrl/{treetest.def => treectrl.def}   |  0
 samples/treectrl/{treetest.h => treectrl.h}   |  2 +-
 samples/treectrl/{treetest.rc => treectrl.rc} |  0
 15 files changed, 135 insertions(+), 69 deletions(-)
 create mode 100644 samples/treectrl/makefile.sc
 create mode 100644 samples/treectrl/makefile.sl
 create mode 100644 samples/treectrl/makefile.twn
 create mode 100644 samples/treectrl/makefile.unx
 rename samples/treectrl/{treetest.cpp => treectrl.cpp} (99%)
 rename samples/treectrl/{treetest.def => treectrl.def} (100%)
 rename samples/treectrl/{treetest.h => treectrl.h} (99%)
 rename samples/treectrl/{treetest.rc => treectrl.rc} (100%)

diff --git a/samples/treectrl/Makefile.in b/samples/treectrl/Makefile.in
index fb2aa114c0..5a08e1e427 100644
--- 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
 
diff --git a/samples/treectrl/makefile.b32 b/samples/treectrl/makefile.b32
index ebd42c200d..a773d2eca4 100644
--- 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
diff --git a/samples/treectrl/makefile.bcc b/samples/treectrl/makefile.bcc
index 6956ffe0d3..1b873327e7 100644
--- 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
diff --git a/samples/treectrl/makefile.dos b/samples/treectrl/makefile.dos
index c1d52b22bf..5522bfd2d0 100644
--- 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
 
diff --git a/samples/treectrl/makefile.g95 b/samples/treectrl/makefile.g95
index b6e6ff10af..431577814b 100644
--- 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
 
diff --git a/samples/treectrl/makefile.sc b/samples/treectrl/makefile.sc
new file mode 100644
index 0000000000..d45d3f8036
--- /dev/null
+++ 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
+
diff --git a/samples/treectrl/makefile.sl b/samples/treectrl/makefile.sl
new file mode 100644
index 0000000000..6dc21d5a1c
--- /dev/null
+++ 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
+
diff --git a/samples/treectrl/makefile.twn b/samples/treectrl/makefile.twn
new file mode 100644
index 0000000000..32e0d50e45
--- /dev/null
+++ 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
diff --git a/samples/treectrl/makefile.unx b/samples/treectrl/makefile.unx
new file mode 100644
index 0000000000..71b7088089
--- /dev/null
+++ 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)
diff --git a/samples/treectrl/makefile.vc b/samples/treectrl/makefile.vc
index e784412750..9617fc4025 100644
--- 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
diff --git a/samples/treectrl/makefile.wat b/samples/treectrl/makefile.wat
index 1e789d7fc5..4c4dc94463 100644
--- 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
diff --git a/samples/treectrl/treetest.cpp b/samples/treectrl/treectrl.cpp
similarity index 99%
rename from samples/treectrl/treetest.cpp
rename to samples/treectrl/treectrl.cpp
index 716b2b3795..15a8cb2a6d 100644
--- a/samples/treectrl/treetest.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__
diff --git a/samples/treectrl/treetest.def b/samples/treectrl/treectrl.def
similarity index 100%
rename from samples/treectrl/treetest.def
rename to samples/treectrl/treectrl.def
diff --git a/samples/treectrl/treetest.h b/samples/treectrl/treectrl.h
similarity index 99%
rename from samples/treectrl/treetest.h
rename to samples/treectrl/treectrl.h
index 3e7a37edb5..6a6dc6702f 100644
--- a/samples/treectrl/treetest.h
+++ b/samples/treectrl/treectrl.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        treetest.h
+// Name:        treectrl.h
 // Purpose:     wxTreeCtrl sample
 // Author:      Julian Smart
 // Modified by:
diff --git a/samples/treectrl/treetest.rc b/samples/treectrl/treectrl.rc
similarity index 100%
rename from samples/treectrl/treetest.rc
rename to samples/treectrl/treectrl.rc
-- 
2.50.0