From 13f5935c36a2b387591cc4b788a8cc2d07363c56 Mon Sep 17 00:00:00 2001
From: Ron Lee <ron@debian.org>
Date: Tue, 14 Mar 2000 18:50:24 +0000
Subject: [PATCH] renamed wizard sample

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

diff --git a/samples/wizard/Makefile.in b/samples/wizard/Makefile.in
index 4728a4ea53..a593751f88 100644
--- a/samples/wizard/Makefile.in
+++ b/samples/wizard/Makefile.in
@@ -1,13 +1,5 @@
-#
-# File:		makefile.unx
-# Author:	Julian Smart
-# Created:	1998
-# Updated:	
-# Copyright:	(c) 1998 Julian Smart
-#
-# "%W% %G%"
-#
-# Makefile for wiztest example (UNIX).
+# Purpose: makefile for wizard example (UNIX).
+# Created: 2000-03-15
 
 top_srcdir = @top_srcdir@/..
 top_builddir = ../..
@@ -15,7 +7,7 @@ program_dir = samples/wizard
 
 PROGRAM=wizard
 
-OBJECTS=wiztest.o
+OBJECTS=$(PROGRAM).o
 
 include ../../src/makeprog.env
 
diff --git a/samples/wizard/makefile.b32 b/samples/wizard/makefile.b32
index 3ed880a545..c0b9a7225f 100644
--- a/samples/wizard/makefile.b32
+++ b/samples/wizard/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 wizard example (BC++ 32bit)
+# Created: 2000-03-15
 
 WXDIR = $(WXWIN)
 
-TARGET=wiztest
+TARGET=wizard
 OBJECTS = $(TARGET).obj
 
 !include $(WXDIR)\src\makeprog.b32
diff --git a/samples/wizard/makefile.bcc b/samples/wizard/makefile.bcc
index 91ea98579a..1775c2f54d 100644
--- a/samples/wizard/makefile.bcc
+++ b/samples/wizard/makefile.bcc
@@ -1,10 +1,5 @@
-#
-# File:		makefile.bcc
-# Author:	Julian Smart
-# Created:	1998
-# Updated:	
-#
-# Builds a BC++ 16-bit sample
+# Purpose: makefile for wizard 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=wiztest
+TARGET=wizard
 OBJECTS=$(TARGET).obj
 
 !include $(WXDIR)\src\makeprog.bcc
diff --git a/samples/wizard/makefile.dos b/samples/wizard/makefile.dos
index cfbe67b487..ea02a5a746 100644
--- a/samples/wizard/makefile.dos
+++ b/samples/wizard/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 wizard example (VC++ 1.5x)
+# Created: 2000-03-15
 
 WXDIR = $(WXWIN)
 
-TARGET=wiztest
+TARGET=wizard
 OBJECTS=$(TARGET).obj
 
 !include $(WXDIR)\src\makeprog.msc
diff --git a/samples/wizard/makefile.g95 b/samples/wizard/makefile.g95
index 0d481d3f70..2cee3f0c2f 100644
--- a/samples/wizard/makefile.g95
+++ b/samples/wizard/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 wizard example (Cygwin/Mingw32)
+# Created: #03.01.00
 
 WXDIR = ../..
 
 TARGET=wizard
 OBJECTS = $(TARGET).o
 
-include $(WXDIR)/src/makeprog.g95
+include $(WXDIR)\src\makeprog.g95
 
