diff --git a/samples/minifram/Makefile.in b/samples/minifram/Makefile.in
index 3215c45402..3dd472ccfa 100644
--- a/samples/minifram/Makefile.in
+++ b/samples/minifram/Makefile.in
@@ -1,22 +1,13 @@
-#
-# File:		makefile.unx
-# Author:	Julian Smart
-# Created:	1998
-# Updated:	
-# Copyright:	(c) 1998 Julian Smart
-#
-# "%W% %G%"
-#
-# Makefile for toolbar example (UNIX).
+# Purpose: makefile for minifram example (UNIX).
+# Created: 2000-03-15
 
 top_srcdir = @top_srcdir@/..
 top_builddir = ../..
 program_dir = samples/minifram
 
-PROGRAM=test
+PROGRAM=minifram
 
 OBJECTS=$(PROGRAM).o
 
 include ../../src/makeprog.env
 
-
diff --git a/samples/minifram/makefile.b32 b/samples/minifram/makefile.b32
index 95ddc80d76..7a3f0b7766 100644
--- a/samples/minifram/makefile.b32
+++ b/samples/minifram/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 minifram example (BC++ 32bit)
+# Created: 2000-03-15
 
 WXDIR = $(WXWIN)
 
-TARGET=test
+TARGET=minifram
 OBJECTS = $(TARGET).obj
 
 !include $(WXDIR)\src\makeprog.b32
diff --git a/samples/minifram/makefile.bcc b/samples/minifram/makefile.bcc
index 669f01905a..1786694d10 100644
--- a/samples/minifram/makefile.bcc
+++ b/samples/minifram/makefile.bcc
@@ -1,10 +1,5 @@
-#
-# File:		makefile.bcc
-# Author:	Julian Smart
-# Created:	1998
-# Updated:	
-#
-# Builds a BC++ 16-bit sample
+# Purpose: makefile for minifram 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=minifram
 OBJECTS=$(TARGET).obj
 
 !include $(WXDIR)\src\makeprog.bcc
diff --git a/samples/minifram/makefile.dos b/samples/minifram/makefile.dos
index 13e3a4ce8e..3347434690 100644
--- a/samples/minifram/makefile.dos
+++ b/samples/minifram/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 minifram example (VC++ 1.5x)
+# Created: 2000-03-15
 
 WXDIR = $(WXWIN)
 
-TARGET=test
-OBJECTS = $(TARGET).obj
+TARGET=minifram
+OBJECTS=$(TARGET).obj
 
 !include $(WXDIR)\src\makeprog.msc
 
diff --git a/samples/minifram/makefile.g95 b/samples/minifram/makefile.g95
index b4a920f047..413fb4a6b0 100644
--- a/samples/minifram/makefile.g95
+++ b/samples/minifram/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 minifram example (Cygwin/Mingw32)
+# Created: #03.01.00
 
 WXDIR = ../..
 
-TARGET=test
+TARGET=minifram
 OBJECTS = $(TARGET).o
 
-include $(WXDIR)/src/makeprog.g95
+include $(WXDIR)\src\makeprog.g95
 
diff --git a/samples/minifram/makefile.sc b/samples/minifram/makefile.sc
new file mode 100644
index 0000000000..2b60356177
--- /dev/null
+++ b/samples/minifram/makefile.sc
@@ -0,0 +1,37 @@
+# Purpose: makefile for minifram example (Symantec C++)
+# Created: 2000-03-15
+
+WXDIR = $(WXWIN)
+WXLIB = $(WXDIR)\lib\wx.lib
+INCDIR = $(WXDIR)\include
+INCLUDE=$(INCDIR)
+TARGET=minifram
+
+include $(WXDIR)\src\makesc.env
+
+minifram.exe: minifram.obj $(DEFFILE) minifram.res
+	*$(CC) $(LDFLAGS) -o$@ $** $(LIBS)
+    *$(RC) -k minifram.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/minifram/makefile.sl b/samples/minifram/makefile.sl
new file mode 100644
index 0000000000..4121c4fc63
--- /dev/null
+++ b/samples/minifram/makefile.sl
@@ -0,0 +1,14 @@
+# Purpose: makefile for minifram example (Salford C++)
+# Created: 2000-03-15
+
+PROGRAM = minifram
+OBJECTS = $(PROGRAM).obj
+
+include ..\..\src\makeprog.sl
+
+all:        wx $(TARGET)
+
+wx:
+    cd $(WXDIR)\src\msw ^ mk32 -f makefile.sl all
+    cd $(WXDIR)\samples\minifram
+
diff --git a/samples/minifram/makefile.twn b/samples/minifram/makefile.twn
new file mode 100644
index 0000000000..b6c967411b
--- /dev/null
+++ b/samples/minifram/makefile.twn
@@ -0,0 +1,35 @@
+# Purpose: makefile for minifram 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)/minifram.$(OBJSUFF) $(OBJDIR)/minifram.$(OBJSUFF)
+
+all:    $(OBJDIR) minifram$(GUISUFFIX)$(EXESUFF)
+
+wx:
+
+$(OBJDIR):
+	mkdir $(OBJDIR)
+
+minifram$(GUISUFFIX)$(EXESUFF):	$(OBJECTS) $(WXLIB)
+	$(CC) $(LDFLAGS) -o minifram$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(LDLIBS)
+
+$(OBJDIR)/minifram.$(OBJSUFF):	minifram.$(SRCSUFF)
+	$(CC) -c $(CPPFLAGS) -o $@ minifram.$(SRCSUFF)
+
+minifram.c:  minifram.rc
+	$(RESCOMP) $(RCINPUTSWITCH) minifram.rc $(RCOUTPUTSWITCH) minifram.c $(RESFLAGS)
+
+$(OBJDIR)/minifram.$(OBJSUFF):	minifram.c
+	$(CC) -c $(CPPFLAGS) -o $@ minifram.c
+
+#$(OBJDIR)/minifram.o:  minifram.rc
+#	$(RESCOMP) $(RCINPUTSWITCH) minifram.rc $(RCOUTPUTSWITCH) $(OBJDIR)/minifram.o $(RESFLAGS)
+
+clean:
+	rm -f $(OBJECTS) minifram$(GUISUFFIX).exe core *.rsc *.res
diff --git a/samples/minifram/makefile.unx b/samples/minifram/makefile.unx
index 21cab3c677..1dc2872c4d 100644
--- a/samples/minifram/makefile.unx
+++ b/samples/minifram/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 minifram example (Unix)
+# Created: 2000-03-15
 
 CC = gcc
 
