diff --git a/samples/thread/Makefile.in b/samples/thread/Makefile.in
index 4a36eeaa86..6df1617e75 100644
--- a/samples/thread/Makefile.in
+++ b/samples/thread/Makefile.in
@@ -1,19 +1,11 @@
-#
-# File:		makefile.unx
-# Author:	Julian Smart
-# Created:	1998
-# Updated:	
-# Copyright:	(c) 1998 Julian Smart
-#
-# "%W% %G%"
-#
-# Makefile for thread example (UNIX).
+# Purpose: makefile for thread example (UNIX).
+# Created: 2000-03-15
 
 top_srcdir = @top_srcdir@/..
 top_builddir = ../..
 program_dir = samples/thread
 
-PROGRAM=test
+PROGRAM=thread
 
 OBJECTS=$(PROGRAM).o
 
diff --git a/samples/thread/makefile.b32 b/samples/thread/makefile.b32
index 95ddc80d76..e088c5c227 100644
--- a/samples/thread/makefile.b32
+++ b/samples/thread/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 thread example (BC++ 32bit)
+# Created: 2000-03-15
 
 WXDIR = $(WXWIN)
 
-TARGET=test
+TARGET=thread
 OBJECTS = $(TARGET).obj
 
 !include $(WXDIR)\src\makeprog.b32
diff --git a/samples/thread/makefile.bcc b/samples/thread/makefile.bcc
new file mode 100644
index 0000000000..4900eac8d0
--- /dev/null
+++ b/samples/thread/makefile.bcc
@@ -0,0 +1,14 @@
+# Purpose: makefile for thread example (BC++ 16bit)
+# Created: 2000-03-15
+
+!if "$(WXWIN)" == ""
+!error You must define the WXWIN variable in autoexec.bat, e.g. WXWIN=c:\wx
+!endif
+
+WXDIR = $(WXWIN)
+
+TARGET=thread
+OBJECTS=$(TARGET).obj
+
+!include $(WXDIR)\src\makeprog.bcc
+
diff --git a/samples/thread/makefile.dos b/samples/thread/makefile.dos
index 86a90c91f7..3af44652d9 100644
--- a/samples/thread/makefile.dos
+++ b/samples/thread/makefile.dos
@@ -1,65 +1,10 @@
-#
-# File:		makefile.dos
-# Author:	Julian Smart
-# Created:	1993
-# Updated:	
-# Copyright:	(c) 1993, AIAI, University of Edinburgh
-#
-# "%W% %G%"
-#
-# Makefile : Builds thread example (DOS).
-# Use FINAL=1 argument to nmake to build final version with no debugging
-# info
+# Purpose: makefile for thread example (VC++ 1.5x)
+# Created: 2000-03-15
 
 WXDIR = $(WXWIN)
 
-!include $(WXDIR)\src\makemsc.env
+TARGET=thread
+OBJECTS=$(TARGET).obj
 
-THISDIR = $(WXDIR)\samples\test
+!include $(WXDIR)\src\makeprog.msc
 
-!ifndef FINAL
-FINAL=0
-!endif
-
-HEADERS =
-SOURCES = test.$(SRCSUFF)
-OBJECTS = test.obj
-
-all:    test.exe
-
-wx:
-        cd $(WXDIR)\src\msw
-        nmake -f makefile.dos FINAL=$(FINAL)
-        cd $(THISDIR)
-
-wxclean:
-        cd $(WXDIR)\src\msw
-        nmake -f makefile.dos clean
-        cd $(THISDIR)
-
-test.exe:      $(WXDIR)\src\msw\dummy.obj $(WXLIB) test.obj test.def test.res
-        link $(LINKFLAGS) @<<
-test.obj $(WXDIR)\src\msw\dummy.obj,
-test,
-NUL,
-$(LIBS),
-test.def
-;
-<<
-        rc -K test.res
-
-test.obj:      test.$(SRCSUFF)
-        cl @<<
-$(CPPFLAGS) /c /Tp $*.$(SRCSUFF)
-<<
-
-test.res :      test.rc $(WXDIR)\include\wx\msw\wx.rc
-    rc -r /i$(WXDIR)\include test
-
-clean:
-        -erase *.obj
-        -erase *.exe
-        -erase *.res
-        -erase *.map
-        -erase *.sbr
-        -erase *.pdb
diff --git a/samples/thread/makefile.g95 b/samples/thread/makefile.g95
index b4a920f047..bc6829768c 100644
--- a/samples/thread/makefile.g95
+++ b/samples/thread/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 thread example (Cygwin/Mingw32)
+# Created: #03.01.00
 
 WXDIR = ../..
 
-TARGET=test
+TARGET=thread
 OBJECTS = $(TARGET).o
 
-include $(WXDIR)/src/makeprog.g95
+include $(WXDIR)\src\makeprog.g95
 