diff --git a/samples/wizard/makefile.sc b/samples/wizard/makefile.sc
new file mode 100644
index 0000000000..3a0045e8f3
--- /dev/null
+++ b/samples/wizard/makefile.sc
@@ -0,0 +1,37 @@
+# Purpose: makefile for wizard example (Symantec C++)
+# Created: 2000-03-15
+
+WXDIR = $(WXWIN)
+WXLIB = $(WXDIR)\lib\wx.lib
+INCDIR = $(WXDIR)\include
+INCLUDE=$(INCDIR)
+TARGET=wizard
+
+include $(WXDIR)\src\makesc.env
+
+wizard.exe: wizard.obj $(DEFFILE) wizard.res
+	*$(CC) $(LDFLAGS) -o$@ $** $(LIBS)
+    *$(RC) -k wizard.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/wizard/makefile.sl b/samples/wizard/makefile.sl
new file mode 100644
index 0000000000..19615d25d5
--- /dev/null
+++ b/samples/wizard/makefile.sl
@@ -0,0 +1,14 @@
+# Purpose: makefile for wizard example (Salford C++)
+# Created: 2000-03-15
+
+PROGRAM = wizard
+OBJECTS = $(PROGRAM).obj
+
+include ..\..\src\makeprog.sl
+
+all:        wx $(TARGET)
+
+wx:
+    cd $(WXDIR)\src\msw ^ mk32 -f makefile.sl all
+    cd $(WXDIR)\samples\wizard
+
diff --git a/samples/wizard/makefile.twn b/samples/wizard/makefile.twn
new file mode 100644
index 0000000000..5ffd8e02d0
--- /dev/null
+++ b/samples/wizard/makefile.twn
@@ -0,0 +1,35 @@
+# Purpose: makefile for wizard 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)/wizard.$(OBJSUFF) $(OBJDIR)/wizard.$(OBJSUFF)
+
+all:    $(OBJDIR) wizard$(GUISUFFIX)$(EXESUFF)
+
+wx:
+
+$(OBJDIR):
+	mkdir $(OBJDIR)
+
+wizard$(GUISUFFIX)$(EXESUFF):	$(OBJECTS) $(WXLIB)
+	$(CC) $(LDFLAGS) -o wizard$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(LDLIBS)
+
+$(OBJDIR)/wizard.$(OBJSUFF):	wizard.$(SRCSUFF)
+	$(CC) -c $(CPPFLAGS) -o $@ wizard.$(SRCSUFF)
+
+wizard.c:  wizard.rc
+	$(RESCOMP) $(RCINPUTSWITCH) wizard.rc $(RCOUTPUTSWITCH) wizard.c $(RESFLAGS)
+
+$(OBJDIR)/wizard.$(OBJSUFF):	wizard.c
+	$(CC) -c $(CPPFLAGS) -o $@ wizard.c
+
+#$(OBJDIR)/wizard.o:  wizard.rc
+#	$(RESCOMP) $(RCINPUTSWITCH) wizard.rc $(RCOUTPUTSWITCH) $(OBJDIR)/wizard.o $(RESFLAGS)
+
+clean:
+	rm -f $(OBJECTS) wizard$(GUISUFFIX).exe core *.rsc *.res
diff --git a/samples/wizard/makefile.unx b/samples/wizard/makefile.unx
new file mode 100644
index 0000000000..f0e1abaec9
--- /dev/null
+++ b/samples/wizard/makefile.unx
@@ -0,0 +1,23 @@
+# Purpose: makefile for wizard example (Unix)
+# Created: 2000-03-15
+
+CC = gcc
+
+PROGRAM = wizard
+
+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/wizard/makefile.vc b/samples/wizard/makefile.vc
index 42445bdbb4..0476d7c589 100644
--- a/samples/wizard/makefile.vc
+++ b/samples/wizard/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 wizard example (VC++ 32bit)
+# Created: 2000-03-15
 
 # Set WXDIR for your system
 WXDIR = $(WXWIN)
 
-PROGRAM=wiztest
+PROGRAM=wizard
 OBJECTS = $(PROGRAM).obj
 
 !include $(WXDIR)\src\makeprog.vc
diff --git a/samples/wizard/makefile.wat b/samples/wizard/makefile.wat
index 53d054297f..b281b5eb48 100644
--- a/samples/wizard/makefile.wat
+++ b/samples/wizard/makefile.wat
@@ -1,13 +1,9 @@
-#
-# Makefile for WATCOM
-#
-# Created by Julian Smart, January 1999
-# 
-#
+# Purpose: makefile for wizard example (Watcom)
+# Created: 2000-03-15
 
 WXDIR = $(%WXWIN)
 
-PROGRAM = wiztest
+PROGRAM = wizard
 OBJECTS = $(PROGRAM).obj
 
 !include $(WXDIR)\src\makeprog.wat
diff --git a/samples/wizard/wiztest.cpp b/samples/wizard/wizard.cpp
similarity index 99%
rename from samples/wizard/wiztest.cpp
rename to samples/wizard/wizard.cpp
index d6f249de35..52cd493983 100644
--- a/samples/wizard/wiztest.cpp
+++ b/samples/wizard/wizard.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wiztest.cpp
+// Name:        wizard.cpp
 // Purpose:     wxWindows sample demonstrating wxWizard control
 // Author:      Vadim Zeitlin
 // Modified by:
@@ -18,8 +18,8 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
-    #pragma implementation "wiztest.cpp"
-    #pragma interface "wiztest.cpp"
+    #pragma implementation "wizard.cpp"
+    #pragma interface "wizard.cpp"
 #endif
 
 // For compilers that support precompilation, includes "wx/wx.h".
diff --git a/samples/wizard/wiztest.def b/samples/wizard/wizard.def
similarity index 67%
rename from samples/wizard/wiztest.def
rename to samples/wizard/wizard.def
index f843fd9a98..0b81618905 100644
--- a/samples/wizard/wiztest.def
+++ b/samples/wizard/wizard.def
@@ -1,5 +1,5 @@
-NAME         Wiztest
-DESCRIPTION  'Wiztest wxWindows application'
+NAME         Wizard
+DESCRIPTION  'wxWizard sample application'
 EXETYPE      WINDOWS
 CODE         PRELOAD MOVEABLE DISCARDABLE
 DATA         PRELOAD MOVEABLE MULTIPLE
diff --git a/samples/wizard/wiztest.rc b/samples/wizard/wizard.rc
similarity index 100%
rename from samples/wizard/wiztest.rc
rename to samples/wizard/wizard.rc
-- 
2.50.0