-PROGRAM = test
+PROGRAM = minifram
 
 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/minifram/makefile.vc b/samples/minifram/makefile.vc
index 4ada748eda..14af470df7 100644
--- a/samples/minifram/makefile.vc
+++ b/samples/minifram/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 minifram example (VC++ 32bit)
+# Created: 2000-03-15
 
 # Set WXDIR for your system
 WXDIR = $(WXWIN)
 
-PROGRAM=test
+PROGRAM=minifram
 OBJECTS = $(PROGRAM).obj
 
 !include $(WXDIR)\src\makeprog.vc
diff --git a/samples/minifram/makefile.wat b/samples/minifram/makefile.wat
index 81a83e42a9..68110112c2 100644
--- a/samples/minifram/makefile.wat
+++ b/samples/minifram/makefile.wat
@@ -1,13 +1,9 @@
-#
-# Makefile for WATCOM
-#
-# Created by Julian Smart, January 1999
-# 
-#
+# Purpose: makefile for minifram example (Watcom)
+# Created: 2000-03-15
 
 WXDIR = $(%WXWIN)
 
-PROGRAM = test
+PROGRAM = minifram
 OBJECTS = $(PROGRAM).obj
 
 !include $(WXDIR)\src\makeprog.wat
diff --git a/samples/minifram/test.cpp b/samples/minifram/minifram.cpp
similarity index 99%
rename from samples/minifram/test.cpp
rename to samples/minifram/minifram.cpp
index 1906176c68..58ffabc023 100644
--- a/samples/minifram/test.cpp
+++ b/samples/minifram/minifram.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        test.cpp
+// Name:        minifram.cpp
 // Purpose:     wxMiniFrame sample
 // Author:      Robert Roebling
 // Modified by:
@@ -21,7 +21,7 @@
 #endif
 
 #include "wx/toolbar.h"
-#include "test.h"
+#include "minifram.h"
 
 #if defined(__WXGTK__) || defined(__WXMOTIF__)
 #include "mondrian.xpm"
diff --git a/samples/minifram/test.def b/samples/minifram/minifram.def
similarity index 75%
rename from samples/minifram/test.def
rename to samples/minifram/minifram.def
index 897b9dacbb..99b33c82a5 100644
--- a/samples/minifram/test.def
+++ b/samples/minifram/minifram.def
@@ -1,5 +1,5 @@
-NAME         ToolTest
-DESCRIPTION  'wxToolBar Sample'
+NAME         Minifram
+DESCRIPTION  'MiniFrame Sample'
 EXETYPE      WINDOWS
 STUB         'WINSTUB.EXE'
 CODE         PRELOAD MOVEABLE DISCARDABLE
diff --git a/samples/minifram/test.h b/samples/minifram/minifram.h
similarity index 98%
rename from samples/minifram/test.h
rename to samples/minifram/minifram.h
index f228439556..d71035f3d5 100644
--- a/samples/minifram/test.h
+++ b/samples/minifram/minifram.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        test.h
+// Name:        minifram.h
 // Purpose:     wxToolBar sample
 // Author:      Julian Smart
 // Modified by:
diff --git a/samples/minifram/test.rc b/samples/minifram/minifram.rc
similarity index 100%
rename from samples/minifram/test.rc
rename to samples/minifram/minifram.rc