diff --git a/samples/thread/makefile.sc b/samples/thread/makefile.sc
new file mode 100644
index 0000000000..58539802e0
--- /dev/null
+++ b/samples/thread/makefile.sc
@@ -0,0 +1,37 @@
+# Purpose: makefile for thread example (Symantec C++)
+# Created: 2000-03-15
+
+WXDIR = $(WXWIN)
+WXLIB = $(WXDIR)\lib\wx.lib
+INCDIR = $(WXDIR)\include
+INCLUDE=$(INCDIR)
+TARGET=thread
+
+include $(WXDIR)\src\makesc.env
+
+thread.exe: thread.obj $(DEFFILE) thread.res
+	*$(CC) $(LDFLAGS) -o$@ $** $(LIBS)
+    *$(RC) -k thread.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/thread/makefile.sl b/samples/thread/makefile.sl
new file mode 100644
index 0000000000..0dfd1d8236
--- /dev/null
+++ b/samples/thread/makefile.sl
@@ -0,0 +1,14 @@
+# Purpose: makefile for thread example (Salford C++)
+# Created: 2000-03-15
+
+PROGRAM = thread
+OBJECTS = $(PROGRAM).obj
+
+include ..\..\src\makeprog.sl
+
+all:        wx $(TARGET)
+
+wx:
+    cd $(WXDIR)\src\msw ^ mk32 -f makefile.sl all
+    cd $(WXDIR)\samples\thread
+
diff --git a/samples/thread/makefile.twn b/samples/thread/makefile.twn
new file mode 100644
index 0000000000..d2f7abe576
--- /dev/null
+++ b/samples/thread/makefile.twn
@@ -0,0 +1,35 @@
+# Purpose: makefile for thread 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)/thread.$(OBJSUFF) $(OBJDIR)/thread.$(OBJSUFF)
+
+all:    $(OBJDIR) thread$(GUISUFFIX)$(EXESUFF)
+
+wx:
+
+$(OBJDIR):
+	mkdir $(OBJDIR)
+
+thread$(GUISUFFIX)$(EXESUFF):	$(OBJECTS) $(WXLIB)
+	$(CC) $(LDFLAGS) -o thread$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(LDLIBS)
+
+$(OBJDIR)/thread.$(OBJSUFF):	thread.$(SRCSUFF)
+	$(CC) -c $(CPPFLAGS) -o $@ thread.$(SRCSUFF)
+
+thread.c:  thread.rc
+	$(RESCOMP) $(RCINPUTSWITCH) thread.rc $(RCOUTPUTSWITCH) thread.c $(RESFLAGS)
+
+$(OBJDIR)/thread.$(OBJSUFF):	thread.c
+	$(CC) -c $(CPPFLAGS) -o $@ thread.c
+
+#$(OBJDIR)/thread.o:  thread.rc
+#	$(RESCOMP) $(RCINPUTSWITCH) thread.rc $(RCOUTPUTSWITCH) $(OBJDIR)/thread.o $(RESFLAGS)
+
+clean:
+	rm -f $(OBJECTS) thread$(GUISUFFIX).exe core *.rsc *.res
diff --git a/samples/thread/makefile.unx b/samples/thread/makefile.unx
index 4696faad4f..43224c1264 100644
--- a/samples/thread/makefile.unx
+++ b/samples/thread/makefile.unx
@@ -1,17 +1,5 @@
-#
-# 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 thread example (Unix)
+# Created: 2000-03-15
 
 CC = gcc
 
@@ -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/thread/makefile.vc b/samples/thread/makefile.vc
index 4ada748eda..bd4848853c 100644
--- a/samples/thread/makefile.vc
+++ b/samples/thread/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 thread example (VC++ 32bit)
+# Created: 2000-03-15
 
 # Set WXDIR for your system
 WXDIR = $(WXWIN)
 
-PROGRAM=test
+PROGRAM=thread
 OBJECTS = $(PROGRAM).obj
 
 !include $(WXDIR)\src\makeprog.vc
diff --git a/samples/thread/makefile.wat b/samples/thread/makefile.wat
index 81a83e42a9..d5741fd111 100644
--- a/samples/thread/makefile.wat
+++ b/samples/thread/makefile.wat
@@ -1,13 +1,9 @@
-#
-# Makefile for WATCOM
-#
-# Created by Julian Smart, January 1999
-# 
-#
+# Purpose: makefile for thread example (Watcom)
+# Created: 2000-03-15
 
 WXDIR = $(%WXWIN)
 
-PROGRAM = test
+PROGRAM = thread
 OBJECTS = $(PROGRAM).obj
 
 !include $(WXDIR)\src\makeprog.wat
diff --git a/samples/thread/test.cpp b/samples/thread/thread.cpp
similarity index 99%
rename from samples/thread/test.cpp
rename to samples/thread/thread.cpp
index be40d23a60..d53bbca802 100644
--- a/samples/thread/test.cpp
+++ b/samples/thread/thread.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        test.cpp
+// Name:        thread.cpp
 // Purpose:     wxWindows thread sample
 // Author:      Julian Smart(minimal)/Guilhem Lavaux(thread test)
 // Modified by:
@@ -15,8 +15,8 @@
  */
 
 #ifdef __GNUG__
-    #pragma implementation "test.cpp"
-    #pragma interface "test.cpp"
+    #pragma implementation "thread.cpp"
+    #pragma interface "thread.cpp"
 #endif
 
 // For compilers that support precompilation, includes "wx/wx.h".
diff --git a/samples/thread/test.def b/samples/thread/thread.def
similarity index 67%
rename from samples/thread/test.def
rename to samples/thread/thread.def
index 59f0db711d..ca22c39e15 100644
--- a/samples/thread/test.def
+++ b/samples/thread/thread.def
@@ -1,5 +1,5 @@
-NAME         Minimal
-DESCRIPTION  'Minimal wxWindows application'
+NAME         Thread
+DESCRIPTION  'wxWindows thread sample'
 EXETYPE      WINDOWS
 CODE         PRELOAD MOVEABLE DISCARDABLE
 DATA         PRELOAD MOVEABLE MULTIPLE
diff --git a/samples/thread/test.rc b/samples/thread/thread.rc
similarity index 100%
rename from samples/thread/test.rc
rename to samples/thread/thread.rc