From 07a9af327e1ce49afe9528ab761f98123387d853 Mon Sep 17 00:00:00 2001 From: Ron Lee Date: Tue, 14 Mar 2000 19:55:34 +0000 Subject: [PATCH] renamed treelay sample git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6716 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/treelay/Makefile.in | 16 +++------- samples/treelay/makefile.b32 | 12 ++------ samples/treelay/makefile.bcc | 11 ++----- samples/treelay/makefile.dos | 13 ++------ samples/treelay/makefile.g95 | 14 +++------ samples/treelay/makefile.sc | 37 +++++++++++++++++++++++ samples/treelay/makefile.sl | 14 +++++++++ samples/treelay/makefile.twn | 35 +++++++++++++++++++++ samples/treelay/makefile.unx | 20 +++--------- samples/treelay/makefile.vc | 13 ++------ samples/treelay/makefile.wat | 10 ++---- samples/treelay/{test.cpp => treelay.cpp} | 10 +++--- samples/treelay/{test.def => treelay.def} | 4 +-- samples/treelay/{test.h => treelay.h} | 2 +- samples/treelay/{test.rc => treelay.rc} | 0 15 files changed, 121 insertions(+), 90 deletions(-) create mode 100644 samples/treelay/makefile.sc create mode 100644 samples/treelay/makefile.sl create mode 100644 samples/treelay/makefile.twn rename samples/treelay/{test.cpp => treelay.cpp} (97%) rename samples/treelay/{test.def => treelay.def} (75%) rename samples/treelay/{test.h => treelay.h} (98%) rename samples/treelay/{test.rc => treelay.rc} (100%) diff --git a/samples/treelay/Makefile.in b/samples/treelay/Makefile.in index 2b50609a91..2e838aee16 100644 --- a/samples/treelay/Makefile.in +++ b/samples/treelay/Makefile.in @@ -1,19 +1,11 @@ -# -# File: makefile.unx -# Author: Julian Smart -# Created: 1998 -# Updated: -# Copyright: (c) 1998 Julian Smart -# -# "%W% %G%" -# -# Makefile for test example (UNIX). +# Purpose: makefile for treelay example (UNIX). +# Created: 2000-03-15 top_srcdir = @top_srcdir@/.. top_builddir = ../.. -program_dir = samples/test +program_dir = samples/treelay -PROGRAM=test +PROGRAM=treelay OBJECTS=$(PROGRAM).o diff --git a/samples/treelay/makefile.b32 b/samples/treelay/makefile.b32 index 95ddc80d76..81050ded3e 100644 --- a/samples/treelay/makefile.b32 +++ b/samples/treelay/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 treelay example (BC++ 32bit) +# Created: 2000-03-15 WXDIR = $(WXWIN) -TARGET=test +TARGET=treelay OBJECTS = $(TARGET).obj !include $(WXDIR)\src\makeprog.b32 diff --git a/samples/treelay/makefile.bcc b/samples/treelay/makefile.bcc index 669f01905a..ef7ce85661 100644 --- a/samples/treelay/makefile.bcc +++ b/samples/treelay/makefile.bcc @@ -1,10 +1,5 @@ -# -# File: makefile.bcc -# Author: Julian Smart -# Created: 1998 -# Updated: -# -# Builds a BC++ 16-bit sample +# Purpose: makefile for treelay 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=test +TARGET=treelay OBJECTS=$(TARGET).obj !include $(WXDIR)\src\makeprog.bcc diff --git a/samples/treelay/makefile.dos b/samples/treelay/makefile.dos index 983ef2da8b..79cebff0ad 100644 --- a/samples/treelay/makefile.dos +++ b/samples/treelay/makefile.dos @@ -1,16 +1,9 @@ -# -# 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 treelay example (VC++ 1.5x) +# Created: 2000-03-15 WXDIR = $(WXWIN) -TARGET=test +TARGET=treelay OBJECTS=$(TARGET).obj !include $(WXDIR)\src\makeprog.msc diff --git a/samples/treelay/makefile.g95 b/samples/treelay/makefile.g95 index b4a920f047..f4c08f1b0c 100644 --- a/samples/treelay/makefile.g95 +++ b/samples/treelay/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 treelay example (Cygwin/Mingw32) +# Created: #03.01.00 WXDIR = ../.. -TARGET=test +TARGET=treelay OBJECTS = $(TARGET).o -include $(WXDIR)/src/makeprog.g95 +include $(WXDIR)\src\makeprog.g95 diff --git a/samples/treelay/makefile.sc b/samples/treelay/makefile.sc new file mode 100644 index 0000000000..6aa3c422c1 --- /dev/null +++ b/samples/treelay/makefile.sc @@ -0,0 +1,37 @@ +# Purpose: makefile for treelay example (Symantec C++) +# Created: 2000-03-15 + +WXDIR = $(WXWIN) +WXLIB = $(WXDIR)\lib\wx.lib +INCDIR = $(WXDIR)\include +INCLUDE=$(INCDIR) +TARGET=treelay + +include $(WXDIR)\src\makesc.env + +treelay.exe: treelay.obj $(DEFFILE) treelay.res + *$(CC) $(LDFLAGS) -o$@ $** $(LIBS) + *$(RC) -k treelay.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/treelay/makefile.sl b/samples/treelay/makefile.sl new file mode 100644 index 0000000000..4f6c1a2f16 --- /dev/null +++ b/samples/treelay/makefile.sl @@ -0,0 +1,14 @@ +# Purpose: makefile for treelay example (Salford C++) +# Created: 2000-03-15 + +PROGRAM = treelay +OBJECTS = $(PROGRAM).obj + +include ..\..\src\makeprog.sl + +all: wx $(TARGET) + +wx: + cd $(WXDIR)\src\msw ^ mk32 -f makefile.sl all + cd $(WXDIR)\samples\treelay + diff --git a/samples/treelay/makefile.twn b/samples/treelay/makefile.twn new file mode 100644 index 0000000000..ee77428131 --- /dev/null +++ b/samples/treelay/makefile.twn @@ -0,0 +1,35 @@ +# Purpose: makefile for treelay 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)/treelay.$(OBJSUFF) $(OBJDIR)/treelay.$(OBJSUFF) + +all: $(OBJDIR) treelay$(GUISUFFIX)$(EXESUFF) + +wx: + +$(OBJDIR): + mkdir $(OBJDIR) + +treelay$(GUISUFFIX)$(EXESUFF): $(OBJECTS) $(WXLIB) + $(CC) $(LDFLAGS) -o treelay$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(LDLIBS) + +$(OBJDIR)/treelay.$(OBJSUFF): treelay.$(SRCSUFF) + $(CC) -c $(CPPFLAGS) -o $@ treelay.$(SRCSUFF) + +treelay.c: treelay.rc + $(RESCOMP) $(RCINPUTSWITCH) treelay.rc $(RCOUTPUTSWITCH) treelay.c $(RESFLAGS) + +$(OBJDIR)/treelay.$(OBJSUFF): treelay.c + $(CC) -c $(CPPFLAGS) -o $@ treelay.c + +#$(OBJDIR)/treelay.o: treelay.rc +# $(RESCOMP) $(RCINPUTSWITCH) treelay.rc $(RCOUTPUTSWITCH) $(OBJDIR)/treelay.o $(RESFLAGS) + +clean: + rm -f $(OBJECTS) treelay$(GUISUFFIX).exe core *.rsc *.res diff --git a/samples/treelay/makefile.unx b/samples/treelay/makefile.unx index 21cab3c677..f1eee838a4 100644 --- a/samples/treelay/makefile.unx +++ b/samples/treelay/makefile.unx @@ -1,21 +1,9 @@ -# -# File: Makefile for samples -# Author: Robert Roebling -# Created: 1999 -# Updated: -# Copyright: (c) 1998 Robert Roebling -# -# This makefile requires a Unix version of wxWindows -# to be installed on your system. This is most often -# done typing "make install" when using the complete -# sources of wxWindows or by installing the two -# RPM packages wxGTK.XXX.rpm and wxGTK-devel.XXX.rpm -# under Linux. -# +# Purpose: makefile for treelay example (Unix) +# Created: 2000-03-15 CC = gcc -PROGRAM = test +PROGRAM = treelay OBJECTS = $(PROGRAM).o @@ -31,5 +19,5 @@ all: $(PROGRAM) $(PROGRAM): $(OBJECTS) $(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs` -clean: +clean: rm -f *.o $(PROGRAM) diff --git a/samples/treelay/makefile.vc b/samples/treelay/makefile.vc index 4ada748eda..4f552344b1 100644 --- a/samples/treelay/makefile.vc +++ b/samples/treelay/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 treelay example (VC++ 32bit) +# Created: 2000-03-15 # Set WXDIR for your system WXDIR = $(WXWIN) -PROGRAM=test +PROGRAM=treelay OBJECTS = $(PROGRAM).obj !include $(WXDIR)\src\makeprog.vc diff --git a/samples/treelay/makefile.wat b/samples/treelay/makefile.wat index 81a83e42a9..6862812f07 100644 --- a/samples/treelay/makefile.wat +++ b/samples/treelay/makefile.wat @@ -1,13 +1,9 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# +# Purpose: makefile for treelay example (Watcom) +# Created: 2000-03-15 WXDIR = $(%WXWIN) -PROGRAM = test +PROGRAM = treelay OBJECTS = $(PROGRAM).obj !include $(WXDIR)\src\makeprog.wat diff --git a/samples/treelay/test.cpp b/samples/treelay/treelay.cpp similarity index 97% rename from samples/treelay/test.cpp rename to samples/treelay/treelay.cpp index 52b3797b1c..02e00da18c 100644 --- a/samples/treelay/test.cpp +++ b/samples/treelay/treelay.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: test.cpp +// Name: treelay.cpp // Purpose: wxTreeLayout sample // Author: Julian Smart // Modified by: @@ -10,19 +10,19 @@ /////////////////////////////////////////////////////////////////////////////// // For compilers that support precompilation, includes "wx.h". -#include +#include "wx/wxprec.h" #ifdef __BORLANDC__ #pragma hdrstop #endif #ifndef WX_PRECOMP -#include +#include "wx/wx.h" #endif -#include +#include "wx/treelay.h" -#include "test.h" +#include "treelay.h" wxTreeLayoutStored *myTree = NULL; diff --git a/samples/treelay/test.def b/samples/treelay/treelay.def similarity index 75% rename from samples/treelay/test.def rename to samples/treelay/treelay.def index 558ccc1235..054f1e68b7 100644 --- a/samples/treelay/test.def +++ b/samples/treelay/treelay.def @@ -1,5 +1,5 @@ -NAME Test -DESCRIPTION 'Tree Test' +NAME Treelay +DESCRIPTION 'Tree Layout Test' EXETYPE WINDOWS STUB 'WINSTUB.EXE' CODE PRELOAD MOVEABLE DISCARDABLE diff --git a/samples/treelay/test.h b/samples/treelay/treelay.h similarity index 98% rename from samples/treelay/test.h rename to samples/treelay/treelay.h index 8167a8fc8d..d920ecc1be 100644 --- a/samples/treelay/test.h +++ b/samples/treelay/treelay.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: test.h +// Name: treelay.h // Purpose: wxTreeLayout sample // Author: Julian Smart // Modified by: diff --git a/samples/treelay/test.rc b/samples/treelay/treelay.rc similarity index 100% rename from samples/treelay/test.rc rename to samples/treelay/treelay.rc -- 2.45.2