From: Julian Smart <julian@anthemion.co.uk>
Date: Sat, 22 Aug 1998 19:46:35 +0000 (+0000)
Subject: Removed redundant makefiles and AIAI icons. Changed dynamic sample source name from
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/b6a158b04e7784dc30ad8fc043eb94ae71c19e4f

Removed redundant makefiles and AIAI icons. Changed dynamic sample source name from
minimal.cpp to dynamic.cpp.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@619 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/samples/controls/aiai.ico b/samples/controls/aiai.ico
deleted file mode 100644
index a3db6563cc..0000000000
Binary files a/samples/controls/aiai.ico and /dev/null differ
diff --git a/samples/controls/aiai.xbm b/samples/controls/aiai.xbm
deleted file mode 100644
index 1a6f0a31b1..0000000000
--- a/samples/controls/aiai.xbm
+++ /dev/null
@@ -1,38 +0,0 @@
-#define aiai_width 64
-#define aiai_height 64
-static char aiai_bits[] = {
- 0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,
- 0x11,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,
- 0x44,0x44,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,
- 0x11,0x11,0x11,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,
- 0x44,0x44,0x44,0x44,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,
- 0x11,0x11,0x11,0x11,0x11,0x44,0x44,0x44,0x42,0x44,0x44,0x44,0x44,0x44,0x44,
- 0x44,0x47,0x44,0x44,0x44,0x44,0x11,0x11,0x11,0x17,0x11,0x11,0x11,0x11,0x11,
- 0x11,0x91,0x1f,0x11,0x11,0x11,0x11,0x44,0x44,0xc4,0x4f,0x44,0x44,0x44,0x44,
- 0x44,0x44,0xc4,0x5f,0x44,0xf4,0x45,0x44,0x11,0x11,0xf1,0x1f,0x11,0xf9,0x13,
- 0x11,0x11,0x11,0xf1,0x3f,0x11,0xfd,0x13,0x11,0x44,0x44,0xf4,0x7f,0x44,0xfc,
- 0x47,0x44,0x44,0x44,0xf4,0x7f,0x44,0xfc,0x47,0x44,0x11,0x11,0xf9,0x7f,0x11,
- 0xf9,0x13,0x11,0x11,0x11,0xfd,0xff,0x11,0xf1,0x11,0x11,0x44,0x44,0xfc,0xff,
- 0x44,0x44,0x44,0x44,0x44,0x44,0xfe,0xff,0x45,0x44,0x44,0x44,0x11,0x11,0xff,
- 0xff,0x11,0xfd,0x13,0x11,0x11,0x11,0xff,0xff,0x13,0xfd,0x13,0x11,0x44,0xc4,
- 0xff,0xff,0x07,0xfc,0x43,0x44,0x44,0xff,0xff,0xf9,0xff,0xfd,0xfb,0xff,0x11,
- 0xc0,0xff,0x00,0x00,0xfc,0x03,0x00,0x11,0xc0,0x7f,0x00,0x00,0xfc,0x03,0x00,
- 0x04,0xe0,0x7f,0x00,0x00,0xfc,0x03,0x00,0xf4,0xf7,0xbf,0xff,0xff,0xfd,0xfb,
- 0x7f,0x01,0xf0,0x1f,0x00,0x00,0xfc,0x03,0x00,0x01,0xf8,0x1f,0x00,0x00,0xfc,
- 0x03,0x00,0x00,0xfc,0x0f,0x00,0x00,0xfc,0x03,0x40,0xfe,0xfd,0xef,0xff,0xff,
- 0xfd,0xfb,0x4f,0x00,0xfe,0x07,0x00,0x00,0xfc,0x03,0x10,0x00,0xfe,0x03,0x00,
- 0x00,0xfc,0x03,0x10,0x00,0xff,0x03,0x00,0x00,0xfc,0x03,0x44,0x7f,0xff,0x01,
- 0x00,0x00,0xfc,0xfb,0x44,0x91,0xff,0xff,0xff,0xff,0xff,0x13,0x11,0xd1,0xff,
- 0xff,0xff,0xff,0xff,0x13,0x11,0xe4,0xff,0xff,0xff,0xff,0xff,0x47,0x44,0xe4,
- 0xff,0xff,0xff,0xff,0xff,0x47,0x44,0xf1,0xff,0xff,0xff,0xff,0xff,0x13,0x11,
- 0xf1,0xff,0xff,0xff,0xff,0xff,0x13,0x11,0xfc,0xff,0xff,0xff,0xff,0xff,0x47,
- 0x44,0xfc,0xff,0xff,0xff,0xff,0xff,0x47,0x44,0x11,0x11,0x11,0x11,0x11,0x11,
- 0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x10,0x11,0x44,0x44,0xc4,0x44,0x44,
- 0xc4,0x44,0x44,0x44,0x4e,0xc4,0x44,0x4e,0xc4,0x44,0x44,0x11,0x1f,0xd1,0x11,
- 0x1f,0xd1,0x11,0x11,0x91,0x31,0xd1,0x91,0x31,0xd1,0x11,0x11,0xc4,0x64,0xcc,
- 0xcc,0x64,0xcc,0x44,0x44,0x64,0xc4,0xcc,0x6c,0xc4,0xcc,0x44,0x44,0xf1,0xff,
- 0xd1,0xf1,0xff,0xd1,0x11,0x11,0xf9,0xff,0xd3,0xf9,0xff,0xd3,0x11,0x11,0x4c,
- 0x44,0xc6,0x4c,0x44,0xc6,0x44,0x44,0x4c,0x44,0xc6,0x4c,0x44,0xc6,0x44,0x44,
- 0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,
- 0x11,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,
- 0x44,0x44};
diff --git a/samples/controls/makefile.bcc b/samples/controls/makefile.bcc
deleted file mode 100644
index 19344434c5..0000000000
--- a/samples/controls/makefile.bcc
+++ /dev/null
@@ -1,73 +0,0 @@
-#
-# File:		makefile.bcc
-# Author:	Julian Smart
-# Created:	1993
-# Updated:	
-# Copyright:	(c) 1993, AIAI, University of Edinburgh
-#
-# "%W% %G%"
-#
-# Makefile : Builds controls example (DOS).
-
-!if "$(BCCDIR)" == ""
-!error You must define the BCCDIR variable in autoexec.bat, e.g. BCCDIR=d:\bc4
-!endif
-
-!if "$(WXWIN)" == ""
-!error You must define the WXWIN variable in autoexec.bat, e.g. WXWIN=c:\wx
-!endif
-
-WXDIR = $(WXWIN)
-!include $(WXDIR)\src\makebcc.env
-
-THISDIR = $(WXDIR)\samples\controls
-WXLIB = $(WXDIR)\lib\wx.lib
-LIBS=$(WXLIB) mathwl cwl import
-INC=-I$(WXDIR)\include\base -I$(WXDIR)\include\msw
-CFG=$(WXDIR)\src\wxwin.cfg
-
-!ifndef FINAL
-FINAL=0
-!endif
-
-!if "$(FINAL)" == "0"
-LINKFLAGS=/v/Vt /Twe /L$(WXDIR)\lib;$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS= -v
-!else
-LINKFLAGS=/Twe /L$(WXDIR)\lib;$(BCCDIR)\lib
-OPT = -O2
-DEBUG_FLAGS=
-!endif
-CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
-
-OBJECTS = controls.obj
-
-controls:    controls.exe
-
-all:    controls.exe
-
-controls.exe:    $(WXLIB) controls.obj controls.def controls.res
-        tlink $(LINKFLAGS) @&&!
-c0wl.obj controls.obj
-controls
-nul
-$(LIBS)
-controls.def
-!
-        rc -31 -K controls.res
-
-.$(SRCSUFF).obj:
-	bcc $(CPPFLAGS) -c {$< }
-
-controls.obj:      controls.$(SRCSUFF)
-
-controls.res :      controls.rc $(WXDIR)\include\msw\wx.rc
-    rc -r /i$(BCCDIR)\include /i$(WXDIR)\include\msw /i$(WXDIR)\contrib\fafa controls
-
-clean:
-        -erase *.obj
-        -erase *.exe
-        -erase *.res
-        -erase *.map
-        -erase *.rws
diff --git a/samples/controls/makefile.sc b/samples/controls/makefile.sc
deleted file mode 100644
index 1e0bca8574..0000000000
--- a/samples/controls/makefile.sc
+++ /dev/null
@@ -1,36 +0,0 @@
-;    Last change:  JS   10 Jul 98   11:33 am
-# Symantec C++ makefile for controls example
-# NOTE that peripheral libraries are now dealt in main wxWindows makefile.
-
-WXDIR = $(WXWIN)
-!include $(WXDIR)\src\makesc.env
-
-WXLIB = $(WXDIR)\lib\wx.lib
-INCDIR = $(WXDIR)\include
-MSWINC = $(INCDIR)\msw
-BASEINC = $(INCDIR)\base
-
-CC=sc
-RC=rc
-CFLAGS = -o -ml -W -Dwx_msw
-LDFLAGS = -ml -W
-
-INCLUDE=$(BASEINC);$(MSWINC)
-
-LIBS=$(WXLIB) libw.lib commdlg.lib shell.lib
-
-.$(SRCSUFF).obj:
-	*$(CC) -c $(CFLAGS) -I$(INCLUDE) $<
-
-.rc.res:
-	*$(RC) -r -I$(INCLUDE) $<
-
-controls.exe: controls.obj controls.def controls.res
-	*$(CC) $(LDFLAGS) -o$@ $** $(LIBS)
-
-clean:
-        -del *.obj
-	-del *.exe
-	-del *.res
-	-del *.map
-	-del *.rws
diff --git a/samples/controls/makefile.unx b/samples/controls/makefile.unx
deleted file mode 100644
index 7f845d6342..0000000000
--- a/samples/controls/makefile.unx
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# File:		makefile.unx
-# Author:	Julian Smart
-# Created:	1993
-# Updated:	
-# Copyright:	(c) 1993, AIAI, University of Edinburgh
-#
-# "%W% %G%"
-#
-# Makefile for controls example (UNIX).
-
-WXDIR = ../..
-
-# All common UNIX compiler flags and options are now in
-# this central makefile.
-include $(WXDIR)/src/make.env
-
-OBJECTS = $(OBJDIR)/controls.$(OBJSUFF)
-
-.SUFFIXES:
-
-all:    $(OBJDIR) controls$(GUISUFFIX)
-
-wx:
-
-
-motif:
-	$(MAKE) -f makefile.unx GUISUFFIX=_motif GUI=-Dwx_motif GUISUFFIX=_motif OPT='$(OPT)' LDLIBS='$(MOTIFLDLIBS)' WXLIB=$(WXDIR)/lib/libwx_motif.a  OPTIONS='$(OPTIONS)' DEBUG='$(DEBUG)' WARN='$(WARN)' XLIB='$(XLIB)' XINCLUDE='$(XINCLUDE)' XVIEW_LINK=
-
-xview:
-	cd $(WXDIR)/src/x; $(MAKE) -f makefile.unx xview
-	$(MAKE) -f makefile.unx GUI=-Dwx_xview GUISUFFIX=_ol CC=$(CC) OPTIONS='$(OPTIONS)' DEBUG='$(DEBUG)' WARN='$(WARN)' XLIB='$(XLIB)' XINCLUDE='$(XINCLUDE)'
-
-hp:
-	cd $(WXDIR)/src/x; $(MAKE) -f makefile.unx hp
-	$(MAKE) -f makefile.unx GUI=-Dwx_motif GUISUFFIX=_hp CC=CC DEBUG='$(DEBUG)' WARN='-w' \
-         XINCLUDE='$(HPXINCLUDE)' XLIB='$(HPXLIB)' XVIEW_LINK='' LDLIBS='$(HPLDLIBS)'
-
-$(OBJDIR):
-	mkdir $(OBJDIR)
-
-controls$(GUISUFFIX):	$(OBJDIR)/controls.$(OBJSUFF) $(WXLIB)
-	$(CC) $(LDFLAGS) -o controls$(GUISUFFIX) $(OBJDIR)/controls.$(OBJSUFF) $(XVIEW_LINK) $(LDLIBS)
-
-$(OBJDIR)/controls.$(OBJSUFF):	controls.$(SRCSUFF)
-	$(CC) -c $(CPPFLAGS) -o $@ controls.$(SRCSUFF)
-
-clean_motif:
-	$(MAKE) -f makefile.unx GUISUFFIX=_motif cleanany
-
-clean_ol:
-	$(MAKE) -f makefile.unx GUISUFFIX=_ol cleanany
-
-clean_hp:
-	$(MAKE) -f makefile.unx GUISUFFIX=_hp cleanany
-
-cleanany:
-	rm -f $(OBJECTS) controls$(GUISUFFIX) core
diff --git a/samples/controls/makefile.vms b/samples/controls/makefile.vms
deleted file mode 100644
index f738f5847a..0000000000
--- a/samples/controls/makefile.vms
+++ /dev/null
@@ -1,38 +0,0 @@
-#************************************************************************
-# Makefile for MINIMAL under VMS
-# by Stefan Hammes
-# (incomplete) update history:
-# 11.04.95
-#************************************************************************
-
-#************************************************************************
-# Definition section
-# (cave: definitions and includes must begin with ',')
-#************************************************************************
-
-APPOPTS = 
-APPDEFS = 
-APPINCS = 
-
-#************************************************************************
-# Module section
-#************************************************************************
-
-# Name of main module
-MAIN = controls
-
-# Object modules of the application.
-OBJS = controls.obj
-OBJLIST =controls.obj
-
-.include [--.src]makevms.env
-
-# main dependency
-$(MAIN).exe : $(OBJS)
-    $(LINK) $(LINKFLAGS) /exec=$(MAIN).exe $(OBJLIST),$(WXLIB)/lib,$(OPTSFILE)/option
-    - purge *.exe
-
-#************************************************************************
-# Header file depedencies following
-#************************************************************************
-
diff --git a/samples/controls/makefile.wat b/samples/controls/makefile.wat
deleted file mode 100644
index a2ec9cc3a5..0000000000
--- a/samples/controls/makefile.wat
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Makefile for WATCOM
-#
-# Created by D.Chubraev, chubraev@iem.ee.ethz.ch
-# 8 Nov 1994
-#
-
-WXDIR = ..\.. 
-
-!include $(WXDIR)\src\makewat.env
-
-WXLIB = $(WXDIR)\lib
-NAME = controls
-LNK = $(name).lnk
-OBJS = $(name).obj 
-
-all: $(name).exe
-
-$(name).exe : $(OBJS) $(name).res $(LNK) $(WXLIB)\wx$(LEVEL).lib
-    wlink @$(LNK)
-    $(BINDCOMMAND) $(name).res
-
-$(name).res :      $(name).rc $(WXDIR)\include\msw\wx.rc
-     $(RC) $(RESFLAGS1) $(name).rc
-
-$(LNK) : makefile.wat
-    %create $(LNK)
-    @%append $(LNK) debug all
-    @%append $(LNK) system $(LINKOPTION)
-    @%append $(LNK) $(MINDATA)
-    @%append $(LNK) $(MAXDATA)
-    @%append $(LNK) $(STACK)
-    @%append $(LNK) name $(name)
-    @%append $(LNK) file $(WXLIB)\wx$(LEVEL).lib
-    @for %i in ($(EXTRALIBS)) do @%append $(LNK) file %i
-    @for %i in ($(OBJS)) do @%append $(LNK) file %i
-
-thing: .SYMBOLIC
-    echo $(WATLIBDIR)
-
-clean:   .SYMBOLIC
-    -erase *.obj *.bak *.err *.pch *.lib *.lnk *.res *.exe
-
diff --git a/samples/dialogs/aiai.ico b/samples/dialogs/aiai.ico
deleted file mode 100644
index a3db6563cc..0000000000
Binary files a/samples/dialogs/aiai.ico and /dev/null differ
diff --git a/samples/dialogs/dialogs.rc b/samples/dialogs/dialogs.rc
index 233da61284..82bdf07561 100644
--- a/samples/dialogs/dialogs.rc
+++ b/samples/dialogs/dialogs.rc
@@ -1,3 +1,2 @@
-aiai_icn ICON "aiai.ico"
 #include "wx/msw/wx.rc"
 
diff --git a/samples/dialogs/makefile.bcc b/samples/dialogs/makefile.bcc
deleted file mode 100644
index fb3bcc4b7b..0000000000
--- a/samples/dialogs/makefile.bcc
+++ /dev/null
@@ -1,74 +0,0 @@
-#
-# File:		makefile.bcc
-# Author:	Julian Smart
-# Created:	1993
-# Updated:	
-# Copyright:	(c) 1993, AIAI, University of Edinburgh
-#
-# "%W% %G%"
-#
-# Makefile : Builds dialogs example (DOS).
-
-!if "$(BCCDIR)" == ""
-!error You must define the BCCDIR variable in autoexec.bat, e.g. BCCDIR=d:\bc4
-!endif
-
-!if "$(WXWIN)" == ""
-!error You must define the WXWIN variable in autoexec.bat, e.g. WXWIN=c:\wx
-!endif
-
-WXDIR = $(WXWIN)
-!include $(WXDIR)\src\makebcc.env
-
-THISDIR = $(WXDIR)\samples\dialogs
-WXLIB = $(WXDIR)\lib\wx.lib
-LIBS=$(WXLIB) mathwl cwl import
-INC=-I$(WXDIR)\include\base -I$(WXDIR)\include\msw
-CFG=$(WXDIR)\src\wxwin.cfg
-
-!ifndef FINAL
-FINAL=0
-!endif
-
-!if "$(FINAL)" == "0"
-#LINKFLAGS=/v /Vt /Twe /s /L$(WXDIR)\lib;$(BCCDIR)\lib
-LINKFLAGS=/Vt /Twe /s /L$(WXDIR)\lib;$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS= -v
-!else
-LINKFLAGS=/Twe /L$(WXDIR)\lib;$(BCCDIR)\lib
-OPT = -O2
-DEBUG_FLAGS=
-!endif
-CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
-
-OBJECTS = dialogs.obj
-
-dialogs:    dialogs.exe
-
-all:    dialogs.exe
-
-dialogs.exe:    $(WXLIB) dialogs.obj dialogs.def dialogs.res
-        tlink $(LINKFLAGS) @&&!
-c0wl.obj dialogs.obj
-dialogs
-nul
-$(LIBS)
-dialogs.def
-!
-        rc -31 -K dialogs.res
-
-.$(SRCSUFF).obj:
-	bcc $(CPPFLAGS) -c {$< }
-
-dialogs.obj:      dialogs.$(SRCSUFF)
-
-dialogs.res :      dialogs.rc $(WXDIR)\include\msw\wx.rc
-    rc -r /i$(BCCDIR)\include /i$(WXDIR)\include\msw /i$(WXDIR)\contrib\fafa dialogs
-
-clean:
-        -erase *.obj
-        -erase *.exe
-        -erase *.res
-        -erase *.map
-        -erase *.rws
diff --git a/samples/dialogs/makefile.sc b/samples/dialogs/makefile.sc
deleted file mode 100644
index 428af8452c..0000000000
--- a/samples/dialogs/makefile.sc
+++ /dev/null
@@ -1,35 +0,0 @@
-# Symantec C++ makefile for dialogs example
-# NOTE that peripheral libraries are now dealt in main wxWindows makefile.
-
-WXDIR = $(WXWIN)
-!include $(WXDIR)\src\makesc.env
-
-WXLIB = $(WXDIR)\lib\wx.lib
-INCDIR = $(WXDIR)\include
-MSWINC = $(INCDIR)\msw
-BASEINC = $(INCDIR)\base
-
-CC=sc
-RC=rc
-CFLAGS = -o -ml -W -Dwx_msw
-LDFLAGS = -ml -W
-
-INCLUDE=$(BASEINC);$(MSWINC)
-
-LIBS=$(WXLIB) libw.lib commdlg.lib shell.lib
-
-.$(SRCSUFF).obj:
-	*$(CC) -c $(CFLAGS) -I$(INCLUDE) $<
-
-.rc.res:
-	*$(RC) -r -I$(INCLUDE) $<
-
-dialogs.exe: dialogs.obj dialogs.def dialogs.res
-	*$(CC) $(LDFLAGS) -o$@ $** $(LIBS)
-
-clean:
-        -del *.obj
-	-del *.exe
-	-del *.res
-	-del *.map
-	-del *.rws
diff --git a/samples/dialogs/makefile.unx b/samples/dialogs/makefile.unx
deleted file mode 100644
index c993443b2b..0000000000
--- a/samples/dialogs/makefile.unx
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# File:		makefile.unx
-# Author:	Julian Smart
-# Created:	1993
-# Updated:	
-# Copyright:	(c) 1993, AIAI, University of Edinburgh
-#
-# "%W% %G%"
-#
-# Makefile for dialogs example (UNIX).
-
-WXDIR = ../..
-
-# All common UNIX compiler flags and options are now in
-# this central makefile.
-include $(WXDIR)/src/make.env
-
-OBJECTS = $(OBJDIR)/dialogs.$(OBJSUFF)
-
-.SUFFIXES:
-
-all:    $(OBJDIR) dialogs$(GUISUFFIX)
-
-wx:
-
-
-motif:
-	$(MAKE) -f makefile.unx GUISUFFIX=_motif GUI=-Dwx_motif GUISUFFIX=_motif OPT='$(OPT)' LDLIBS='$(MOTIFLDLIBS)' WXLIB=$(WXDIR)/lib/libwx_motif.a  OPTIONS='$(OPTIONS)' DEBUG='$(DEBUG)' WARN='$(WARN)' XLIB='$(XLIB)' XINCLUDE='$(XINCLUDE)' XVIEW_LINK=
-
-xview:
-	cd $(WXDIR)/src/x; $(MAKE) -f makefile.unx xview
-	$(MAKE) -f makefile.unx GUI=-Dwx_xview GUISUFFIX=_ol CC=$(CC) OPTIONS='$(OPTIONS)' DEBUG='$(DEBUG)' WARN='$(WARN)' XLIB='$(XLIB)' XINCLUDE='$(XINCLUDE)'
-
-hp:
-	cd $(WXDIR)/src/x; $(MAKE) -f makefile.unx hp
-	$(MAKE) -f makefile.unx GUI=-Dwx_motif GUISUFFIX=_hp CC=CC DEBUG='$(DEBUG)' WARN='-w' \
-         XINCLUDE='$(HPXINCLUDE)' XLIB='$(HPXLIB)' XVIEW_LINK='' LDLIBS='$(HPLDLIBS)'
-
-$(OBJDIR):
-	mkdir $(OBJDIR)
-
-dialogs$(GUISUFFIX):	$(OBJDIR)/dialogs.$(OBJSUFF) $(WXLIB)
-	$(CC) $(LDFLAGS) -o dialogs$(GUISUFFIX) $(OBJDIR)/dialogs.$(OBJSUFF) $(XVIEW_LINK) $(LDLIBS)
-
-$(OBJDIR)/dialogs.$(OBJSUFF):	dialogs.$(SRCSUFF)
-	$(CC) -c $(CPPFLAGS) -o $@ dialogs.$(SRCSUFF)
-
-clean_motif:
-	$(MAKE) -f makefile.unx GUISUFFIX=_motif cleanany
-
-clean_ol:
-	$(MAKE) -f makefile.unx GUISUFFIX=_ol cleanany
-
-clean_hp:
-	$(MAKE) -f makefile.unx GUISUFFIX=_hp cleanany
-
-cleanany:
-	rm -f $(OBJECTS) dialogs$(GUISUFFIX) core
diff --git a/samples/dialogs/makefile.vms b/samples/dialogs/makefile.vms
deleted file mode 100644
index 9b76b144f3..0000000000
--- a/samples/dialogs/makefile.vms
+++ /dev/null
@@ -1,38 +0,0 @@
-#************************************************************************
-# Makefile for MINIMAL under VMS
-# by Stefan Hammes
-# (incomplete) update history:
-# 11.04.95
-#************************************************************************
-
-#************************************************************************
-# Definition section
-# (cave: definitions and includes must begin with ',')
-#************************************************************************
-
-APPOPTS = 
-APPDEFS = 
-APPINCS = 
-
-#************************************************************************
-# Module section
-#************************************************************************
-
-# Name of main module
-MAIN = minimal
-
-# Object modules of the application.
-OBJS = minimal.obj
-OBJLIST =minimal.obj
-
-.include [--.src]makevms.env
-
-# main dependency
-$(MAIN).exe : $(OBJS)
-    $(LINK) $(LINKFLAGS) /exec=$(MAIN).exe $(OBJLIST),$(WXLIB)/lib,$(OPTSFILE)/option
-    - purge *.exe
-
-#************************************************************************
-# Header file depedencies following
-#************************************************************************
-
diff --git a/samples/dialogs/makefile.wat b/samples/dialogs/makefile.wat
deleted file mode 100644
index c20f6c064c..0000000000
--- a/samples/dialogs/makefile.wat
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Makefile for WATCOM
-#
-# Created by D.Chubraev, chubraev@iem.ee.ethz.ch
-# 8 Nov 1994
-#
-
-WXDIR = ..\.. 
-
-!include $(WXDIR)\src\makewat.env
-
-WXLIB = $(WXDIR)\lib
-NAME = dialogs
-LNK = $(name).lnk
-OBJS = $(name).obj
-
-all:    $(name).exe
-
-$(name).exe : $(OBJS) $(name).res $(LNK) $(WXLIB)\wx$(LEVEL).lib
-    wlink @$(LNK)
-    $(BINDCOMMAND) $(name).res
-
-$(name).res :      $(name).rc $(WXDIR)\include\msw\wx.rc
-     $(RC) $(RESFLAGS1) $(name).rc
-
-$(LNK) : makefile.wat
-    %create $(LNK)
-    @%append $(LNK) debug all
-    @%append $(LNK) system $(LINKOPTION)
-    @%append $(LNK) $(MINDATA)
-    @%append $(LNK) $(MAXDATA)
-    @%append $(LNK) $(STACK)
-    @%append $(LNK) name $(name)
-    @%append $(LNK) file $(WXLIB)\wx$(LEVEL).lib
-    @for %i in ($(EXTRALIBS)) do @%append $(LNK) file %i
-    @for %i in ($(OBJS)) do @%append $(LNK) file %i
-
-thing: .SYMBOLIC
-    echo $(WATLIBDIR)
-
-clean:   .SYMBOLIC
-    -erase *.obj *.bak *.err *.pch *.lib *.lnk *.res *.exe *.rex
-
diff --git a/samples/docview/docview.cpp b/samples/docview/docview.cpp
index df2cba2966..fc752519eb 100644
--- a/samples/docview/docview.cpp
+++ b/samples/docview/docview.cpp
@@ -94,9 +94,6 @@ bool MyApp::OnInit(void)
 #ifdef __WXMSW__
   frame->SetIcon(wxIcon("doc_icn"));
 #endif
-#ifdef __X__
-  frame->SetIcon(wxIcon("aiai.xbm"));
-#endif
 
   //// Make a menubar
   wxMenu *file_menu = new wxMenu;
@@ -174,9 +171,6 @@ wxFrame *MyApp::CreateChildFrame(wxDocument *doc, wxView *view, bool isCanvas)
 #ifdef __WXMSW__
   subframe->SetIcon(wxString(isCanvas ? "chrt_icn" : "notepad_icn"));
 #endif
-#ifdef __X__
-  subframe->SetIcon(wxIcon("aiai.xbm"));
-#endif
 
   //// Make a menubar
   wxMenu *file_menu = new wxMenu;
diff --git a/samples/docview/docview.rc b/samples/docview/docview.rc
index bd13d9b0c4..19c382a856 100644
--- a/samples/docview/docview.rc
+++ b/samples/docview/docview.rc
@@ -1,5 +1,4 @@
 doc_icn                 ICON    "doc.ico"
-aiai_icn                ICON    "aiai.ico"
 chrt_icn                ICON    "chart.ico"
 notepad_icn             ICON    "notepad.ico"
 #include "wx/msw/wx.rc"
diff --git a/samples/docview/mondrian.ico b/samples/docview/mondrian.ico
new file mode 100644
index 0000000000..2310c5d275
Binary files /dev/null and b/samples/docview/mondrian.ico differ
diff --git a/samples/docview/mondrian.xpm b/samples/docview/mondrian.xpm
new file mode 100644
index 0000000000..409f27a843
--- /dev/null
+++ b/samples/docview/mondrian.xpm
@@ -0,0 +1,44 @@
+/* XPM */
+static char *mondrian_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 6 1",
+"  c Black",
+". c Blue",
+"X c #00bf00",
+"o c Red",
+"O c Yellow",
+"+ c Gray100",
+/* pixels */
+"                                ",
+" oooooo +++++++++++++++++++++++ ",
+" oooooo +++++++++++++++++++++++ ",
+" oooooo +++++++++++++++++++++++ ",
+" oooooo +++++++++++++++++++++++ ",
+" oooooo +++++++++++++++++++++++ ",
+" oooooo +++++++++++++++++++++++ ",
+" oooooo +++++++++++++++++++++++ ",
+"                                ",
+" ++++++ ++++++++++++++++++ .... ",
+" ++++++ ++++++++++++++++++ .... ",
+" ++++++ ++++++++++++++++++ .... ",
+" ++++++ ++++++++++++++++++ .... ",
+" ++++++ ++++++++++++++++++ .... ",
+" ++++++ ++++++++++++++++++      ",
+" ++++++ ++++++++++++++++++ ++++ ",
+" ++++++ ++++++++++++++++++ ++++ ",
+" ++++++ ++++++++++++++++++ ++++ ",
+" ++++++ ++++++++++++++++++ ++++ ",
+" ++++++ ++++++++++++++++++ ++++ ",
+" ++++++ ++++++++++++++++++ ++++ ",
+" ++++++ ++++++++++++++++++ ++++ ",
+" ++++++ ++++++++++++++++++ ++++ ",
+" ++++++ ++++++++++++++++++ ++++ ",
+" ++++++                    ++++ ",
+" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
+" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
+" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
+" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
+" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
+" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
+"                                "
+};
diff --git a/samples/dynamic/Makefile.in b/samples/dynamic/Makefile.in
index ad872ffe11..bebee4cb44 100644
--- a/samples/dynamic/Makefile.in
+++ b/samples/dynamic/Makefile.in
@@ -10,11 +10,11 @@ RULE=bin
 BIN_TARGET=dynamic
 # define library sources
 BIN_SRC=\
-minimal.cpp
+dynamic.cpp
 
 #define library objects
 BIN_OBJ=\
-minimal.o
+dynamic.o
 
 # additional things needed to link
 BIN_LINK=
diff --git a/samples/dynamic/aiai.ico b/samples/dynamic/aiai.ico
deleted file mode 100644
index a3db6563cc..0000000000
Binary files a/samples/dynamic/aiai.ico and /dev/null differ
diff --git a/samples/dynamic/aiai.xbm b/samples/dynamic/aiai.xbm
deleted file mode 100644
index 1a6f0a31b1..0000000000
--- a/samples/dynamic/aiai.xbm
+++ /dev/null
@@ -1,38 +0,0 @@
-#define aiai_width 64
-#define aiai_height 64
-static char aiai_bits[] = {
- 0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,
- 0x11,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,
- 0x44,0x44,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,
- 0x11,0x11,0x11,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,
- 0x44,0x44,0x44,0x44,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,
- 0x11,0x11,0x11,0x11,0x11,0x44,0x44,0x44,0x42,0x44,0x44,0x44,0x44,0x44,0x44,
- 0x44,0x47,0x44,0x44,0x44,0x44,0x11,0x11,0x11,0x17,0x11,0x11,0x11,0x11,0x11,
- 0x11,0x91,0x1f,0x11,0x11,0x11,0x11,0x44,0x44,0xc4,0x4f,0x44,0x44,0x44,0x44,
- 0x44,0x44,0xc4,0x5f,0x44,0xf4,0x45,0x44,0x11,0x11,0xf1,0x1f,0x11,0xf9,0x13,
- 0x11,0x11,0x11,0xf1,0x3f,0x11,0xfd,0x13,0x11,0x44,0x44,0xf4,0x7f,0x44,0xfc,
- 0x47,0x44,0x44,0x44,0xf4,0x7f,0x44,0xfc,0x47,0x44,0x11,0x11,0xf9,0x7f,0x11,
- 0xf9,0x13,0x11,0x11,0x11,0xfd,0xff,0x11,0xf1,0x11,0x11,0x44,0x44,0xfc,0xff,
- 0x44,0x44,0x44,0x44,0x44,0x44,0xfe,0xff,0x45,0x44,0x44,0x44,0x11,0x11,0xff,
- 0xff,0x11,0xfd,0x13,0x11,0x11,0x11,0xff,0xff,0x13,0xfd,0x13,0x11,0x44,0xc4,
- 0xff,0xff,0x07,0xfc,0x43,0x44,0x44,0xff,0xff,0xf9,0xff,0xfd,0xfb,0xff,0x11,
- 0xc0,0xff,0x00,0x00,0xfc,0x03,0x00,0x11,0xc0,0x7f,0x00,0x00,0xfc,0x03,0x00,
- 0x04,0xe0,0x7f,0x00,0x00,0xfc,0x03,0x00,0xf4,0xf7,0xbf,0xff,0xff,0xfd,0xfb,
- 0x7f,0x01,0xf0,0x1f,0x00,0x00,0xfc,0x03,0x00,0x01,0xf8,0x1f,0x00,0x00,0xfc,
- 0x03,0x00,0x00,0xfc,0x0f,0x00,0x00,0xfc,0x03,0x40,0xfe,0xfd,0xef,0xff,0xff,
- 0xfd,0xfb,0x4f,0x00,0xfe,0x07,0x00,0x00,0xfc,0x03,0x10,0x00,0xfe,0x03,0x00,
- 0x00,0xfc,0x03,0x10,0x00,0xff,0x03,0x00,0x00,0xfc,0x03,0x44,0x7f,0xff,0x01,
- 0x00,0x00,0xfc,0xfb,0x44,0x91,0xff,0xff,0xff,0xff,0xff,0x13,0x11,0xd1,0xff,
- 0xff,0xff,0xff,0xff,0x13,0x11,0xe4,0xff,0xff,0xff,0xff,0xff,0x47,0x44,0xe4,
- 0xff,0xff,0xff,0xff,0xff,0x47,0x44,0xf1,0xff,0xff,0xff,0xff,0xff,0x13,0x11,
- 0xf1,0xff,0xff,0xff,0xff,0xff,0x13,0x11,0xfc,0xff,0xff,0xff,0xff,0xff,0x47,
- 0x44,0xfc,0xff,0xff,0xff,0xff,0xff,0x47,0x44,0x11,0x11,0x11,0x11,0x11,0x11,
- 0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x10,0x11,0x44,0x44,0xc4,0x44,0x44,
- 0xc4,0x44,0x44,0x44,0x4e,0xc4,0x44,0x4e,0xc4,0x44,0x44,0x11,0x1f,0xd1,0x11,
- 0x1f,0xd1,0x11,0x11,0x91,0x31,0xd1,0x91,0x31,0xd1,0x11,0x11,0xc4,0x64,0xcc,
- 0xcc,0x64,0xcc,0x44,0x44,0x64,0xc4,0xcc,0x6c,0xc4,0xcc,0x44,0x44,0xf1,0xff,
- 0xd1,0xf1,0xff,0xd1,0x11,0x11,0xf9,0xff,0xd3,0xf9,0xff,0xd3,0x11,0x11,0x4c,
- 0x44,0xc6,0x4c,0x44,0xc6,0x44,0x44,0x4c,0x44,0xc6,0x4c,0x44,0xc6,0x44,0x44,
- 0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,
- 0x11,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,
- 0x44,0x44};
diff --git a/samples/dynamic/makefile.b32 b/samples/dynamic/makefile.b32
index 06d7deff50..4ade0dedcc 100644
--- a/samples/dynamic/makefile.b32
+++ b/samples/dynamic/makefile.b32
@@ -7,7 +7,7 @@
 #
 # "%W% %G%"
 #
-# Makefile : Builds minimal example (DOS).
+# Makefile : Builds dynamic example (DOS).
 
 # WXWIN and BCCDIR are set by parent make
 
@@ -19,7 +19,7 @@ WXINC = $(WXDIR)\include\msw
 WXLIB = $(WXLIBDIR)\wx32.lib
 LIBS=$(WXLIB) cw32 import32 ole2w32
 
-TARGET=minimal
+TARGET=dynamic
 
 !if "$(FINAL)" == "0"
 LINKFLAGS=/v /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
@@ -32,7 +32,7 @@ DEBUG_FLAGS =
 !endif
 CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
 
-OBJECTS = minimal.obj
+OBJECTS = dynamic.obj
 
 $(TARGET).exe:	$(OBJECTS) $(TARGET).def $(TARGET).res
   tlink32 $(LINKFLAGS) @&&!
@@ -50,7 +50,7 @@ $(TARGET).def
 .c.obj:
 	bcc32 $(CPPFLAGS) -P- -c {$< }
 
-minimal.obj:      minimal.$(SRCSUFF)
+dynamic.obj:      dynamic.$(SRCSUFF)
 
 $(TARGET).res :      $(TARGET).rc $(WXDIR)\include\wx\msw\wx.rc
     brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include $(TARGET)
diff --git a/samples/dynamic/makefile.bcc b/samples/dynamic/makefile.bcc
deleted file mode 100644
index b68a9b6d21..0000000000
--- a/samples/dynamic/makefile.bcc
+++ /dev/null
@@ -1,73 +0,0 @@
-#
-# File:		makefile.bcc
-# Author:	Julian Smart
-# Created:	1993
-# Updated:	
-# Copyright:	(c) 1993, AIAI, University of Edinburgh
-#
-# "%W% %G%"
-#
-# Makefile : Builds minimal example (DOS).
-
-!if "$(BCCDIR)" == ""
-!error You must define the BCCDIR variable in autoexec.bat, e.g. BCCDIR=d:\bc4
-!endif
-
-!if "$(WXWIN)" == ""
-!error You must define the WXWIN variable in autoexec.bat, e.g. WXWIN=c:\wx
-!endif
-
-WXDIR = $(WXWIN)
-!include $(WXDIR)\src\makebcc.env
-
-THISDIR = $(WXDIR)\samples\minimal
-WXLIB = $(WXDIR)\lib\wx.lib
-LIBS=$(WXLIB) mathwl cwl import
-INC=-I$(WXDIR)\include\base -I$(WXDIR)\include\msw
-CFG=$(WXDIR)\src\wxwin.cfg
-
-!ifndef FINAL
-FINAL=0
-!endif
-
-!if "$(FINAL)" == "0"
-LINKFLAGS=/v/Vt /Twe /L$(WXDIR)\lib;$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS= -v
-!else
-LINKFLAGS=/Twe /L$(WXDIR)\lib;$(BCCDIR)\lib
-OPT = -O2
-DEBUG_FLAGS=
-!endif
-CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
-
-OBJECTS = minimal.obj
-
-minimal:    minimal.exe
-
-all:    minimal.exe
-
-minimal.exe:    $(WXLIB) minimal.obj minimal.def minimal.res
-        tlink $(LINKFLAGS) @&&!
-c0wl.obj minimal.obj
-minimal
-nul
-$(LIBS)
-minimal.def
-!
-        rc -31 -K minimal.res
-
-.$(SRCSUFF).obj:
-	bcc $(CPPFLAGS) -c {$< }
-
-minimal.obj:      minimal.$(SRCSUFF)
-
-minimal.res :      minimal.rc $(WXDIR)\include\msw\wx.rc
-    rc -r /i$(BCCDIR)\include /i$(WXDIR)\include\msw /i$(WXDIR)\contrib\fafa minimal
-
-clean:
-        -erase *.obj
-        -erase *.exe
-        -erase *.res
-        -erase *.map
-        -erase *.rws
diff --git a/samples/dynamic/makefile.dos b/samples/dynamic/makefile.dos
index aa7e6ddf53..1305df9589 100644
--- a/samples/dynamic/makefile.dos
+++ b/samples/dynamic/makefile.dos
@@ -7,7 +7,7 @@
 #
 # "%W% %G%"
 #
-# Makefile : Builds minimal example (DOS).
+# Makefile : Builds dynamic example (DOS).
 # Use FINAL=1 argument to nmake to build final version with no debugging
 # info
 
@@ -15,17 +15,17 @@ WXDIR = $(WXWIN)
 
 !include $(WXDIR)\src\makemsc.env
 
-THISDIR = $(WXDIR)\samples\minimal
+THISDIR = $(WXDIR)\samples\dynamic
 
 !ifndef FINAL
 FINAL=0
 !endif
 
 HEADERS =
-SOURCES = minimal.$(SRCSUFF)
-OBJECTS = minimal.obj
+SOURCES = dynamic.$(SRCSUFF)
+OBJECTS = dynamic.obj
 
-all:    minimal.exe
+all:    dynamic.exe
 
 wx:
         cd $(WXDIR)\src\msw
@@ -37,24 +37,24 @@ wxclean:
         nmake -f makefile.dos clean
         cd $(THISDIR)
 
-minimal.exe:      $(WXDIR)\src\msw\dummy.obj $(WXLIB) minimal.obj minimal.def minimal.res
+dynamic.exe:      $(WXDIR)\src\msw\dummy.obj $(WXLIB) dynamic.obj dynamic.def dynamic.res
         link $(LINKFLAGS) @<<
-minimal.obj $(WXDIR)\src\msw\dummy.obj,
-minimal,
+dynamic.obj $(WXDIR)\src\msw\dummy.obj,
+dynamic,
 NUL,
 $(LIBS),
-minimal.def
+dynamic.def
 ;
 <<
-        rc -K minimal.res
+        rc -K dynamic.res
 
-minimal.obj:      minimal.$(SRCSUFF)
+dynamic.obj:      dynamic.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /c /Tp $*.$(SRCSUFF)
 <<
 
-minimal.res :      minimal.rc $(WXDIR)\include\wx\msw\wx.rc
-    rc -r /i$(WXDIR)\include minimal
+dynamic.res :      dynamic.rc $(WXDIR)\include\wx\msw\wx.rc
+    rc -r /i$(WXDIR)\include dynamic
 
 clean:
         -erase *.obj
diff --git a/samples/dynamic/makefile.g95 b/samples/dynamic/makefile.g95
index 6ad1b1b2ad..c5f0d229fc 100644
--- a/samples/dynamic/makefile.g95
+++ b/samples/dynamic/makefile.g95
@@ -7,7 +7,7 @@
 #
 # "%W% %G%"
 #
-# Makefile for minimal example (UNIX).
+# Makefile for dynamic example (UNIX).
 
 WXDIR = ../..
 
@@ -15,23 +15,23 @@ WXDIR = ../..
 # this central makefile.
 include $(WXDIR)/src/makeg95.env
 
-OBJECTS = $(OBJDIR)/minimal.$(OBJSUFF) $(OBJDIR)/minimal_resources.$(OBJSUFF)
+OBJECTS = $(OBJDIR)/dynamic.$(OBJSUFF) $(OBJDIR)/dynamic_resources.$(OBJSUFF)
 
-all:    $(OBJDIR) minimal$(GUISUFFIX)$(EXESUFF)
+all:    $(OBJDIR) dynamic$(GUISUFFIX)$(EXESUFF)
 
 wx:
 
 $(OBJDIR):
 	mkdir $(OBJDIR)
 
-minimal$(GUISUFFIX)$(EXESUFF):	$(OBJECTS) $(WXLIB)
-	$(CC) $(LDFLAGS) -o minimal$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(LDLIBS)
+dynamic$(GUISUFFIX)$(EXESUFF):	$(OBJECTS) $(WXLIB)
+	$(CC) $(LDFLAGS) -o dynamic$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(LDLIBS)
 
-$(OBJDIR)/minimal.$(OBJSUFF):	minimal.$(SRCSUFF)
-	$(CC) -c $(CPPFLAGS) -o $@ minimal.$(SRCSUFF)
+$(OBJDIR)/dynamic.$(OBJSUFF):	dynamic.$(SRCSUFF)
+	$(CC) -c $(CPPFLAGS) -o $@ dynamic.$(SRCSUFF)
 
-$(OBJDIR)/minimal_resources.o:  minimal.rc
-	$(RESCOMP) -i minimal.rc -o $(OBJDIR)/minimal_resources.o $(RESFLAGS)
+$(OBJDIR)/dynamic_resources.o:  dynamic.rc
+	$(RESCOMP) -i dynamic.rc -o $(OBJDIR)/dynamic_resources.o $(RESFLAGS)
 
 clean:
-	rm -f $(OBJECTS) minimal$(GUISUFFIX).exe core *.rsc *.res
+	rm -f $(OBJECTS) dynamic$(GUISUFFIX).exe core *.rsc *.res
diff --git a/samples/dynamic/makefile.nt b/samples/dynamic/makefile.nt
index 276311e09c..76464c3e90 100644
--- a/samples/dynamic/makefile.nt
+++ b/samples/dynamic/makefile.nt
@@ -7,7 +7,7 @@
 #
 # "%W% %G%"
 #
-# Makefile : Builds minimal example (MS VC++).
+# Makefile : Builds dynamic example (MS VC++).
 # Use FINAL=1 argument to nmake to build final version with no debugging
 # info
 
@@ -18,9 +18,9 @@ WXUSINGDLL=0
 
 !include $(WXDIR)\src\ntwxwin.mak
 
-THISDIR = $(WXDIR)\samples\minimal
-PROGRAM=minimal
- 
+THISDIR = $(WXDIR)\samples\dynamic
+PROGRAM=dynamic
+
 OBJECTS = $(PROGRAM).obj
 
 $(PROGRAM):    $(PROGRAM).exe
diff --git a/samples/dynamic/makefile.sc b/samples/dynamic/makefile.sc
deleted file mode 100644
index 8709d2ca0f..0000000000
--- a/samples/dynamic/makefile.sc
+++ /dev/null
@@ -1,35 +0,0 @@
-# Symantec C++ makefile for minimal example
-# NOTE that peripheral libraries are now dealt in main wxWindows makefile.
-
-WXDIR = $(WXWIN)
-!include $(WXDIR)\src\makesc.env
-
-WXLIB = $(WXDIR)\lib\wx.lib
-INCDIR = $(WXDIR)\include
-MSWINC = $(INCDIR)\msw
-BASEINC = $(INCDIR)\base
-
-CC=sc
-RC=rc
-CFLAGS = -o -ml -W -Dwx_msw
-LDFLAGS = -ml -W
-
-INCLUDE=$(BASEINC);$(MSWINC)
-
-LIBS=$(WXLIB) libw.lib commdlg.lib shell.lib
-
-.$(SRCSUFF).obj:
-	*$(CC) -c $(CFLAGS) -I$(INCLUDE) $<
-
-.rc.res:
-	*$(RC) -r -I$(INCLUDE) $<
-
-minimal.exe: minimal.obj minimal.def minimal.res
-	*$(CC) $(LDFLAGS) -o$@ $** $(LIBS)
-
-clean:
-        -del *.obj
-	-del *.exe
-	-del *.res
-	-del *.map
-	-del *.rws
diff --git a/samples/dynamic/makefile.unx b/samples/dynamic/makefile.unx
deleted file mode 100644
index 9685d06789..0000000000
--- a/samples/dynamic/makefile.unx
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# File:		makefile.unx
-# Author:	Julian Smart
-# Created:	1993
-# Updated:	
-# Copyright:	(c) 1993, AIAI, University of Edinburgh
-#
-# "%W% %G%"
-#
-# Makefile for minimal example (UNIX).
-
-WXDIR = ../..
-
-# All common UNIX compiler flags and options are now in
-# this central makefile.
-include $(WXDIR)/src/make.env
-
-OBJECTS = $(OBJDIR)/minimal.$(OBJSUFF)
-
-.SUFFIXES:
-
-all:    $(OBJDIR) minimal$(GUISUFFIX)
-
-wx:
-
-
-motif:
-	$(MAKE) -f makefile.unx GUISUFFIX=_motif GUI=-Dwx_motif GUISUFFIX=_motif OPT='$(OPT)' LDLIBS='$(MOTIFLDLIBS)' WXLIB=$(WXDIR)/lib/libwx_motif.a  OPTIONS='$(OPTIONS)' DEBUG='$(DEBUG)' WARN='$(WARN)' XLIB='$(XLIB)' XINCLUDE='$(XINCLUDE)' XVIEW_LINK=
-
-xview:
-	cd $(WXDIR)/src/x; $(MAKE) -f makefile.unx xview
-	$(MAKE) -f makefile.unx GUI=-Dwx_xview GUISUFFIX=_ol CC=$(CC) OPTIONS='$(OPTIONS)' DEBUG='$(DEBUG)' WARN='$(WARN)' XLIB='$(XLIB)' XINCLUDE='$(XINCLUDE)'
-
-hp:
-	cd $(WXDIR)/src/x; $(MAKE) -f makefile.unx hp
-	$(MAKE) -f makefile.unx GUI=-Dwx_motif GUISUFFIX=_hp CC=CC DEBUG='$(DEBUG)' WARN='-w' \
-         XINCLUDE='$(HPXINCLUDE)' XLIB='$(HPXLIB)' XVIEW_LINK='' LDLIBS='$(HPLDLIBS)'
-
-$(OBJDIR):
-	mkdir $(OBJDIR)
-
-minimal$(GUISUFFIX):	$(OBJDIR)/minimal.$(OBJSUFF) $(WXLIB)
-	$(CC) $(LDFLAGS) -o minimal$(GUISUFFIX) $(OBJDIR)/minimal.$(OBJSUFF) $(XVIEW_LINK) $(LDLIBS)
-
-$(OBJDIR)/minimal.$(OBJSUFF):	minimal.$(SRCSUFF)
-	$(CC) -c $(CPPFLAGS) -o $@ minimal.$(SRCSUFF)
-
-clean_motif:
-	$(MAKE) -f makefile.unx GUISUFFIX=_motif cleanany
-
-clean_ol:
-	$(MAKE) -f makefile.unx GUISUFFIX=_ol cleanany
-
-clean_hp:
-	$(MAKE) -f makefile.unx GUISUFFIX=_hp cleanany
-
-cleanany:
-	rm -f $(OBJECTS) minimal$(GUISUFFIX) core
diff --git a/samples/dynamic/makefile.vms b/samples/dynamic/makefile.vms
deleted file mode 100644
index 9b76b144f3..0000000000
--- a/samples/dynamic/makefile.vms
+++ /dev/null
@@ -1,38 +0,0 @@
-#************************************************************************
-# Makefile for MINIMAL under VMS
-# by Stefan Hammes
-# (incomplete) update history:
-# 11.04.95
-#************************************************************************
-
-#************************************************************************
-# Definition section
-# (cave: definitions and includes must begin with ',')
-#************************************************************************
-
-APPOPTS = 
-APPDEFS = 
-APPINCS = 
-
-#************************************************************************
-# Module section
-#************************************************************************
-
-# Name of main module
-MAIN = minimal
-
-# Object modules of the application.
-OBJS = minimal.obj
-OBJLIST =minimal.obj
-
-.include [--.src]makevms.env
-
-# main dependency
-$(MAIN).exe : $(OBJS)
-    $(LINK) $(LINKFLAGS) /exec=$(MAIN).exe $(OBJLIST),$(WXLIB)/lib,$(OPTSFILE)/option
-    - purge *.exe
-
-#************************************************************************
-# Header file depedencies following
-#************************************************************************
-
diff --git a/samples/dynamic/makefile.wat b/samples/dynamic/makefile.wat
deleted file mode 100644
index 21219d7a0e..0000000000
--- a/samples/dynamic/makefile.wat
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Makefile for WATCOM
-#
-# Created by D.Chubraev, chubraev@iem.ee.ethz.ch
-# 8 Nov 1994
-#
-
-WXDIR = ..\.. 
-
-!include $(WXDIR)\src\makewat.env
-
-WXLIB = $(WXDIR)\lib
-NAME = minimal
-LNK = $(name).lnk
-OBJS = $(name).obj 
-
-all: $(name).exe
-
-$(name).exe : $(OBJS) $(name).res $(LNK) $(WXLIB)\wx$(LEVEL).lib
-    wlink @$(LNK)
-    $(BINDCOMMAND) $(name).res
-
-$(name).res :      $(name).rc $(WXDIR)\include\msw\wx.rc
-     $(RC) $(RESFLAGS1) $(name).rc
-
-$(LNK) : makefile.wat
-    %create $(LNK)
-    @%append $(LNK) debug all
-    @%append $(LNK) system $(LINKOPTION)
-    @%append $(LNK) $(MINDATA)
-    @%append $(LNK) $(MAXDATA)
-    @%append $(LNK) $(STACK)
-    @%append $(LNK) name $(name)
-    @%append $(LNK) file $(WXLIB)\wx$(LEVEL).lib
-    @for %i in ($(EXTRALIBS)) do @%append $(LNK) file %i
-    @for %i in ($(OBJS)) do @%append $(LNK) file %i
-
-thing: .SYMBOLIC
-    echo $(WATLIBDIR)
-
-clean:   .SYMBOLIC
-    -erase *.obj *.bak *.err *.pch *.lib *.lnk *.res *.exe
-
diff --git a/samples/dynamic/minimal.cpp b/samples/dynamic/minimal.cpp
deleted file mode 100644
index 393cc37957..0000000000
--- a/samples/dynamic/minimal.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        minimal.cpp
-// Purpose:     Dynamic events wxWindows sample
-// Author:      Julian Smart
-// Modified by:
-// Created:     04/01/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
-/////////////////////////////////////////////////////////////////////////////
-
-#ifdef __GNUG__
-#pragma implementation "minimal.cpp"
-#pragma interface "minimal.cpp"
-#endif
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#ifdef __WXGTK__
-#include "mondrian.xpm"
-#endif
-
-// Define a new application type
-class MyApp: public wxApp
-{ public:
-    bool OnInit(void);
-};
-
-// Define a new frame type
-class MyFrame: public wxFrame
-{ public:
-    MyFrame(wxFrame *frame, char *title, int x, int y, int w, int h);
-    
- public:
-    void OnQuit(wxCommandEvent& event);
-    void OnAbout(wxCommandEvent& event);
-	bool OnClose(void) { return TRUE; }
-};
-
-// ID for the menu commands
-#define MINIMAL_QUIT 	1
-#define MINIMAL_TEXT 	101
-#define MINIMAL_ABOUT 	102
-
-// Create a new application object
-IMPLEMENT_APP	(MyApp)
-
-// `Main program' equivalent, creating windows and returning main app frame
-bool MyApp::OnInit(void)
-{
-  // Create the main frame window
-  MyFrame *frame = new MyFrame(NULL, "Minimal wxWindows App", 50, 50, 450, 340);
-  
-  frame->Connect( MINIMAL_QUIT,  -1, wxEVT_COMMAND_MENU_SELECTED, (wxObjectEventFunction)MyFrame::OnQuit );
-  frame->Connect( MINIMAL_ABOUT, -1, wxEVT_COMMAND_MENU_SELECTED, (wxObjectEventFunction)MyFrame::OnAbout );
-  
-  // Give it an icon
-#ifdef __WXMSW__
-  frame->SetIcon(wxIcon("mondrian"));
-#else
-  frame->SetIcon(wxIcon(mondrian_xpm));
-#endif
-
-  // Make a menubar
-  wxMenu *file_menu = new wxMenu;
-
-  file_menu->Append(MINIMAL_ABOUT, "&About");
-  file_menu->Append(MINIMAL_QUIT, "E&xit");
-  wxMenuBar *menu_bar = new wxMenuBar;
-  menu_bar->Append(file_menu, "&File");
-  frame->SetMenuBar(menu_bar);
-
-  // Make a panel with a message
-  wxPanel *panel = new wxPanel(frame, -1, wxPoint(0, 0), wxSize(400, 200), wxTAB_TRAVERSAL);
-
-  (void)new wxStaticText(panel, 311, "Hello!", wxPoint(10, 10), wxSize(-1, -1), 0);
-
-  // Show the frame
-  frame->Show(TRUE);
-  
-  SetTopWindow(frame);
-
-  return TRUE;
-}
-
-// My frame constructor
-MyFrame::MyFrame(wxFrame *frame, char *title, int x, int y, int w, int h):
-  wxFrame(frame, -1, title, wxPoint(x, y), wxSize(w, h))
-{}
-
-void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event) )
-{
-  Close(TRUE);
-}
-
-void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
-{
-  wxMessageDialog dialog(this, "This is a minimal sample\nA second line in the message box",
-  	"About Minimal", wxYES_NO|wxCANCEL);
-
-  dialog.ShowModal();
-}
-
-
diff --git a/samples/dynamic/minimal.def b/samples/dynamic/minimal.def
deleted file mode 100644
index 060bfe3fce..0000000000
--- a/samples/dynamic/minimal.def
+++ /dev/null
@@ -1,8 +0,0 @@
-NAME         Minimal
-DESCRIPTION  'Minimal wxWindows application'
-EXETYPE      WINDOWS
-STUB         'WINSTUB.EXE'
-CODE         PRELOAD MOVEABLE DISCARDABLE
-DATA         PRELOAD MOVEABLE MULTIPLE
-HEAPSIZE     4048
-STACKSIZE    16000
diff --git a/samples/dynamic/minimal.rc b/samples/dynamic/minimal.rc
deleted file mode 100644
index 7655c62a4c..0000000000
--- a/samples/dynamic/minimal.rc
+++ /dev/null
@@ -1,3 +0,0 @@
-mondrian ICON "mondrian.ico"
-#include "wx/msw/wx.rc"
-
diff --git a/samples/grid/aiai.ico b/samples/grid/aiai.ico
deleted file mode 100644
index a3db6563cc..0000000000
Binary files a/samples/grid/aiai.ico and /dev/null differ
diff --git a/samples/grid/aiai.xbm b/samples/grid/aiai.xbm
deleted file mode 100644
index 1a6f0a31b1..0000000000
--- a/samples/grid/aiai.xbm
+++ /dev/null
@@ -1,38 +0,0 @@
-#define aiai_width 64
-#define aiai_height 64
-static char aiai_bits[] = {
- 0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,
- 0x11,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,
- 0x44,0x44,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,
- 0x11,0x11,0x11,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,
- 0x44,0x44,0x44,0x44,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,
- 0x11,0x11,0x11,0x11,0x11,0x44,0x44,0x44,0x42,0x44,0x44,0x44,0x44,0x44,0x44,
- 0x44,0x47,0x44,0x44,0x44,0x44,0x11,0x11,0x11,0x17,0x11,0x11,0x11,0x11,0x11,
- 0x11,0x91,0x1f,0x11,0x11,0x11,0x11,0x44,0x44,0xc4,0x4f,0x44,0x44,0x44,0x44,
- 0x44,0x44,0xc4,0x5f,0x44,0xf4,0x45,0x44,0x11,0x11,0xf1,0x1f,0x11,0xf9,0x13,
- 0x11,0x11,0x11,0xf1,0x3f,0x11,0xfd,0x13,0x11,0x44,0x44,0xf4,0x7f,0x44,0xfc,
- 0x47,0x44,0x44,0x44,0xf4,0x7f,0x44,0xfc,0x47,0x44,0x11,0x11,0xf9,0x7f,0x11,
- 0xf9,0x13,0x11,0x11,0x11,0xfd,0xff,0x11,0xf1,0x11,0x11,0x44,0x44,0xfc,0xff,
- 0x44,0x44,0x44,0x44,0x44,0x44,0xfe,0xff,0x45,0x44,0x44,0x44,0x11,0x11,0xff,
- 0xff,0x11,0xfd,0x13,0x11,0x11,0x11,0xff,0xff,0x13,0xfd,0x13,0x11,0x44,0xc4,
- 0xff,0xff,0x07,0xfc,0x43,0x44,0x44,0xff,0xff,0xf9,0xff,0xfd,0xfb,0xff,0x11,
- 0xc0,0xff,0x00,0x00,0xfc,0x03,0x00,0x11,0xc0,0x7f,0x00,0x00,0xfc,0x03,0x00,
- 0x04,0xe0,0x7f,0x00,0x00,0xfc,0x03,0x00,0xf4,0xf7,0xbf,0xff,0xff,0xfd,0xfb,
- 0x7f,0x01,0xf0,0x1f,0x00,0x00,0xfc,0x03,0x00,0x01,0xf8,0x1f,0x00,0x00,0xfc,
- 0x03,0x00,0x00,0xfc,0x0f,0x00,0x00,0xfc,0x03,0x40,0xfe,0xfd,0xef,0xff,0xff,
- 0xfd,0xfb,0x4f,0x00,0xfe,0x07,0x00,0x00,0xfc,0x03,0x10,0x00,0xfe,0x03,0x00,
- 0x00,0xfc,0x03,0x10,0x00,0xff,0x03,0x00,0x00,0xfc,0x03,0x44,0x7f,0xff,0x01,
- 0x00,0x00,0xfc,0xfb,0x44,0x91,0xff,0xff,0xff,0xff,0xff,0x13,0x11,0xd1,0xff,
- 0xff,0xff,0xff,0xff,0x13,0x11,0xe4,0xff,0xff,0xff,0xff,0xff,0x47,0x44,0xe4,
- 0xff,0xff,0xff,0xff,0xff,0x47,0x44,0xf1,0xff,0xff,0xff,0xff,0xff,0x13,0x11,
- 0xf1,0xff,0xff,0xff,0xff,0xff,0x13,0x11,0xfc,0xff,0xff,0xff,0xff,0xff,0x47,
- 0x44,0xfc,0xff,0xff,0xff,0xff,0xff,0x47,0x44,0x11,0x11,0x11,0x11,0x11,0x11,
- 0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x10,0x11,0x44,0x44,0xc4,0x44,0x44,
- 0xc4,0x44,0x44,0x44,0x4e,0xc4,0x44,0x4e,0xc4,0x44,0x44,0x11,0x1f,0xd1,0x11,
- 0x1f,0xd1,0x11,0x11,0x91,0x31,0xd1,0x91,0x31,0xd1,0x11,0x11,0xc4,0x64,0xcc,
- 0xcc,0x64,0xcc,0x44,0x44,0x64,0xc4,0xcc,0x6c,0xc4,0xcc,0x44,0x44,0xf1,0xff,
- 0xd1,0xf1,0xff,0xd1,0x11,0x11,0xf9,0xff,0xd3,0xf9,0xff,0xd3,0x11,0x11,0x4c,
- 0x44,0xc6,0x4c,0x44,0xc6,0x44,0x44,0x4c,0x44,0xc6,0x4c,0x44,0xc6,0x44,0x44,
- 0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,
- 0x11,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,
- 0x44,0x44};
diff --git a/samples/grid/test.cpp b/samples/grid/test.cpp
index 1f48aeec87..2d088c5415 100644
--- a/samples/grid/test.cpp
+++ b/samples/grid/test.cpp
@@ -100,9 +100,6 @@ bool MyApp::OnInit(void)
 #ifdef __WXMSW__
   frame->SetIcon(wxIcon("mondrian"));
 #endif
-#ifdef __X__
-  frame->SetIcon(wxIcon("aiai.xbm"));
-#endif
 
   // Make a menubar
   wxMenu *file_menu = new wxMenu;
diff --git a/samples/internat/aiai.ico b/samples/internat/aiai.ico
deleted file mode 100644
index a3db6563cc..0000000000
Binary files a/samples/internat/aiai.ico and /dev/null differ
diff --git a/samples/internat/aiai.xbm b/samples/internat/aiai.xbm
deleted file mode 100644
index 1a6f0a31b1..0000000000
--- a/samples/internat/aiai.xbm
+++ /dev/null
@@ -1,38 +0,0 @@
-#define aiai_width 64
-#define aiai_height 64
-static char aiai_bits[] = {
- 0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,
- 0x11,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,
- 0x44,0x44,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,
- 0x11,0x11,0x11,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,
- 0x44,0x44,0x44,0x44,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,
- 0x11,0x11,0x11,0x11,0x11,0x44,0x44,0x44,0x42,0x44,0x44,0x44,0x44,0x44,0x44,
- 0x44,0x47,0x44,0x44,0x44,0x44,0x11,0x11,0x11,0x17,0x11,0x11,0x11,0x11,0x11,
- 0x11,0x91,0x1f,0x11,0x11,0x11,0x11,0x44,0x44,0xc4,0x4f,0x44,0x44,0x44,0x44,
- 0x44,0x44,0xc4,0x5f,0x44,0xf4,0x45,0x44,0x11,0x11,0xf1,0x1f,0x11,0xf9,0x13,
- 0x11,0x11,0x11,0xf1,0x3f,0x11,0xfd,0x13,0x11,0x44,0x44,0xf4,0x7f,0x44,0xfc,
- 0x47,0x44,0x44,0x44,0xf4,0x7f,0x44,0xfc,0x47,0x44,0x11,0x11,0xf9,0x7f,0x11,
- 0xf9,0x13,0x11,0x11,0x11,0xfd,0xff,0x11,0xf1,0x11,0x11,0x44,0x44,0xfc,0xff,
- 0x44,0x44,0x44,0x44,0x44,0x44,0xfe,0xff,0x45,0x44,0x44,0x44,0x11,0x11,0xff,
- 0xff,0x11,0xfd,0x13,0x11,0x11,0x11,0xff,0xff,0x13,0xfd,0x13,0x11,0x44,0xc4,
- 0xff,0xff,0x07,0xfc,0x43,0x44,0x44,0xff,0xff,0xf9,0xff,0xfd,0xfb,0xff,0x11,
- 0xc0,0xff,0x00,0x00,0xfc,0x03,0x00,0x11,0xc0,0x7f,0x00,0x00,0xfc,0x03,0x00,
- 0x04,0xe0,0x7f,0x00,0x00,0xfc,0x03,0x00,0xf4,0xf7,0xbf,0xff,0xff,0xfd,0xfb,
- 0x7f,0x01,0xf0,0x1f,0x00,0x00,0xfc,0x03,0x00,0x01,0xf8,0x1f,0x00,0x00,0xfc,
- 0x03,0x00,0x00,0xfc,0x0f,0x00,0x00,0xfc,0x03,0x40,0xfe,0xfd,0xef,0xff,0xff,
- 0xfd,0xfb,0x4f,0x00,0xfe,0x07,0x00,0x00,0xfc,0x03,0x10,0x00,0xfe,0x03,0x00,
- 0x00,0xfc,0x03,0x10,0x00,0xff,0x03,0x00,0x00,0xfc,0x03,0x44,0x7f,0xff,0x01,
- 0x00,0x00,0xfc,0xfb,0x44,0x91,0xff,0xff,0xff,0xff,0xff,0x13,0x11,0xd1,0xff,
- 0xff,0xff,0xff,0xff,0x13,0x11,0xe4,0xff,0xff,0xff,0xff,0xff,0x47,0x44,0xe4,
- 0xff,0xff,0xff,0xff,0xff,0x47,0x44,0xf1,0xff,0xff,0xff,0xff,0xff,0x13,0x11,
- 0xf1,0xff,0xff,0xff,0xff,0xff,0x13,0x11,0xfc,0xff,0xff,0xff,0xff,0xff,0x47,
- 0x44,0xfc,0xff,0xff,0xff,0xff,0xff,0x47,0x44,0x11,0x11,0x11,0x11,0x11,0x11,
- 0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x10,0x11,0x44,0x44,0xc4,0x44,0x44,
- 0xc4,0x44,0x44,0x44,0x4e,0xc4,0x44,0x4e,0xc4,0x44,0x44,0x11,0x1f,0xd1,0x11,
- 0x1f,0xd1,0x11,0x11,0x91,0x31,0xd1,0x91,0x31,0xd1,0x11,0x11,0xc4,0x64,0xcc,
- 0xcc,0x64,0xcc,0x44,0x44,0x64,0xc4,0xcc,0x6c,0xc4,0xcc,0x44,0x44,0xf1,0xff,
- 0xd1,0xf1,0xff,0xd1,0x11,0x11,0xf9,0xff,0xd3,0xf9,0xff,0xd3,0x11,0x11,0x4c,
- 0x44,0xc6,0x4c,0x44,0xc6,0x44,0x44,0x4c,0x44,0xc6,0x4c,0x44,0xc6,0x44,0x44,
- 0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,
- 0x11,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,
- 0x44,0x44};
diff --git a/samples/layout/aiai.ico b/samples/layout/aiai.ico
deleted file mode 100644
index a3db6563cc..0000000000
Binary files a/samples/layout/aiai.ico and /dev/null differ
diff --git a/samples/layout/aiai.xbm b/samples/layout/aiai.xbm
deleted file mode 100644
index 1a6f0a31b1..0000000000
--- a/samples/layout/aiai.xbm
+++ /dev/null
@@ -1,38 +0,0 @@
-#define aiai_width 64
-#define aiai_height 64
-static char aiai_bits[] = {
- 0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,
- 0x11,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,
- 0x44,0x44,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,
- 0x11,0x11,0x11,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,
- 0x44,0x44,0x44,0x44,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,
- 0x11,0x11,0x11,0x11,0x11,0x44,0x44,0x44,0x42,0x44,0x44,0x44,0x44,0x44,0x44,
- 0x44,0x47,0x44,0x44,0x44,0x44,0x11,0x11,0x11,0x17,0x11,0x11,0x11,0x11,0x11,
- 0x11,0x91,0x1f,0x11,0x11,0x11,0x11,0x44,0x44,0xc4,0x4f,0x44,0x44,0x44,0x44,
- 0x44,0x44,0xc4,0x5f,0x44,0xf4,0x45,0x44,0x11,0x11,0xf1,0x1f,0x11,0xf9,0x13,
- 0x11,0x11,0x11,0xf1,0x3f,0x11,0xfd,0x13,0x11,0x44,0x44,0xf4,0x7f,0x44,0xfc,
- 0x47,0x44,0x44,0x44,0xf4,0x7f,0x44,0xfc,0x47,0x44,0x11,0x11,0xf9,0x7f,0x11,
- 0xf9,0x13,0x11,0x11,0x11,0xfd,0xff,0x11,0xf1,0x11,0x11,0x44,0x44,0xfc,0xff,
- 0x44,0x44,0x44,0x44,0x44,0x44,0xfe,0xff,0x45,0x44,0x44,0x44,0x11,0x11,0xff,
- 0xff,0x11,0xfd,0x13,0x11,0x11,0x11,0xff,0xff,0x13,0xfd,0x13,0x11,0x44,0xc4,
- 0xff,0xff,0x07,0xfc,0x43,0x44,0x44,0xff,0xff,0xf9,0xff,0xfd,0xfb,0xff,0x11,
- 0xc0,0xff,0x00,0x00,0xfc,0x03,0x00,0x11,0xc0,0x7f,0x00,0x00,0xfc,0x03,0x00,
- 0x04,0xe0,0x7f,0x00,0x00,0xfc,0x03,0x00,0xf4,0xf7,0xbf,0xff,0xff,0xfd,0xfb,
- 0x7f,0x01,0xf0,0x1f,0x00,0x00,0xfc,0x03,0x00,0x01,0xf8,0x1f,0x00,0x00,0xfc,
- 0x03,0x00,0x00,0xfc,0x0f,0x00,0x00,0xfc,0x03,0x40,0xfe,0xfd,0xef,0xff,0xff,
- 0xfd,0xfb,0x4f,0x00,0xfe,0x07,0x00,0x00,0xfc,0x03,0x10,0x00,0xfe,0x03,0x00,
- 0x00,0xfc,0x03,0x10,0x00,0xff,0x03,0x00,0x00,0xfc,0x03,0x44,0x7f,0xff,0x01,
- 0x00,0x00,0xfc,0xfb,0x44,0x91,0xff,0xff,0xff,0xff,0xff,0x13,0x11,0xd1,0xff,
- 0xff,0xff,0xff,0xff,0x13,0x11,0xe4,0xff,0xff,0xff,0xff,0xff,0x47,0x44,0xe4,
- 0xff,0xff,0xff,0xff,0xff,0x47,0x44,0xf1,0xff,0xff,0xff,0xff,0xff,0x13,0x11,
- 0xf1,0xff,0xff,0xff,0xff,0xff,0x13,0x11,0xfc,0xff,0xff,0xff,0xff,0xff,0x47,
- 0x44,0xfc,0xff,0xff,0xff,0xff,0xff,0x47,0x44,0x11,0x11,0x11,0x11,0x11,0x11,
- 0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x10,0x11,0x44,0x44,0xc4,0x44,0x44,
- 0xc4,0x44,0x44,0x44,0x4e,0xc4,0x44,0x4e,0xc4,0x44,0x44,0x11,0x1f,0xd1,0x11,
- 0x1f,0xd1,0x11,0x11,0x91,0x31,0xd1,0x91,0x31,0xd1,0x11,0x11,0xc4,0x64,0xcc,
- 0xcc,0x64,0xcc,0x44,0x44,0x64,0xc4,0xcc,0x6c,0xc4,0xcc,0x44,0x44,0xf1,0xff,
- 0xd1,0xf1,0xff,0xd1,0x11,0x11,0xf9,0xff,0xd3,0xf9,0xff,0xd3,0x11,0x11,0x4c,
- 0x44,0xc6,0x4c,0x44,0xc6,0x44,0x44,0x4c,0x44,0xc6,0x4c,0x44,0xc6,0x44,0x44,
- 0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,
- 0x11,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,
- 0x44,0x44};
diff --git a/samples/layout/layout.cpp b/samples/layout/layout.cpp
index 1e660df2ac..6aedb6923f 100644
--- a/samples/layout/layout.cpp
+++ b/samples/layout/layout.cpp
@@ -33,10 +33,6 @@ wxMenuBar *menu_bar = NULL;
 
 IMPLEMENT_APP(MyApp)
 
-#ifdef __X__
-#include "aiai.xbm"
-#endif
-
 MyApp::MyApp()
 {
 }
@@ -51,14 +47,6 @@ bool MyApp::OnInit(void)
   // Give it a status line
   frame->CreateStatusBar(2);
 
-  // Load icon and bitmap
-#ifdef __WXMSW__
-  frame->SetIcon(wxIcon("aiai_icn"));
-#endif
-#ifdef __X__
-  frame->SetIcon(wxIcon(aiai_bits, aiai_width, aiai_height));
-#endif
-
   // Make a menubar
   wxMenu *file_menu = new wxMenu;
 
diff --git a/samples/layout/layout.rc b/samples/layout/layout.rc
index ac6e44cd4f..b86c4e2265 100644
--- a/samples/layout/layout.rc
+++ b/samples/layout/layout.rc
@@ -1,3 +1 @@
-aiai_icn ICON "aiai.ico"
-
 #include "wx/msw/wx.rc"
diff --git a/samples/listctrl/aiai.ico b/samples/listctrl/aiai.ico
deleted file mode 100644
index a3db6563cc..0000000000
Binary files a/samples/listctrl/aiai.ico and /dev/null differ
diff --git a/samples/listctrl/makefile.bcc b/samples/listctrl/makefile.bcc
deleted file mode 100644
index b68a9b6d21..0000000000
--- a/samples/listctrl/makefile.bcc
+++ /dev/null
@@ -1,73 +0,0 @@
-#
-# File:		makefile.bcc
-# Author:	Julian Smart
-# Created:	1993
-# Updated:	
-# Copyright:	(c) 1993, AIAI, University of Edinburgh
-#
-# "%W% %G%"
-#
-# Makefile : Builds minimal example (DOS).
-
-!if "$(BCCDIR)" == ""
-!error You must define the BCCDIR variable in autoexec.bat, e.g. BCCDIR=d:\bc4
-!endif
-
-!if "$(WXWIN)" == ""
-!error You must define the WXWIN variable in autoexec.bat, e.g. WXWIN=c:\wx
-!endif
-
-WXDIR = $(WXWIN)
-!include $(WXDIR)\src\makebcc.env
-
-THISDIR = $(WXDIR)\samples\minimal
-WXLIB = $(WXDIR)\lib\wx.lib
-LIBS=$(WXLIB) mathwl cwl import
-INC=-I$(WXDIR)\include\base -I$(WXDIR)\include\msw
-CFG=$(WXDIR)\src\wxwin.cfg
-
-!ifndef FINAL
-FINAL=0
-!endif
-
-!if "$(FINAL)" == "0"
-LINKFLAGS=/v/Vt /Twe /L$(WXDIR)\lib;$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS= -v
-!else
-LINKFLAGS=/Twe /L$(WXDIR)\lib;$(BCCDIR)\lib
-OPT = -O2
-DEBUG_FLAGS=
-!endif
-CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
-
-OBJECTS = minimal.obj
-
-minimal:    minimal.exe
-
-all:    minimal.exe
-
-minimal.exe:    $(WXLIB) minimal.obj minimal.def minimal.res
-        tlink $(LINKFLAGS) @&&!
-c0wl.obj minimal.obj
-minimal
-nul
-$(LIBS)
-minimal.def
-!
-        rc -31 -K minimal.res
-
-.$(SRCSUFF).obj:
-	bcc $(CPPFLAGS) -c {$< }
-
-minimal.obj:      minimal.$(SRCSUFF)
-
-minimal.res :      minimal.rc $(WXDIR)\include\msw\wx.rc
-    rc -r /i$(BCCDIR)\include /i$(WXDIR)\include\msw /i$(WXDIR)\contrib\fafa minimal
-
-clean:
-        -erase *.obj
-        -erase *.exe
-        -erase *.res
-        -erase *.map
-        -erase *.rws
diff --git a/samples/listctrl/makefile.sc b/samples/listctrl/makefile.sc
deleted file mode 100644
index 8709d2ca0f..0000000000
--- a/samples/listctrl/makefile.sc
+++ /dev/null
@@ -1,35 +0,0 @@
-# Symantec C++ makefile for minimal example
-# NOTE that peripheral libraries are now dealt in main wxWindows makefile.
-
-WXDIR = $(WXWIN)
-!include $(WXDIR)\src\makesc.env
-
-WXLIB = $(WXDIR)\lib\wx.lib
-INCDIR = $(WXDIR)\include
-MSWINC = $(INCDIR)\msw
-BASEINC = $(INCDIR)\base
-
-CC=sc
-RC=rc
-CFLAGS = -o -ml -W -Dwx_msw
-LDFLAGS = -ml -W
-
-INCLUDE=$(BASEINC);$(MSWINC)
-
-LIBS=$(WXLIB) libw.lib commdlg.lib shell.lib
-
-.$(SRCSUFF).obj:
-	*$(CC) -c $(CFLAGS) -I$(INCLUDE) $<
-
-.rc.res:
-	*$(RC) -r -I$(INCLUDE) $<
-
-minimal.exe: minimal.obj minimal.def minimal.res
-	*$(CC) $(LDFLAGS) -o$@ $** $(LIBS)
-
-clean:
-        -del *.obj
-	-del *.exe
-	-del *.res
-	-del *.map
-	-del *.rws
diff --git a/samples/listctrl/makefile.unx b/samples/listctrl/makefile.unx
deleted file mode 100644
index 9685d06789..0000000000
--- a/samples/listctrl/makefile.unx
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# File:		makefile.unx
-# Author:	Julian Smart
-# Created:	1993
-# Updated:	
-# Copyright:	(c) 1993, AIAI, University of Edinburgh
-#
-# "%W% %G%"
-#
-# Makefile for minimal example (UNIX).
-
-WXDIR = ../..
-
-# All common UNIX compiler flags and options are now in
-# this central makefile.
-include $(WXDIR)/src/make.env
-
-OBJECTS = $(OBJDIR)/minimal.$(OBJSUFF)
-
-.SUFFIXES:
-
-all:    $(OBJDIR) minimal$(GUISUFFIX)
-
-wx:
-
-
-motif:
-	$(MAKE) -f makefile.unx GUISUFFIX=_motif GUI=-Dwx_motif GUISUFFIX=_motif OPT='$(OPT)' LDLIBS='$(MOTIFLDLIBS)' WXLIB=$(WXDIR)/lib/libwx_motif.a  OPTIONS='$(OPTIONS)' DEBUG='$(DEBUG)' WARN='$(WARN)' XLIB='$(XLIB)' XINCLUDE='$(XINCLUDE)' XVIEW_LINK=
-
-xview:
-	cd $(WXDIR)/src/x; $(MAKE) -f makefile.unx xview
-	$(MAKE) -f makefile.unx GUI=-Dwx_xview GUISUFFIX=_ol CC=$(CC) OPTIONS='$(OPTIONS)' DEBUG='$(DEBUG)' WARN='$(WARN)' XLIB='$(XLIB)' XINCLUDE='$(XINCLUDE)'
-
-hp:
-	cd $(WXDIR)/src/x; $(MAKE) -f makefile.unx hp
-	$(MAKE) -f makefile.unx GUI=-Dwx_motif GUISUFFIX=_hp CC=CC DEBUG='$(DEBUG)' WARN='-w' \
-         XINCLUDE='$(HPXINCLUDE)' XLIB='$(HPXLIB)' XVIEW_LINK='' LDLIBS='$(HPLDLIBS)'
-
-$(OBJDIR):
-	mkdir $(OBJDIR)
-
-minimal$(GUISUFFIX):	$(OBJDIR)/minimal.$(OBJSUFF) $(WXLIB)
-	$(CC) $(LDFLAGS) -o minimal$(GUISUFFIX) $(OBJDIR)/minimal.$(OBJSUFF) $(XVIEW_LINK) $(LDLIBS)
-
-$(OBJDIR)/minimal.$(OBJSUFF):	minimal.$(SRCSUFF)
-	$(CC) -c $(CPPFLAGS) -o $@ minimal.$(SRCSUFF)
-
-clean_motif:
-	$(MAKE) -f makefile.unx GUISUFFIX=_motif cleanany
-
-clean_ol:
-	$(MAKE) -f makefile.unx GUISUFFIX=_ol cleanany
-
-clean_hp:
-	$(MAKE) -f makefile.unx GUISUFFIX=_hp cleanany
-
-cleanany:
-	rm -f $(OBJECTS) minimal$(GUISUFFIX) core
diff --git a/samples/listctrl/makefile.vms b/samples/listctrl/makefile.vms
deleted file mode 100644
index 9b76b144f3..0000000000
--- a/samples/listctrl/makefile.vms
+++ /dev/null
@@ -1,38 +0,0 @@
-#************************************************************************
-# Makefile for MINIMAL under VMS
-# by Stefan Hammes
-# (incomplete) update history:
-# 11.04.95
-#************************************************************************
-
-#************************************************************************
-# Definition section
-# (cave: definitions and includes must begin with ',')
-#************************************************************************
-
-APPOPTS = 
-APPDEFS = 
-APPINCS = 
-
-#************************************************************************
-# Module section
-#************************************************************************
-
-# Name of main module
-MAIN = minimal
-
-# Object modules of the application.
-OBJS = minimal.obj
-OBJLIST =minimal.obj
-
-.include [--.src]makevms.env
-
-# main dependency
-$(MAIN).exe : $(OBJS)
-    $(LINK) $(LINKFLAGS) /exec=$(MAIN).exe $(OBJLIST),$(WXLIB)/lib,$(OPTSFILE)/option
-    - purge *.exe
-
-#************************************************************************
-# Header file depedencies following
-#************************************************************************
-
diff --git a/samples/listctrl/makefile.wat b/samples/listctrl/makefile.wat
deleted file mode 100644
index 21219d7a0e..0000000000
--- a/samples/listctrl/makefile.wat
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Makefile for WATCOM
-#
-# Created by D.Chubraev, chubraev@iem.ee.ethz.ch
-# 8 Nov 1994
-#
-
-WXDIR = ..\.. 
-
-!include $(WXDIR)\src\makewat.env
-
-WXLIB = $(WXDIR)\lib
-NAME = minimal
-LNK = $(name).lnk
-OBJS = $(name).obj 
-
-all: $(name).exe
-
-$(name).exe : $(OBJS) $(name).res $(LNK) $(WXLIB)\wx$(LEVEL).lib
-    wlink @$(LNK)
-    $(BINDCOMMAND) $(name).res
-
-$(name).res :      $(name).rc $(WXDIR)\include\msw\wx.rc
-     $(RC) $(RESFLAGS1) $(name).rc
-
-$(LNK) : makefile.wat
-    %create $(LNK)
-    @%append $(LNK) debug all
-    @%append $(LNK) system $(LINKOPTION)
-    @%append $(LNK) $(MINDATA)
-    @%append $(LNK) $(MAXDATA)
-    @%append $(LNK) $(STACK)
-    @%append $(LNK) name $(name)
-    @%append $(LNK) file $(WXLIB)\wx$(LEVEL).lib
-    @for %i in ($(EXTRALIBS)) do @%append $(LNK) file %i
-    @for %i in ($(OBJS)) do @%append $(LNK) file %i
-
-thing: .SYMBOLIC
-    echo $(WATLIBDIR)
-
-clean:   .SYMBOLIC
-    -erase *.obj *.bak *.err *.pch *.lib *.lnk *.res *.exe
-
diff --git a/samples/mdi/aiai.ico b/samples/mdi/aiai.ico
deleted file mode 100644
index a3db6563cc..0000000000
Binary files a/samples/mdi/aiai.ico and /dev/null differ
diff --git a/samples/mdi/aiai.xbm b/samples/mdi/aiai.xbm
deleted file mode 100644
index 1a6f0a31b1..0000000000
--- a/samples/mdi/aiai.xbm
+++ /dev/null
@@ -1,38 +0,0 @@
-#define aiai_width 64
-#define aiai_height 64
-static char aiai_bits[] = {
- 0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,
- 0x11,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,
- 0x44,0x44,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,
- 0x11,0x11,0x11,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,
- 0x44,0x44,0x44,0x44,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,
- 0x11,0x11,0x11,0x11,0x11,0x44,0x44,0x44,0x42,0x44,0x44,0x44,0x44,0x44,0x44,
- 0x44,0x47,0x44,0x44,0x44,0x44,0x11,0x11,0x11,0x17,0x11,0x11,0x11,0x11,0x11,
- 0x11,0x91,0x1f,0x11,0x11,0x11,0x11,0x44,0x44,0xc4,0x4f,0x44,0x44,0x44,0x44,
- 0x44,0x44,0xc4,0x5f,0x44,0xf4,0x45,0x44,0x11,0x11,0xf1,0x1f,0x11,0xf9,0x13,
- 0x11,0x11,0x11,0xf1,0x3f,0x11,0xfd,0x13,0x11,0x44,0x44,0xf4,0x7f,0x44,0xfc,
- 0x47,0x44,0x44,0x44,0xf4,0x7f,0x44,0xfc,0x47,0x44,0x11,0x11,0xf9,0x7f,0x11,
- 0xf9,0x13,0x11,0x11,0x11,0xfd,0xff,0x11,0xf1,0x11,0x11,0x44,0x44,0xfc,0xff,
- 0x44,0x44,0x44,0x44,0x44,0x44,0xfe,0xff,0x45,0x44,0x44,0x44,0x11,0x11,0xff,
- 0xff,0x11,0xfd,0x13,0x11,0x11,0x11,0xff,0xff,0x13,0xfd,0x13,0x11,0x44,0xc4,
- 0xff,0xff,0x07,0xfc,0x43,0x44,0x44,0xff,0xff,0xf9,0xff,0xfd,0xfb,0xff,0x11,
- 0xc0,0xff,0x00,0x00,0xfc,0x03,0x00,0x11,0xc0,0x7f,0x00,0x00,0xfc,0x03,0x00,
- 0x04,0xe0,0x7f,0x00,0x00,0xfc,0x03,0x00,0xf4,0xf7,0xbf,0xff,0xff,0xfd,0xfb,
- 0x7f,0x01,0xf0,0x1f,0x00,0x00,0xfc,0x03,0x00,0x01,0xf8,0x1f,0x00,0x00,0xfc,
- 0x03,0x00,0x00,0xfc,0x0f,0x00,0x00,0xfc,0x03,0x40,0xfe,0xfd,0xef,0xff,0xff,
- 0xfd,0xfb,0x4f,0x00,0xfe,0x07,0x00,0x00,0xfc,0x03,0x10,0x00,0xfe,0x03,0x00,
- 0x00,0xfc,0x03,0x10,0x00,0xff,0x03,0x00,0x00,0xfc,0x03,0x44,0x7f,0xff,0x01,
- 0x00,0x00,0xfc,0xfb,0x44,0x91,0xff,0xff,0xff,0xff,0xff,0x13,0x11,0xd1,0xff,
- 0xff,0xff,0xff,0xff,0x13,0x11,0xe4,0xff,0xff,0xff,0xff,0xff,0x47,0x44,0xe4,
- 0xff,0xff,0xff,0xff,0xff,0x47,0x44,0xf1,0xff,0xff,0xff,0xff,0xff,0x13,0x11,
- 0xf1,0xff,0xff,0xff,0xff,0xff,0x13,0x11,0xfc,0xff,0xff,0xff,0xff,0xff,0x47,
- 0x44,0xfc,0xff,0xff,0xff,0xff,0xff,0x47,0x44,0x11,0x11,0x11,0x11,0x11,0x11,
- 0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x10,0x11,0x44,0x44,0xc4,0x44,0x44,
- 0xc4,0x44,0x44,0x44,0x4e,0xc4,0x44,0x4e,0xc4,0x44,0x44,0x11,0x1f,0xd1,0x11,
- 0x1f,0xd1,0x11,0x11,0x91,0x31,0xd1,0x91,0x31,0xd1,0x11,0x11,0xc4,0x64,0xcc,
- 0xcc,0x64,0xcc,0x44,0x44,0x64,0xc4,0xcc,0x6c,0xc4,0xcc,0x44,0x44,0xf1,0xff,
- 0xd1,0xf1,0xff,0xd1,0x11,0x11,0xf9,0xff,0xd3,0xf9,0xff,0xd3,0x11,0x11,0x4c,
- 0x44,0xc6,0x4c,0x44,0xc6,0x44,0x44,0x4c,0x44,0xc6,0x4c,0x44,0xc6,0x44,0x44,
- 0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,
- 0x11,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,
- 0x44,0x44};
diff --git a/samples/mdi/bitmaps/aiai.xbm b/samples/mdi/bitmaps/aiai.xbm
deleted file mode 100644
index 1a6f0a31b1..0000000000
--- a/samples/mdi/bitmaps/aiai.xbm
+++ /dev/null
@@ -1,38 +0,0 @@
-#define aiai_width 64
-#define aiai_height 64
-static char aiai_bits[] = {
- 0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,
- 0x11,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,
- 0x44,0x44,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,
- 0x11,0x11,0x11,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,
- 0x44,0x44,0x44,0x44,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,
- 0x11,0x11,0x11,0x11,0x11,0x44,0x44,0x44,0x42,0x44,0x44,0x44,0x44,0x44,0x44,
- 0x44,0x47,0x44,0x44,0x44,0x44,0x11,0x11,0x11,0x17,0x11,0x11,0x11,0x11,0x11,
- 0x11,0x91,0x1f,0x11,0x11,0x11,0x11,0x44,0x44,0xc4,0x4f,0x44,0x44,0x44,0x44,
- 0x44,0x44,0xc4,0x5f,0x44,0xf4,0x45,0x44,0x11,0x11,0xf1,0x1f,0x11,0xf9,0x13,
- 0x11,0x11,0x11,0xf1,0x3f,0x11,0xfd,0x13,0x11,0x44,0x44,0xf4,0x7f,0x44,0xfc,
- 0x47,0x44,0x44,0x44,0xf4,0x7f,0x44,0xfc,0x47,0x44,0x11,0x11,0xf9,0x7f,0x11,
- 0xf9,0x13,0x11,0x11,0x11,0xfd,0xff,0x11,0xf1,0x11,0x11,0x44,0x44,0xfc,0xff,
- 0x44,0x44,0x44,0x44,0x44,0x44,0xfe,0xff,0x45,0x44,0x44,0x44,0x11,0x11,0xff,
- 0xff,0x11,0xfd,0x13,0x11,0x11,0x11,0xff,0xff,0x13,0xfd,0x13,0x11,0x44,0xc4,
- 0xff,0xff,0x07,0xfc,0x43,0x44,0x44,0xff,0xff,0xf9,0xff,0xfd,0xfb,0xff,0x11,
- 0xc0,0xff,0x00,0x00,0xfc,0x03,0x00,0x11,0xc0,0x7f,0x00,0x00,0xfc,0x03,0x00,
- 0x04,0xe0,0x7f,0x00,0x00,0xfc,0x03,0x00,0xf4,0xf7,0xbf,0xff,0xff,0xfd,0xfb,
- 0x7f,0x01,0xf0,0x1f,0x00,0x00,0xfc,0x03,0x00,0x01,0xf8,0x1f,0x00,0x00,0xfc,
- 0x03,0x00,0x00,0xfc,0x0f,0x00,0x00,0xfc,0x03,0x40,0xfe,0xfd,0xef,0xff,0xff,
- 0xfd,0xfb,0x4f,0x00,0xfe,0x07,0x00,0x00,0xfc,0x03,0x10,0x00,0xfe,0x03,0x00,
- 0x00,0xfc,0x03,0x10,0x00,0xff,0x03,0x00,0x00,0xfc,0x03,0x44,0x7f,0xff,0x01,
- 0x00,0x00,0xfc,0xfb,0x44,0x91,0xff,0xff,0xff,0xff,0xff,0x13,0x11,0xd1,0xff,
- 0xff,0xff,0xff,0xff,0x13,0x11,0xe4,0xff,0xff,0xff,0xff,0xff,0x47,0x44,0xe4,
- 0xff,0xff,0xff,0xff,0xff,0x47,0x44,0xf1,0xff,0xff,0xff,0xff,0xff,0x13,0x11,
- 0xf1,0xff,0xff,0xff,0xff,0xff,0x13,0x11,0xfc,0xff,0xff,0xff,0xff,0xff,0x47,
- 0x44,0xfc,0xff,0xff,0xff,0xff,0xff,0x47,0x44,0x11,0x11,0x11,0x11,0x11,0x11,
- 0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x10,0x11,0x44,0x44,0xc4,0x44,0x44,
- 0xc4,0x44,0x44,0x44,0x4e,0xc4,0x44,0x4e,0xc4,0x44,0x44,0x11,0x1f,0xd1,0x11,
- 0x1f,0xd1,0x11,0x11,0x91,0x31,0xd1,0x91,0x31,0xd1,0x11,0x11,0xc4,0x64,0xcc,
- 0xcc,0x64,0xcc,0x44,0x44,0x64,0xc4,0xcc,0x6c,0xc4,0xcc,0x44,0x44,0xf1,0xff,
- 0xd1,0xf1,0xff,0xd1,0x11,0x11,0xf9,0xff,0xd3,0xf9,0xff,0xd3,0x11,0x11,0x4c,
- 0x44,0xc6,0x4c,0x44,0xc6,0x44,0x44,0x4c,0x44,0xc6,0x4c,0x44,0xc6,0x44,0x44,
- 0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,
- 0x11,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,
- 0x44,0x44};
diff --git a/samples/minimal/aiai.ico b/samples/minimal/aiai.ico
deleted file mode 100644
index a3db6563cc..0000000000
Binary files a/samples/minimal/aiai.ico and /dev/null differ
diff --git a/samples/minimal/aiai.xbm b/samples/minimal/aiai.xbm
deleted file mode 100644
index 1a6f0a31b1..0000000000
--- a/samples/minimal/aiai.xbm
+++ /dev/null
@@ -1,38 +0,0 @@
-#define aiai_width 64
-#define aiai_height 64
-static char aiai_bits[] = {
- 0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,
- 0x11,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,
- 0x44,0x44,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,
- 0x11,0x11,0x11,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,
- 0x44,0x44,0x44,0x44,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,
- 0x11,0x11,0x11,0x11,0x11,0x44,0x44,0x44,0x42,0x44,0x44,0x44,0x44,0x44,0x44,
- 0x44,0x47,0x44,0x44,0x44,0x44,0x11,0x11,0x11,0x17,0x11,0x11,0x11,0x11,0x11,
- 0x11,0x91,0x1f,0x11,0x11,0x11,0x11,0x44,0x44,0xc4,0x4f,0x44,0x44,0x44,0x44,
- 0x44,0x44,0xc4,0x5f,0x44,0xf4,0x45,0x44,0x11,0x11,0xf1,0x1f,0x11,0xf9,0x13,
- 0x11,0x11,0x11,0xf1,0x3f,0x11,0xfd,0x13,0x11,0x44,0x44,0xf4,0x7f,0x44,0xfc,
- 0x47,0x44,0x44,0x44,0xf4,0x7f,0x44,0xfc,0x47,0x44,0x11,0x11,0xf9,0x7f,0x11,
- 0xf9,0x13,0x11,0x11,0x11,0xfd,0xff,0x11,0xf1,0x11,0x11,0x44,0x44,0xfc,0xff,
- 0x44,0x44,0x44,0x44,0x44,0x44,0xfe,0xff,0x45,0x44,0x44,0x44,0x11,0x11,0xff,
- 0xff,0x11,0xfd,0x13,0x11,0x11,0x11,0xff,0xff,0x13,0xfd,0x13,0x11,0x44,0xc4,
- 0xff,0xff,0x07,0xfc,0x43,0x44,0x44,0xff,0xff,0xf9,0xff,0xfd,0xfb,0xff,0x11,
- 0xc0,0xff,0x00,0x00,0xfc,0x03,0x00,0x11,0xc0,0x7f,0x00,0x00,0xfc,0x03,0x00,
- 0x04,0xe0,0x7f,0x00,0x00,0xfc,0x03,0x00,0xf4,0xf7,0xbf,0xff,0xff,0xfd,0xfb,
- 0x7f,0x01,0xf0,0x1f,0x00,0x00,0xfc,0x03,0x00,0x01,0xf8,0x1f,0x00,0x00,0xfc,
- 0x03,0x00,0x00,0xfc,0x0f,0x00,0x00,0xfc,0x03,0x40,0xfe,0xfd,0xef,0xff,0xff,
- 0xfd,0xfb,0x4f,0x00,0xfe,0x07,0x00,0x00,0xfc,0x03,0x10,0x00,0xfe,0x03,0x00,
- 0x00,0xfc,0x03,0x10,0x00,0xff,0x03,0x00,0x00,0xfc,0x03,0x44,0x7f,0xff,0x01,
- 0x00,0x00,0xfc,0xfb,0x44,0x91,0xff,0xff,0xff,0xff,0xff,0x13,0x11,0xd1,0xff,
- 0xff,0xff,0xff,0xff,0x13,0x11,0xe4,0xff,0xff,0xff,0xff,0xff,0x47,0x44,0xe4,
- 0xff,0xff,0xff,0xff,0xff,0x47,0x44,0xf1,0xff,0xff,0xff,0xff,0xff,0x13,0x11,
- 0xf1,0xff,0xff,0xff,0xff,0xff,0x13,0x11,0xfc,0xff,0xff,0xff,0xff,0xff,0x47,
- 0x44,0xfc,0xff,0xff,0xff,0xff,0xff,0x47,0x44,0x11,0x11,0x11,0x11,0x11,0x11,
- 0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x10,0x11,0x44,0x44,0xc4,0x44,0x44,
- 0xc4,0x44,0x44,0x44,0x4e,0xc4,0x44,0x4e,0xc4,0x44,0x44,0x11,0x1f,0xd1,0x11,
- 0x1f,0xd1,0x11,0x11,0x91,0x31,0xd1,0x91,0x31,0xd1,0x11,0x11,0xc4,0x64,0xcc,
- 0xcc,0x64,0xcc,0x44,0x44,0x64,0xc4,0xcc,0x6c,0xc4,0xcc,0x44,0x44,0xf1,0xff,
- 0xd1,0xf1,0xff,0xd1,0x11,0x11,0xf9,0xff,0xd3,0xf9,0xff,0xd3,0x11,0x11,0x4c,
- 0x44,0xc6,0x4c,0x44,0xc6,0x44,0x44,0x4c,0x44,0xc6,0x4c,0x44,0xc6,0x44,0x44,
- 0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,
- 0x11,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,
- 0x44,0x44};
diff --git a/samples/minimal/makefile.bcc b/samples/minimal/makefile.bcc
deleted file mode 100644
index b68a9b6d21..0000000000
--- a/samples/minimal/makefile.bcc
+++ /dev/null
@@ -1,73 +0,0 @@
-#
-# File:		makefile.bcc
-# Author:	Julian Smart
-# Created:	1993
-# Updated:	
-# Copyright:	(c) 1993, AIAI, University of Edinburgh
-#
-# "%W% %G%"
-#
-# Makefile : Builds minimal example (DOS).
-
-!if "$(BCCDIR)" == ""
-!error You must define the BCCDIR variable in autoexec.bat, e.g. BCCDIR=d:\bc4
-!endif
-
-!if "$(WXWIN)" == ""
-!error You must define the WXWIN variable in autoexec.bat, e.g. WXWIN=c:\wx
-!endif
-
-WXDIR = $(WXWIN)
-!include $(WXDIR)\src\makebcc.env
-
-THISDIR = $(WXDIR)\samples\minimal
-WXLIB = $(WXDIR)\lib\wx.lib
-LIBS=$(WXLIB) mathwl cwl import
-INC=-I$(WXDIR)\include\base -I$(WXDIR)\include\msw
-CFG=$(WXDIR)\src\wxwin.cfg
-
-!ifndef FINAL
-FINAL=0
-!endif
-
-!if "$(FINAL)" == "0"
-LINKFLAGS=/v/Vt /Twe /L$(WXDIR)\lib;$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS= -v
-!else
-LINKFLAGS=/Twe /L$(WXDIR)\lib;$(BCCDIR)\lib
-OPT = -O2
-DEBUG_FLAGS=
-!endif
-CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
-
-OBJECTS = minimal.obj
-
-minimal:    minimal.exe
-
-all:    minimal.exe
-
-minimal.exe:    $(WXLIB) minimal.obj minimal.def minimal.res
-        tlink $(LINKFLAGS) @&&!
-c0wl.obj minimal.obj
-minimal
-nul
-$(LIBS)
-minimal.def
-!
-        rc -31 -K minimal.res
-
-.$(SRCSUFF).obj:
-	bcc $(CPPFLAGS) -c {$< }
-
-minimal.obj:      minimal.$(SRCSUFF)
-
-minimal.res :      minimal.rc $(WXDIR)\include\msw\wx.rc
-    rc -r /i$(BCCDIR)\include /i$(WXDIR)\include\msw /i$(WXDIR)\contrib\fafa minimal
-
-clean:
-        -erase *.obj
-        -erase *.exe
-        -erase *.res
-        -erase *.map
-        -erase *.rws
diff --git a/samples/minimal/makefile.sc b/samples/minimal/makefile.sc
deleted file mode 100644
index 8709d2ca0f..0000000000
--- a/samples/minimal/makefile.sc
+++ /dev/null
@@ -1,35 +0,0 @@
-# Symantec C++ makefile for minimal example
-# NOTE that peripheral libraries are now dealt in main wxWindows makefile.
-
-WXDIR = $(WXWIN)
-!include $(WXDIR)\src\makesc.env
-
-WXLIB = $(WXDIR)\lib\wx.lib
-INCDIR = $(WXDIR)\include
-MSWINC = $(INCDIR)\msw
-BASEINC = $(INCDIR)\base
-
-CC=sc
-RC=rc
-CFLAGS = -o -ml -W -Dwx_msw
-LDFLAGS = -ml -W
-
-INCLUDE=$(BASEINC);$(MSWINC)
-
-LIBS=$(WXLIB) libw.lib commdlg.lib shell.lib
-
-.$(SRCSUFF).obj:
-	*$(CC) -c $(CFLAGS) -I$(INCLUDE) $<
-
-.rc.res:
-	*$(RC) -r -I$(INCLUDE) $<
-
-minimal.exe: minimal.obj minimal.def minimal.res
-	*$(CC) $(LDFLAGS) -o$@ $** $(LIBS)
-
-clean:
-        -del *.obj
-	-del *.exe
-	-del *.res
-	-del *.map
-	-del *.rws
diff --git a/samples/minimal/makefile.unx b/samples/minimal/makefile.unx
deleted file mode 100644
index 9685d06789..0000000000
--- a/samples/minimal/makefile.unx
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# File:		makefile.unx
-# Author:	Julian Smart
-# Created:	1993
-# Updated:	
-# Copyright:	(c) 1993, AIAI, University of Edinburgh
-#
-# "%W% %G%"
-#
-# Makefile for minimal example (UNIX).
-
-WXDIR = ../..
-
-# All common UNIX compiler flags and options are now in
-# this central makefile.
-include $(WXDIR)/src/make.env
-
-OBJECTS = $(OBJDIR)/minimal.$(OBJSUFF)
-
-.SUFFIXES:
-
-all:    $(OBJDIR) minimal$(GUISUFFIX)
-
-wx:
-
-
-motif:
-	$(MAKE) -f makefile.unx GUISUFFIX=_motif GUI=-Dwx_motif GUISUFFIX=_motif OPT='$(OPT)' LDLIBS='$(MOTIFLDLIBS)' WXLIB=$(WXDIR)/lib/libwx_motif.a  OPTIONS='$(OPTIONS)' DEBUG='$(DEBUG)' WARN='$(WARN)' XLIB='$(XLIB)' XINCLUDE='$(XINCLUDE)' XVIEW_LINK=
-
-xview:
-	cd $(WXDIR)/src/x; $(MAKE) -f makefile.unx xview
-	$(MAKE) -f makefile.unx GUI=-Dwx_xview GUISUFFIX=_ol CC=$(CC) OPTIONS='$(OPTIONS)' DEBUG='$(DEBUG)' WARN='$(WARN)' XLIB='$(XLIB)' XINCLUDE='$(XINCLUDE)'
-
-hp:
-	cd $(WXDIR)/src/x; $(MAKE) -f makefile.unx hp
-	$(MAKE) -f makefile.unx GUI=-Dwx_motif GUISUFFIX=_hp CC=CC DEBUG='$(DEBUG)' WARN='-w' \
-         XINCLUDE='$(HPXINCLUDE)' XLIB='$(HPXLIB)' XVIEW_LINK='' LDLIBS='$(HPLDLIBS)'
-
-$(OBJDIR):
-	mkdir $(OBJDIR)
-
-minimal$(GUISUFFIX):	$(OBJDIR)/minimal.$(OBJSUFF) $(WXLIB)
-	$(CC) $(LDFLAGS) -o minimal$(GUISUFFIX) $(OBJDIR)/minimal.$(OBJSUFF) $(XVIEW_LINK) $(LDLIBS)
-
-$(OBJDIR)/minimal.$(OBJSUFF):	minimal.$(SRCSUFF)
-	$(CC) -c $(CPPFLAGS) -o $@ minimal.$(SRCSUFF)
-
-clean_motif:
-	$(MAKE) -f makefile.unx GUISUFFIX=_motif cleanany
-
-clean_ol:
-	$(MAKE) -f makefile.unx GUISUFFIX=_ol cleanany
-
-clean_hp:
-	$(MAKE) -f makefile.unx GUISUFFIX=_hp cleanany
-
-cleanany:
-	rm -f $(OBJECTS) minimal$(GUISUFFIX) core
diff --git a/samples/minimal/makefile.vms b/samples/minimal/makefile.vms
deleted file mode 100644
index 9b76b144f3..0000000000
--- a/samples/minimal/makefile.vms
+++ /dev/null
@@ -1,38 +0,0 @@
-#************************************************************************
-# Makefile for MINIMAL under VMS
-# by Stefan Hammes
-# (incomplete) update history:
-# 11.04.95
-#************************************************************************
-
-#************************************************************************
-# Definition section
-# (cave: definitions and includes must begin with ',')
-#************************************************************************
-
-APPOPTS = 
-APPDEFS = 
-APPINCS = 
-
-#************************************************************************
-# Module section
-#************************************************************************
-
-# Name of main module
-MAIN = minimal
-
-# Object modules of the application.
-OBJS = minimal.obj
-OBJLIST =minimal.obj
-
-.include [--.src]makevms.env
-
-# main dependency
-$(MAIN).exe : $(OBJS)
-    $(LINK) $(LINKFLAGS) /exec=$(MAIN).exe $(OBJLIST),$(WXLIB)/lib,$(OPTSFILE)/option
-    - purge *.exe
-
-#************************************************************************
-# Header file depedencies following
-#************************************************************************
-
diff --git a/samples/minimal/makefile.wat b/samples/minimal/makefile.wat
deleted file mode 100644
index 21219d7a0e..0000000000
--- a/samples/minimal/makefile.wat
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Makefile for WATCOM
-#
-# Created by D.Chubraev, chubraev@iem.ee.ethz.ch
-# 8 Nov 1994
-#
-
-WXDIR = ..\.. 
-
-!include $(WXDIR)\src\makewat.env
-
-WXLIB = $(WXDIR)\lib
-NAME = minimal
-LNK = $(name).lnk
-OBJS = $(name).obj 
-
-all: $(name).exe
-
-$(name).exe : $(OBJS) $(name).res $(LNK) $(WXLIB)\wx$(LEVEL).lib
-    wlink @$(LNK)
-    $(BINDCOMMAND) $(name).res
-
-$(name).res :      $(name).rc $(WXDIR)\include\msw\wx.rc
-     $(RC) $(RESFLAGS1) $(name).rc
-
-$(LNK) : makefile.wat
-    %create $(LNK)
-    @%append $(LNK) debug all
-    @%append $(LNK) system $(LINKOPTION)
-    @%append $(LNK) $(MINDATA)
-    @%append $(LNK) $(MAXDATA)
-    @%append $(LNK) $(STACK)
-    @%append $(LNK) name $(name)
-    @%append $(LNK) file $(WXLIB)\wx$(LEVEL).lib
-    @for %i in ($(EXTRALIBS)) do @%append $(LNK) file %i
-    @for %i in ($(OBJS)) do @%append $(LNK) file %i
-
-thing: .SYMBOLIC
-    echo $(WATLIBDIR)
-
-clean:   .SYMBOLIC
-    -erase *.obj *.bak *.err *.pch *.lib *.lnk *.res *.exe
-
diff --git a/samples/nativdlg/aiai.ico b/samples/nativdlg/aiai.ico
deleted file mode 100644
index a3db6563cc..0000000000
Binary files a/samples/nativdlg/aiai.ico and /dev/null differ
diff --git a/samples/printing/aiai.ico b/samples/printing/aiai.ico
deleted file mode 100644
index a3db6563cc..0000000000
Binary files a/samples/printing/aiai.ico and /dev/null differ
diff --git a/samples/printing/aiai.xbm b/samples/printing/aiai.xbm
deleted file mode 100644
index 1a6f0a31b1..0000000000
--- a/samples/printing/aiai.xbm
+++ /dev/null
@@ -1,38 +0,0 @@
-#define aiai_width 64
-#define aiai_height 64
-static char aiai_bits[] = {
- 0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,
- 0x11,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,
- 0x44,0x44,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,
- 0x11,0x11,0x11,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,
- 0x44,0x44,0x44,0x44,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,
- 0x11,0x11,0x11,0x11,0x11,0x44,0x44,0x44,0x42,0x44,0x44,0x44,0x44,0x44,0x44,
- 0x44,0x47,0x44,0x44,0x44,0x44,0x11,0x11,0x11,0x17,0x11,0x11,0x11,0x11,0x11,
- 0x11,0x91,0x1f,0x11,0x11,0x11,0x11,0x44,0x44,0xc4,0x4f,0x44,0x44,0x44,0x44,
- 0x44,0x44,0xc4,0x5f,0x44,0xf4,0x45,0x44,0x11,0x11,0xf1,0x1f,0x11,0xf9,0x13,
- 0x11,0x11,0x11,0xf1,0x3f,0x11,0xfd,0x13,0x11,0x44,0x44,0xf4,0x7f,0x44,0xfc,
- 0x47,0x44,0x44,0x44,0xf4,0x7f,0x44,0xfc,0x47,0x44,0x11,0x11,0xf9,0x7f,0x11,
- 0xf9,0x13,0x11,0x11,0x11,0xfd,0xff,0x11,0xf1,0x11,0x11,0x44,0x44,0xfc,0xff,
- 0x44,0x44,0x44,0x44,0x44,0x44,0xfe,0xff,0x45,0x44,0x44,0x44,0x11,0x11,0xff,
- 0xff,0x11,0xfd,0x13,0x11,0x11,0x11,0xff,0xff,0x13,0xfd,0x13,0x11,0x44,0xc4,
- 0xff,0xff,0x07,0xfc,0x43,0x44,0x44,0xff,0xff,0xf9,0xff,0xfd,0xfb,0xff,0x11,
- 0xc0,0xff,0x00,0x00,0xfc,0x03,0x00,0x11,0xc0,0x7f,0x00,0x00,0xfc,0x03,0x00,
- 0x04,0xe0,0x7f,0x00,0x00,0xfc,0x03,0x00,0xf4,0xf7,0xbf,0xff,0xff,0xfd,0xfb,
- 0x7f,0x01,0xf0,0x1f,0x00,0x00,0xfc,0x03,0x00,0x01,0xf8,0x1f,0x00,0x00,0xfc,
- 0x03,0x00,0x00,0xfc,0x0f,0x00,0x00,0xfc,0x03,0x40,0xfe,0xfd,0xef,0xff,0xff,
- 0xfd,0xfb,0x4f,0x00,0xfe,0x07,0x00,0x00,0xfc,0x03,0x10,0x00,0xfe,0x03,0x00,
- 0x00,0xfc,0x03,0x10,0x00,0xff,0x03,0x00,0x00,0xfc,0x03,0x44,0x7f,0xff,0x01,
- 0x00,0x00,0xfc,0xfb,0x44,0x91,0xff,0xff,0xff,0xff,0xff,0x13,0x11,0xd1,0xff,
- 0xff,0xff,0xff,0xff,0x13,0x11,0xe4,0xff,0xff,0xff,0xff,0xff,0x47,0x44,0xe4,
- 0xff,0xff,0xff,0xff,0xff,0x47,0x44,0xf1,0xff,0xff,0xff,0xff,0xff,0x13,0x11,
- 0xf1,0xff,0xff,0xff,0xff,0xff,0x13,0x11,0xfc,0xff,0xff,0xff,0xff,0xff,0x47,
- 0x44,0xfc,0xff,0xff,0xff,0xff,0xff,0x47,0x44,0x11,0x11,0x11,0x11,0x11,0x11,
- 0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x10,0x11,0x44,0x44,0xc4,0x44,0x44,
- 0xc4,0x44,0x44,0x44,0x4e,0xc4,0x44,0x4e,0xc4,0x44,0x44,0x11,0x1f,0xd1,0x11,
- 0x1f,0xd1,0x11,0x11,0x91,0x31,0xd1,0x91,0x31,0xd1,0x11,0x11,0xc4,0x64,0xcc,
- 0xcc,0x64,0xcc,0x44,0x44,0x64,0xc4,0xcc,0x6c,0xc4,0xcc,0x44,0x44,0xf1,0xff,
- 0xd1,0xf1,0xff,0xd1,0x11,0x11,0xf9,0xff,0xd3,0xf9,0xff,0xd3,0x11,0x11,0x4c,
- 0x44,0xc6,0x4c,0x44,0xc6,0x44,0x44,0x4c,0x44,0xc6,0x4c,0x44,0xc6,0x44,0x44,
- 0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,
- 0x11,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,
- 0x44,0x44};
diff --git a/samples/printing/printing.cpp b/samples/printing/printing.cpp
index 3afd248f62..3bb4a19920 100644
--- a/samples/printing/printing.cpp
+++ b/samples/printing/printing.cpp
@@ -82,10 +82,10 @@ bool MyApp::OnInit(void)
 
   // Load icon and bitmap
 #ifdef __WXMSW__
-  frame->SetIcon(wxIcon("aiai_icn"));
+  frame->SetIcon(wxIcon("mondrian"));
 #endif
 #ifdef __X__
-  frame->SetIcon(wxIcon(aiai_bits, aiai_width, aiai_height));
+//  frame->SetIcon(wxIcon(mondrian_bits, mondrian_width, mondrian_height));
 #endif
 
   // Make a menubar
diff --git a/samples/resource/aiai.ico b/samples/resource/aiai.ico
deleted file mode 100644
index a3db6563cc..0000000000
Binary files a/samples/resource/aiai.ico and /dev/null differ
diff --git a/samples/splitter/aiai.xbm b/samples/splitter/aiai.xbm
deleted file mode 100644
index 1a6f0a31b1..0000000000
--- a/samples/splitter/aiai.xbm
+++ /dev/null
@@ -1,38 +0,0 @@
-#define aiai_width 64
-#define aiai_height 64
-static char aiai_bits[] = {
- 0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,
- 0x11,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,
- 0x44,0x44,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,
- 0x11,0x11,0x11,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,
- 0x44,0x44,0x44,0x44,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,
- 0x11,0x11,0x11,0x11,0x11,0x44,0x44,0x44,0x42,0x44,0x44,0x44,0x44,0x44,0x44,
- 0x44,0x47,0x44,0x44,0x44,0x44,0x11,0x11,0x11,0x17,0x11,0x11,0x11,0x11,0x11,
- 0x11,0x91,0x1f,0x11,0x11,0x11,0x11,0x44,0x44,0xc4,0x4f,0x44,0x44,0x44,0x44,
- 0x44,0x44,0xc4,0x5f,0x44,0xf4,0x45,0x44,0x11,0x11,0xf1,0x1f,0x11,0xf9,0x13,
- 0x11,0x11,0x11,0xf1,0x3f,0x11,0xfd,0x13,0x11,0x44,0x44,0xf4,0x7f,0x44,0xfc,
- 0x47,0x44,0x44,0x44,0xf4,0x7f,0x44,0xfc,0x47,0x44,0x11,0x11,0xf9,0x7f,0x11,
- 0xf9,0x13,0x11,0x11,0x11,0xfd,0xff,0x11,0xf1,0x11,0x11,0x44,0x44,0xfc,0xff,
- 0x44,0x44,0x44,0x44,0x44,0x44,0xfe,0xff,0x45,0x44,0x44,0x44,0x11,0x11,0xff,
- 0xff,0x11,0xfd,0x13,0x11,0x11,0x11,0xff,0xff,0x13,0xfd,0x13,0x11,0x44,0xc4,
- 0xff,0xff,0x07,0xfc,0x43,0x44,0x44,0xff,0xff,0xf9,0xff,0xfd,0xfb,0xff,0x11,
- 0xc0,0xff,0x00,0x00,0xfc,0x03,0x00,0x11,0xc0,0x7f,0x00,0x00,0xfc,0x03,0x00,
- 0x04,0xe0,0x7f,0x00,0x00,0xfc,0x03,0x00,0xf4,0xf7,0xbf,0xff,0xff,0xfd,0xfb,
- 0x7f,0x01,0xf0,0x1f,0x00,0x00,0xfc,0x03,0x00,0x01,0xf8,0x1f,0x00,0x00,0xfc,
- 0x03,0x00,0x00,0xfc,0x0f,0x00,0x00,0xfc,0x03,0x40,0xfe,0xfd,0xef,0xff,0xff,
- 0xfd,0xfb,0x4f,0x00,0xfe,0x07,0x00,0x00,0xfc,0x03,0x10,0x00,0xfe,0x03,0x00,
- 0x00,0xfc,0x03,0x10,0x00,0xff,0x03,0x00,0x00,0xfc,0x03,0x44,0x7f,0xff,0x01,
- 0x00,0x00,0xfc,0xfb,0x44,0x91,0xff,0xff,0xff,0xff,0xff,0x13,0x11,0xd1,0xff,
- 0xff,0xff,0xff,0xff,0x13,0x11,0xe4,0xff,0xff,0xff,0xff,0xff,0x47,0x44,0xe4,
- 0xff,0xff,0xff,0xff,0xff,0x47,0x44,0xf1,0xff,0xff,0xff,0xff,0xff,0x13,0x11,
- 0xf1,0xff,0xff,0xff,0xff,0xff,0x13,0x11,0xfc,0xff,0xff,0xff,0xff,0xff,0x47,
- 0x44,0xfc,0xff,0xff,0xff,0xff,0xff,0x47,0x44,0x11,0x11,0x11,0x11,0x11,0x11,
- 0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x10,0x11,0x44,0x44,0xc4,0x44,0x44,
- 0xc4,0x44,0x44,0x44,0x4e,0xc4,0x44,0x4e,0xc4,0x44,0x44,0x11,0x1f,0xd1,0x11,
- 0x1f,0xd1,0x11,0x11,0x91,0x31,0xd1,0x91,0x31,0xd1,0x11,0x11,0xc4,0x64,0xcc,
- 0xcc,0x64,0xcc,0x44,0x44,0x64,0xc4,0xcc,0x6c,0xc4,0xcc,0x44,0x44,0xf1,0xff,
- 0xd1,0xf1,0xff,0xd1,0x11,0x11,0xf9,0xff,0xd3,0xf9,0xff,0xd3,0x11,0x11,0x4c,
- 0x44,0xc6,0x4c,0x44,0xc6,0x44,0x44,0x4c,0x44,0xc6,0x4c,0x44,0xc6,0x44,0x44,
- 0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,
- 0x11,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,
- 0x44,0x44};
diff --git a/samples/splitter/test.cpp b/samples/splitter/test.cpp
index 4d749c959b..3f1e1cedd2 100644
--- a/samples/splitter/test.cpp
+++ b/samples/splitter/test.cpp
@@ -116,9 +116,6 @@ MyFrame::MyFrame(wxFrame* frame, const wxString& title, const wxPoint& pos, cons
 #ifdef __WXMSW__
 	SetIcon(wxIcon("mondrian"));
 #endif
-#ifdef __X__
-	SetIcon(wxIcon("aiai.xbm"));
-#endif
 
 	CreateStatusBar(1);
 
diff --git a/samples/tab/makefile.bcc b/samples/tab/makefile.bcc
deleted file mode 100644
index b68a9b6d21..0000000000
--- a/samples/tab/makefile.bcc
+++ /dev/null
@@ -1,73 +0,0 @@
-#
-# File:		makefile.bcc
-# Author:	Julian Smart
-# Created:	1993
-# Updated:	
-# Copyright:	(c) 1993, AIAI, University of Edinburgh
-#
-# "%W% %G%"
-#
-# Makefile : Builds minimal example (DOS).
-
-!if "$(BCCDIR)" == ""
-!error You must define the BCCDIR variable in autoexec.bat, e.g. BCCDIR=d:\bc4
-!endif
-
-!if "$(WXWIN)" == ""
-!error You must define the WXWIN variable in autoexec.bat, e.g. WXWIN=c:\wx
-!endif
-
-WXDIR = $(WXWIN)
-!include $(WXDIR)\src\makebcc.env
-
-THISDIR = $(WXDIR)\samples\minimal
-WXLIB = $(WXDIR)\lib\wx.lib
-LIBS=$(WXLIB) mathwl cwl import
-INC=-I$(WXDIR)\include\base -I$(WXDIR)\include\msw
-CFG=$(WXDIR)\src\wxwin.cfg
-
-!ifndef FINAL
-FINAL=0
-!endif
-
-!if "$(FINAL)" == "0"
-LINKFLAGS=/v/Vt /Twe /L$(WXDIR)\lib;$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS= -v
-!else
-LINKFLAGS=/Twe /L$(WXDIR)\lib;$(BCCDIR)\lib
-OPT = -O2
-DEBUG_FLAGS=
-!endif
-CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
-
-OBJECTS = minimal.obj
-
-minimal:    minimal.exe
-
-all:    minimal.exe
-
-minimal.exe:    $(WXLIB) minimal.obj minimal.def minimal.res
-        tlink $(LINKFLAGS) @&&!
-c0wl.obj minimal.obj
-minimal
-nul
-$(LIBS)
-minimal.def
-!
-        rc -31 -K minimal.res
-
-.$(SRCSUFF).obj:
-	bcc $(CPPFLAGS) -c {$< }
-
-minimal.obj:      minimal.$(SRCSUFF)
-
-minimal.res :      minimal.rc $(WXDIR)\include\msw\wx.rc
-    rc -r /i$(BCCDIR)\include /i$(WXDIR)\include\msw /i$(WXDIR)\contrib\fafa minimal
-
-clean:
-        -erase *.obj
-        -erase *.exe
-        -erase *.res
-        -erase *.map
-        -erase *.rws
diff --git a/samples/tab/makefile.sc b/samples/tab/makefile.sc
deleted file mode 100644
index 8709d2ca0f..0000000000
--- a/samples/tab/makefile.sc
+++ /dev/null
@@ -1,35 +0,0 @@
-# Symantec C++ makefile for minimal example
-# NOTE that peripheral libraries are now dealt in main wxWindows makefile.
-
-WXDIR = $(WXWIN)
-!include $(WXDIR)\src\makesc.env
-
-WXLIB = $(WXDIR)\lib\wx.lib
-INCDIR = $(WXDIR)\include
-MSWINC = $(INCDIR)\msw
-BASEINC = $(INCDIR)\base
-
-CC=sc
-RC=rc
-CFLAGS = -o -ml -W -Dwx_msw
-LDFLAGS = -ml -W
-
-INCLUDE=$(BASEINC);$(MSWINC)
-
-LIBS=$(WXLIB) libw.lib commdlg.lib shell.lib
-
-.$(SRCSUFF).obj:
-	*$(CC) -c $(CFLAGS) -I$(INCLUDE) $<
-
-.rc.res:
-	*$(RC) -r -I$(INCLUDE) $<
-
-minimal.exe: minimal.obj minimal.def minimal.res
-	*$(CC) $(LDFLAGS) -o$@ $** $(LIBS)
-
-clean:
-        -del *.obj
-	-del *.exe
-	-del *.res
-	-del *.map
-	-del *.rws
diff --git a/samples/tab/makefile.unx b/samples/tab/makefile.unx
deleted file mode 100644
index 9685d06789..0000000000
--- a/samples/tab/makefile.unx
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# File:		makefile.unx
-# Author:	Julian Smart
-# Created:	1993
-# Updated:	
-# Copyright:	(c) 1993, AIAI, University of Edinburgh
-#
-# "%W% %G%"
-#
-# Makefile for minimal example (UNIX).
-
-WXDIR = ../..
-
-# All common UNIX compiler flags and options are now in
-# this central makefile.
-include $(WXDIR)/src/make.env
-
-OBJECTS = $(OBJDIR)/minimal.$(OBJSUFF)
-
-.SUFFIXES:
-
-all:    $(OBJDIR) minimal$(GUISUFFIX)
-
-wx:
-
-
-motif:
-	$(MAKE) -f makefile.unx GUISUFFIX=_motif GUI=-Dwx_motif GUISUFFIX=_motif OPT='$(OPT)' LDLIBS='$(MOTIFLDLIBS)' WXLIB=$(WXDIR)/lib/libwx_motif.a  OPTIONS='$(OPTIONS)' DEBUG='$(DEBUG)' WARN='$(WARN)' XLIB='$(XLIB)' XINCLUDE='$(XINCLUDE)' XVIEW_LINK=
-
-xview:
-	cd $(WXDIR)/src/x; $(MAKE) -f makefile.unx xview
-	$(MAKE) -f makefile.unx GUI=-Dwx_xview GUISUFFIX=_ol CC=$(CC) OPTIONS='$(OPTIONS)' DEBUG='$(DEBUG)' WARN='$(WARN)' XLIB='$(XLIB)' XINCLUDE='$(XINCLUDE)'
-
-hp:
-	cd $(WXDIR)/src/x; $(MAKE) -f makefile.unx hp
-	$(MAKE) -f makefile.unx GUI=-Dwx_motif GUISUFFIX=_hp CC=CC DEBUG='$(DEBUG)' WARN='-w' \
-         XINCLUDE='$(HPXINCLUDE)' XLIB='$(HPXLIB)' XVIEW_LINK='' LDLIBS='$(HPLDLIBS)'
-
-$(OBJDIR):
-	mkdir $(OBJDIR)
-
-minimal$(GUISUFFIX):	$(OBJDIR)/minimal.$(OBJSUFF) $(WXLIB)
-	$(CC) $(LDFLAGS) -o minimal$(GUISUFFIX) $(OBJDIR)/minimal.$(OBJSUFF) $(XVIEW_LINK) $(LDLIBS)
-
-$(OBJDIR)/minimal.$(OBJSUFF):	minimal.$(SRCSUFF)
-	$(CC) -c $(CPPFLAGS) -o $@ minimal.$(SRCSUFF)
-
-clean_motif:
-	$(MAKE) -f makefile.unx GUISUFFIX=_motif cleanany
-
-clean_ol:
-	$(MAKE) -f makefile.unx GUISUFFIX=_ol cleanany
-
-clean_hp:
-	$(MAKE) -f makefile.unx GUISUFFIX=_hp cleanany
-
-cleanany:
-	rm -f $(OBJECTS) minimal$(GUISUFFIX) core
diff --git a/samples/tab/makefile.vms b/samples/tab/makefile.vms
deleted file mode 100644
index 9b76b144f3..0000000000
--- a/samples/tab/makefile.vms
+++ /dev/null
@@ -1,38 +0,0 @@
-#************************************************************************
-# Makefile for MINIMAL under VMS
-# by Stefan Hammes
-# (incomplete) update history:
-# 11.04.95
-#************************************************************************
-
-#************************************************************************
-# Definition section
-# (cave: definitions and includes must begin with ',')
-#************************************************************************
-
-APPOPTS = 
-APPDEFS = 
-APPINCS = 
-
-#************************************************************************
-# Module section
-#************************************************************************
-
-# Name of main module
-MAIN = minimal
-
-# Object modules of the application.
-OBJS = minimal.obj
-OBJLIST =minimal.obj
-
-.include [--.src]makevms.env
-
-# main dependency
-$(MAIN).exe : $(OBJS)
-    $(LINK) $(LINKFLAGS) /exec=$(MAIN).exe $(OBJLIST),$(WXLIB)/lib,$(OPTSFILE)/option
-    - purge *.exe
-
-#************************************************************************
-# Header file depedencies following
-#************************************************************************
-
diff --git a/samples/tab/makefile.wat b/samples/tab/makefile.wat
deleted file mode 100644
index 21219d7a0e..0000000000
--- a/samples/tab/makefile.wat
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Makefile for WATCOM
-#
-# Created by D.Chubraev, chubraev@iem.ee.ethz.ch
-# 8 Nov 1994
-#
-
-WXDIR = ..\.. 
-
-!include $(WXDIR)\src\makewat.env
-
-WXLIB = $(WXDIR)\lib
-NAME = minimal
-LNK = $(name).lnk
-OBJS = $(name).obj 
-
-all: $(name).exe
-
-$(name).exe : $(OBJS) $(name).res $(LNK) $(WXLIB)\wx$(LEVEL).lib
-    wlink @$(LNK)
-    $(BINDCOMMAND) $(name).res
-
-$(name).res :      $(name).rc $(WXDIR)\include\msw\wx.rc
-     $(RC) $(RESFLAGS1) $(name).rc
-
-$(LNK) : makefile.wat
-    %create $(LNK)
-    @%append $(LNK) debug all
-    @%append $(LNK) system $(LINKOPTION)
-    @%append $(LNK) $(MINDATA)
-    @%append $(LNK) $(MAXDATA)
-    @%append $(LNK) $(STACK)
-    @%append $(LNK) name $(name)
-    @%append $(LNK) file $(WXLIB)\wx$(LEVEL).lib
-    @for %i in ($(EXTRALIBS)) do @%append $(LNK) file %i
-    @for %i in ($(OBJS)) do @%append $(LNK) file %i
-
-thing: .SYMBOLIC
-    echo $(WATLIBDIR)
-
-clean:   .SYMBOLIC
-    -erase *.obj *.bak *.err *.pch *.lib *.lnk *.res *.exe
-
diff --git a/samples/taskbar/makefile.bcc b/samples/taskbar/makefile.bcc
deleted file mode 100644
index aa2c61b4a8..0000000000
--- a/samples/taskbar/makefile.bcc
+++ /dev/null
@@ -1,73 +0,0 @@
-#
-# File:		makefile.bcc
-# Author:	Julian Smart
-# Created:	1993
-# Updated:	
-# Copyright:	(c) 1993, AIAI, University of Edinburgh
-#
-# "%W% %G%"
-#
-# Makefile : Builds tbtest example (DOS).
-
-!if "$(BCCDIR)" == ""
-!error You must define the BCCDIR variable in autoexec.bat, e.g. BCCDIR=d:\bc4
-!endif
-
-!if "$(WXWIN)" == ""
-!error You must define the WXWIN variable in autoexec.bat, e.g. WXWIN=c:\wx
-!endif
-
-WXDIR = $(WXWIN)
-!include $(WXDIR)\src\makebcc.env
-
-THISDIR = $(WXDIR)\samples\taskbar
-WXLIB = $(WXDIR)\lib\wx.lib
-LIBS=$(WXLIB) mathwl cwl import
-INC=-I$(WXDIR)\include\base -I$(WXDIR)\include\msw
-CFG=$(WXDIR)\src\wxwin.cfg
-
-!ifndef FINAL
-FINAL=0
-!endif
-
-!if "$(FINAL)" == "0"
-LINKFLAGS=/v/Vt /Twe /L$(WXDIR)\lib;$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS= -v
-!else
-LINKFLAGS=/Twe /L$(WXDIR)\lib;$(BCCDIR)\lib
-OPT = -O2
-DEBUG_FLAGS=
-!endif
-CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
-
-OBJECTS = tbtest.obj
-
-tbtest:    tbtest.exe
-
-all:    tbtest.exe
-
-tbtest.exe:    $(WXLIB) tbtest.obj tbtest.def tbtest.res
-        tlink $(LINKFLAGS) @&&!
-c0wl.obj tbtest.obj
-tbtest
-nul
-$(LIBS)
-tbtest.def
-!
-        rc -31 -K tbtest.res
-
-.$(SRCSUFF).obj:
-	bcc $(CPPFLAGS) -c {$< }
-
-tbtest.obj:      tbtest.$(SRCSUFF)
-
-tbtest.res :      tbtest.rc $(WXDIR)\include\msw\wx.rc
-    rc -r /i$(BCCDIR)\include /i$(WXDIR)\include\msw /i$(WXDIR)\contrib\fafa tbtest
-
-clean:
-        -erase *.obj
-        -erase *.exe
-        -erase *.res
-        -erase *.map
-        -erase *.rws
diff --git a/samples/thread/aiai.ico b/samples/thread/aiai.ico
deleted file mode 100644
index a3db6563cc..0000000000
Binary files a/samples/thread/aiai.ico and /dev/null differ
diff --git a/samples/thread/aiai.xbm b/samples/thread/aiai.xbm
deleted file mode 100644
index 1a6f0a31b1..0000000000
--- a/samples/thread/aiai.xbm
+++ /dev/null
@@ -1,38 +0,0 @@
-#define aiai_width 64
-#define aiai_height 64
-static char aiai_bits[] = {
- 0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,
- 0x11,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,
- 0x44,0x44,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,
- 0x11,0x11,0x11,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,
- 0x44,0x44,0x44,0x44,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,
- 0x11,0x11,0x11,0x11,0x11,0x44,0x44,0x44,0x42,0x44,0x44,0x44,0x44,0x44,0x44,
- 0x44,0x47,0x44,0x44,0x44,0x44,0x11,0x11,0x11,0x17,0x11,0x11,0x11,0x11,0x11,
- 0x11,0x91,0x1f,0x11,0x11,0x11,0x11,0x44,0x44,0xc4,0x4f,0x44,0x44,0x44,0x44,
- 0x44,0x44,0xc4,0x5f,0x44,0xf4,0x45,0x44,0x11,0x11,0xf1,0x1f,0x11,0xf9,0x13,
- 0x11,0x11,0x11,0xf1,0x3f,0x11,0xfd,0x13,0x11,0x44,0x44,0xf4,0x7f,0x44,0xfc,
- 0x47,0x44,0x44,0x44,0xf4,0x7f,0x44,0xfc,0x47,0x44,0x11,0x11,0xf9,0x7f,0x11,
- 0xf9,0x13,0x11,0x11,0x11,0xfd,0xff,0x11,0xf1,0x11,0x11,0x44,0x44,0xfc,0xff,
- 0x44,0x44,0x44,0x44,0x44,0x44,0xfe,0xff,0x45,0x44,0x44,0x44,0x11,0x11,0xff,
- 0xff,0x11,0xfd,0x13,0x11,0x11,0x11,0xff,0xff,0x13,0xfd,0x13,0x11,0x44,0xc4,
- 0xff,0xff,0x07,0xfc,0x43,0x44,0x44,0xff,0xff,0xf9,0xff,0xfd,0xfb,0xff,0x11,
- 0xc0,0xff,0x00,0x00,0xfc,0x03,0x00,0x11,0xc0,0x7f,0x00,0x00,0xfc,0x03,0x00,
- 0x04,0xe0,0x7f,0x00,0x00,0xfc,0x03,0x00,0xf4,0xf7,0xbf,0xff,0xff,0xfd,0xfb,
- 0x7f,0x01,0xf0,0x1f,0x00,0x00,0xfc,0x03,0x00,0x01,0xf8,0x1f,0x00,0x00,0xfc,
- 0x03,0x00,0x00,0xfc,0x0f,0x00,0x00,0xfc,0x03,0x40,0xfe,0xfd,0xef,0xff,0xff,
- 0xfd,0xfb,0x4f,0x00,0xfe,0x07,0x00,0x00,0xfc,0x03,0x10,0x00,0xfe,0x03,0x00,
- 0x00,0xfc,0x03,0x10,0x00,0xff,0x03,0x00,0x00,0xfc,0x03,0x44,0x7f,0xff,0x01,
- 0x00,0x00,0xfc,0xfb,0x44,0x91,0xff,0xff,0xff,0xff,0xff,0x13,0x11,0xd1,0xff,
- 0xff,0xff,0xff,0xff,0x13,0x11,0xe4,0xff,0xff,0xff,0xff,0xff,0x47,0x44,0xe4,
- 0xff,0xff,0xff,0xff,0xff,0x47,0x44,0xf1,0xff,0xff,0xff,0xff,0xff,0x13,0x11,
- 0xf1,0xff,0xff,0xff,0xff,0xff,0x13,0x11,0xfc,0xff,0xff,0xff,0xff,0xff,0x47,
- 0x44,0xfc,0xff,0xff,0xff,0xff,0xff,0x47,0x44,0x11,0x11,0x11,0x11,0x11,0x11,
- 0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x10,0x11,0x44,0x44,0xc4,0x44,0x44,
- 0xc4,0x44,0x44,0x44,0x4e,0xc4,0x44,0x4e,0xc4,0x44,0x44,0x11,0x1f,0xd1,0x11,
- 0x1f,0xd1,0x11,0x11,0x91,0x31,0xd1,0x91,0x31,0xd1,0x11,0x11,0xc4,0x64,0xcc,
- 0xcc,0x64,0xcc,0x44,0x44,0x64,0xc4,0xcc,0x6c,0xc4,0xcc,0x44,0x44,0xf1,0xff,
- 0xd1,0xf1,0xff,0xd1,0x11,0x11,0xf9,0xff,0xd3,0xf9,0xff,0xd3,0x11,0x11,0x4c,
- 0x44,0xc6,0x4c,0x44,0xc6,0x44,0x44,0x4c,0x44,0xc6,0x4c,0x44,0xc6,0x44,0x44,
- 0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,
- 0x11,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,
- 0x44,0x44};
diff --git a/samples/thread/makefile.bcc b/samples/thread/makefile.bcc
deleted file mode 100644
index cb230c867e..0000000000
--- a/samples/thread/makefile.bcc
+++ /dev/null
@@ -1,73 +0,0 @@
-#
-# File:		makefile.bcc
-# Author:	Julian Smart
-# Created:	1993
-# Updated:	
-# Copyright:	(c) 1993, AIAI, University of Edinburgh
-#
-# "%W% %G%"
-#
-# Makefile : Builds thread example (DOS).
-
-!if "$(BCCDIR)" == ""
-!error You must define the BCCDIR variable in autoexec.bat, e.g. BCCDIR=d:\bc4
-!endif
-
-!if "$(WXWIN)" == ""
-!error You must define the WXWIN variable in autoexec.bat, e.g. WXWIN=c:\wx
-!endif
-
-WXDIR = $(WXWIN)
-!include $(WXDIR)\src\makebcc.env
-
-THISDIR = $(WXDIR)\samples\test
-WXLIB = $(WXDIR)\lib\wx.lib
-LIBS=$(WXLIB) mathwl cwl import
-INC=-I$(WXDIR)\include\base -I$(WXDIR)\include\msw
-CFG=$(WXDIR)\src\wxwin.cfg
-
-!ifndef FINAL
-FINAL=0
-!endif
-
-!if "$(FINAL)" == "0"
-LINKFLAGS=/v/Vt /Twe /L$(WXDIR)\lib;$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS= -v
-!else
-LINKFLAGS=/Twe /L$(WXDIR)\lib;$(BCCDIR)\lib
-OPT = -O2
-DEBUG_FLAGS=
-!endif
-CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
-
-OBJECTS = test.obj
-
-test:    test.exe
-
-all:    test.exe
-
-test.exe:    $(WXLIB) test.obj test.def test.res
-        tlink $(LINKFLAGS) @&&!
-c0wl.obj test.obj
-test
-nul
-$(LIBS)
-test.def
-!
-        rc -31 -K test.res
-
-.$(SRCSUFF).obj:
-	bcc $(CPPFLAGS) -c {$< }
-
-test.obj:      test.$(SRCSUFF)
-
-test.res :      test.rc $(WXDIR)\include\msw\wx.rc
-    rc -r /i$(BCCDIR)\include /i$(WXDIR)\include\msw /i$(WXDIR)\contrib\fafa test
-
-clean:
-        -erase *.obj
-        -erase *.exe
-        -erase *.res
-        -erase *.map
-        -erase *.rws
diff --git a/samples/thread/makefile.sc b/samples/thread/makefile.sc
deleted file mode 100644
index b0965c1b96..0000000000
--- a/samples/thread/makefile.sc
+++ /dev/null
@@ -1,35 +0,0 @@
-# Symantec C++ makefile for thread example
-# NOTE that peripheral libraries are now dealt in main wxWindows makefile.
-
-WXDIR = $(WXWIN)
-!include $(WXDIR)\src\makesc.env
-
-WXLIB = $(WXDIR)\lib\wx.lib
-INCDIR = $(WXDIR)\include
-MSWINC = $(INCDIR)\msw
-BASEINC = $(INCDIR)\base
-
-CC=sc
-RC=rc
-CFLAGS = -o -ml -W -Dwx_msw
-LDFLAGS = -ml -W
-
-INCLUDE=$(BASEINC);$(MSWINC)
-
-LIBS=$(WXLIB) libw.lib commdlg.lib shell.lib
-
-.$(SRCSUFF).obj:
-	*$(CC) -c $(CFLAGS) -I$(INCLUDE) $<
-
-.rc.res:
-	*$(RC) -r -I$(INCLUDE) $<
-
-test.exe: test.obj test.def test.res
-	*$(CC) $(LDFLAGS) -o$@ $** $(LIBS)
-
-clean:
-        -del *.obj
-	-del *.exe
-	-del *.res
-	-del *.map
-	-del *.rws
diff --git a/samples/thread/makefile.unx b/samples/thread/makefile.unx
deleted file mode 100644
index 121e691519..0000000000
--- a/samples/thread/makefile.unx
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# File:		makefile.unx
-# Author:	Julian Smart
-# Created:	1993
-# Updated:	
-# Copyright:	(c) 1993, AIAI, University of Edinburgh
-#
-# "%W% %G%"
-#
-# Makefile for thread example (UNIX).
-
-WXDIR = ../..
-
-# All common UNIX compiler flags and options are now in
-# this central makefile.
-include $(WXDIR)/src/make.env
-
-OBJECTS = $(OBJDIR)/test.$(OBJSUFF)
-
-.SUFFIXES:
-
-all:    $(OBJDIR) test$(GUISUFFIX)
-
-wx:
-
-
-motif:
-	$(MAKE) -f makefile.unx GUISUFFIX=_motif GUI=-Dwx_motif GUISUFFIX=_motif OPT='$(OPT)' LDLIBS='$(MOTIFLDLIBS)' WXLIB=$(WXDIR)/lib/libwx_motif.a  OPTIONS='$(OPTIONS)' DEBUG='$(DEBUG)' WARN='$(WARN)' XLIB='$(XLIB)' XINCLUDE='$(XINCLUDE)' XVIEW_LINK=
-
-xview:
-	cd $(WXDIR)/src/x; $(MAKE) -f makefile.unx xview
-	$(MAKE) -f makefile.unx GUI=-Dwx_xview GUISUFFIX=_ol CC=$(CC) OPTIONS='$(OPTIONS)' DEBUG='$(DEBUG)' WARN='$(WARN)' XLIB='$(XLIB)' XINCLUDE='$(XINCLUDE)'
-
-hp:
-	cd $(WXDIR)/src/x; $(MAKE) -f makefile.unx hp
-	$(MAKE) -f makefile.unx GUI=-Dwx_motif GUISUFFIX=_hp CC=CC DEBUG='$(DEBUG)' WARN='-w' \
-         XINCLUDE='$(HPXINCLUDE)' XLIB='$(HPXLIB)' XVIEW_LINK='' LDLIBS='$(HPLDLIBS)'
-
-$(OBJDIR):
-	mkdir $(OBJDIR)
-
-test$(GUISUFFIX):	$(OBJDIR)/test.$(OBJSUFF) $(WXLIB)
-	$(CC) $(LDFLAGS) -o test$(GUISUFFIX) $(OBJDIR)/test.$(OBJSUFF) $(XVIEW_LINK) $(LDLIBS)
-
-$(OBJDIR)/test.$(OBJSUFF):	test.$(SRCSUFF)
-	$(CC) -c $(CPPFLAGS) -o $@ test.$(SRCSUFF)
-
-clean_motif:
-	$(MAKE) -f makefile.unx GUISUFFIX=_motif cleanany
-
-clean_ol:
-	$(MAKE) -f makefile.unx GUISUFFIX=_ol cleanany
-
-clean_hp:
-	$(MAKE) -f makefile.unx GUISUFFIX=_hp cleanany
-
-cleanany:
-	rm -f $(OBJECTS) test$(GUISUFFIX) core
diff --git a/samples/thread/makefile.vms b/samples/thread/makefile.vms
deleted file mode 100644
index 18f383c9f0..0000000000
--- a/samples/thread/makefile.vms
+++ /dev/null
@@ -1,38 +0,0 @@
-#************************************************************************
-# Makefile for MINIMAL under VMS
-# by Stefan Hammes
-# (incomplete) update history:
-# 11.04.95
-#************************************************************************
-
-#************************************************************************
-# Definition section
-# (cave: definitions and includes must begin with ',')
-#************************************************************************
-
-APPOPTS = 
-APPDEFS = 
-APPINCS = 
-
-#************************************************************************
-# Module section
-#************************************************************************
-
-# Name of main module
-MAIN = test
-
-# Object modules of the application.
-OBJS = test.obj
-OBJLIST =test.obj
-
-.include [--.src]makevms.env
-
-# main dependency
-$(MAIN).exe : $(OBJS)
-    $(LINK) $(LINKFLAGS) /exec=$(MAIN).exe $(OBJLIST),$(WXLIB)/lib,$(OPTSFILE)/option
-    - purge *.exe
-
-#************************************************************************
-# Header file depedencies following
-#************************************************************************
-
diff --git a/samples/thread/makefile.wat b/samples/thread/makefile.wat
deleted file mode 100644
index 3d7f5e0588..0000000000
--- a/samples/thread/makefile.wat
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Makefile for WATCOM
-#
-# Created by D.Chubraev, chubraev@iem.ee.ethz.ch
-# 8 Nov 1994
-#
-
-WXDIR = ..\.. 
-
-!include $(WXDIR)\src\makewat.env
-
-WXLIB = $(WXDIR)\lib
-NAME = test
-LNK = $(name).lnk
-OBJS = $(name).obj 
-
-all: $(name).exe
-
-$(name).exe : $(OBJS) $(name).res $(LNK) $(WXLIB)\wx$(LEVEL).lib
-    wlink @$(LNK)
-    $(BINDCOMMAND) $(name).res
-
-$(name).res :      $(name).rc $(WXDIR)\include\msw\wx.rc
-     $(RC) $(RESFLAGS1) $(name).rc
-
-$(LNK) : makefile.wat
-    %create $(LNK)
-    @%append $(LNK) debug all
-    @%append $(LNK) system $(LINKOPTION)
-    @%append $(LNK) $(MINDATA)
-    @%append $(LNK) $(MAXDATA)
-    @%append $(LNK) $(STACK)
-    @%append $(LNK) name $(name)
-    @%append $(LNK) file $(WXLIB)\wx$(LEVEL).lib
-    @for %i in ($(EXTRALIBS)) do @%append $(LNK) file %i
-    @for %i in ($(OBJS)) do @%append $(LNK) file %i
-
-thing: .SYMBOLIC
-    echo $(WATLIBDIR)
-
-clean:   .SYMBOLIC
-    -erase *.obj *.bak *.err *.pch *.lib *.lnk *.res *.exe
-
diff --git a/samples/thread/test.cpp b/samples/thread/test.cpp
index 66bf9e5a66..fac0311c97 100644
--- a/samples/thread/test.cpp
+++ b/samples/thread/test.cpp
@@ -119,14 +119,6 @@ bool MyApp::OnInit(void)
   // Create the main frame window
   MyFrame *frame = new MyFrame(NULL, "Minimal wxWindows App", 50, 50, 450, 340);
 
-  // Give it an icon
-#ifdef __WXMSW__
-  frame->SetIcon(wxIcon("AIAI"));
-#endif
-#ifdef __X__
-  frame->SetIcon(wxIcon("aiai.xbm"));
-#endif
-
   // Make a menubar
   wxMenu *file_menu = new wxMenu;
 
diff --git a/samples/thread/test.rc b/samples/thread/test.rc
index c55ae44ef2..82bdf07561 100644
--- a/samples/thread/test.rc
+++ b/samples/thread/test.rc
@@ -1,3 +1,2 @@
-AIAI ICON "aiai.ico"
 #include "wx/msw/wx.rc"
 
diff --git a/samples/toolbar/makefile.bcc b/samples/toolbar/makefile.bcc
deleted file mode 100644
index e032e2d1b0..0000000000
--- a/samples/toolbar/makefile.bcc
+++ /dev/null
@@ -1,75 +0,0 @@
-#
-# File:		makefile.bcc
-# Author:	Julian Smart
-# Created:	1993
-# Updated:	
-# Copyright:	(c) 1993, AIAI, University of Edinburgh
-#
-# "%W% %G%"
-#
-# Makefile : Builds wxButtonbar sample
-
-!if "$(BCCDIR)" == ""
-!error You must define the BCCDIR variable in autoexec.bat, e.g. BCCDIR=d:\bc4
-!endif
-
-!if "$(WXWIN)" == ""
-!error You must define the WXWIN variable in autoexec.bat, e.g. WXWIN=c:\wx
-!endif
-
-# Change WXDIR to wherever wxWindows is found
-WXDIR = $(WXWIN)
-!include $(WXDIR)\src\makebcc.env
-
-WXLIB = $(WXDIR)\lib\wx.lib
-WXINC = $(WXDIR)\include
-CFG=$(WXDIR)\src\wxwin.cfg
-
-BUTTNBARDIR = $(WXDIR)\samples\toolbar
-THISDIR = $(BUTTNBARDIR)
-
-INC=
-
-LIBS=$(WXLIB) mathwl cwl import
-
-!ifndef FINAL
-FINAL=0
-!endif
-
-!if "$(FINAL)" == "0"
-LINKFLAGS=/v/Vt /Twe /L$(WXDIR)\lib;$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS= -v
-!else
-LINKFLAGS=/Twe /L$(WXDIR)\lib;$(BCCDIR)\lib
-OPT = -O2
-DEBUG_FLAGS=
-!endif
-CPPFLAGS=$(DEBUG_FLAGS) $(OPT) $(INC) @$(CFG)
-CFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
-
-OBJECTS = test.obj
-
-all:    test.exe
-
-.$(SRCSUFF).obj:
-	bcc $(CPPFLAGS) -c {$< }
-
-test.res :      test.rc $(WXDIR)\include\msw\wx.rc
-    rc /i$(BCCDIR)\include /i$(WXDIR)\include\msw /i$(WXDIR)\contrib\fafa -r test
-
-test.exe:      test.obj test.def test.res
-        tlink $(LINKFLAGS) @&&!
-c0wl.obj test.obj
-test
-nul
-$(LIBS)
-test.def
-!
-        rc -K test.res
-
-clean:
-        -erase *.obj
-        -erase *.exe
-
-
diff --git a/samples/toolbar/makefile.sc b/samples/toolbar/makefile.sc
deleted file mode 100644
index 97e6a2ad93..0000000000
--- a/samples/toolbar/makefile.sc
+++ /dev/null
@@ -1,42 +0,0 @@
-# Symantec C++ makefile for the buttonbar library
-
-WXDIR = $(WXWIN)
-!include $(WXDIR)\src\makesc.env
-
-WXLIB = $(WXDIR)\lib\wx.lib
-INCDIR = $(WXDIR)\include
-MSWINC = $(INCDIR)\msw
-BASEINC = $(INCDIR)\base
-
-BUTTNBARDIR = $(WXDIR)\samples\buttnbar
-
-# Default is to output RTF for WinHelp
-WINHELP=-winhelp
-
-CC=sc
-RC=rc
-CFLAGS = -o -ml -W -Dwx_msw
-LDFLAGS = -ml -W
-
-INCLUDE=$(BASEINC);$(MSWINC)
-
-LIBS=$(WXLIB) libw.lib commdlg.lib shell.lib
-
-all:    test.exe
-
-.$(SRCSUFF).obj:
-	*$(CC) -c $(CFLAGS) -I$(INCLUDE) $<
-
-.rc.res:
-	*$(RC) -r -I$(INCLUDE) $<
-
-test.exe: test.obj test.def test.res
-	*$(CC) $(LDFLAGS) -o$@ test.obj test.def $(LIBS)
-	*$(RC) -k test.res
-
-clean:
-        -del *.obj
-	-del *.exe
-	-del *.res
-	-del *.map
-
diff --git a/samples/toolbar/makefile.unx b/samples/toolbar/makefile.unx
deleted file mode 100644
index b01a514e9b..0000000000
--- a/samples/toolbar/makefile.unx
+++ /dev/null
@@ -1,80 +0,0 @@
-#
-# File:		makefile.unx
-# Author:	Julian Smart
-# Created:	1993
-# Updated:	
-# Copyright:	(c) 1993, AIAI, University of Edinburgh
-#
-# "%W% %G%"
-#
-# Makefile for wxToolBar example (UNIX).
-# Change the WXDIR directory, and CPPFLAGS and LDFLAGS, for your system.
-
-WXDIR = ../..
-
-# All common UNIX compiler flags and options are now in
-# this central makefile.
-include $(WXDIR)/src/make.env
-
-TOOLBARDIR = $(WXDIR)/samples/toolbar
-
-OBJECTS = $(OBJDIR)/wx_bbar.$(OBJSUFF)
-TESTOBJECTS = $(OBJDIR)/test.$(OBJSUFF)
-TESTPROGRAM = $(TOOLBARDIR)/test$(GUISUFFIX)
-
-LDFLAGS =  $(XLIB) -L$(WXDIR)/lib
-
-XVIEWLDLIBS = -lwx_ol -lxview -lolgx -lX11 -lm $(COMPLIBS)
-MOTIFLDLIBS = -lwx_motif -lXm -lXt -lX11 -lm $(COMPLIBS)
-HPLDLIBS = -lwx_hp -lXm -lXt -lX11 -lm $(HPCOMPLIBS)
-# Default
-LDLIBS=$(XVIEWLDLIBS)
-
-all:	$(OBJDIR) $(TESTPROGRAM)
-
-demo:	$(TESTPROGRAM)
-
-.SUFFIXES:
-
-wx:
-	cd $(WXDIR)/src/x; $(MAKE) -f makefile.unx GUI=$(GUI)
-
-motif:
-	cd $(WXDIR)/src/x; $(MAKE) -f makefile.unx motif OPT='$(OPT)'
-	$(MAKE) -f makefile.unx GUI=-Dwx_motif GUISUFFIX=_motif OPT='$(OPT)' LDLIBS='$(MOTIFLDLIBS)' XVIEW_LINK=
-
-demo_motif:
-	$(MAKE) -f makefile.unx all demo GUI=-Dwx_motif GUISUFFIX=_motif OPT='$(OPT)' LDLIBS='$(MOTIFLDLIBS)' XVIEW_LINK=
-
-xview:
-	cd $(WXDIR)/src/x; $(MAKE) -f makefile.unx xview OPT='$(OPT)'
-	$(MAKE) -f makefile.unx GUI=-Dwx_xview OPT='$(OPT)'
-
-demo_ol:
-	$(MAKE) -f makefile.unx all demo GUI=-Dwx_xview OPT='$(OPT)'
-
-hp:
-	$(MAKE) -f makefile.unx GUI=-Dwx_motif GUISUFFIX=_hp CC=CC DEBUG='$(DEBUG)' OPT='' WARN='-w' \
-           XINCLUDE='$(HPXINCLUDE)' XLIB='$(HPXLIB)' XVIEW_LINK='' CCLEX='cc' \
-           LDLIBS='$(HPLDLIBS)'
-$(OBJDIR):
-	mkdir $(OBJDIR)
-
-$(OBJDIR)/test.$(OBJSUFF):		test.h test.$(SRCSUFF)
-	$(CC) -c $(CPPFLAGS) -o $@ test.$(SRCSUFF)
-
-$(TESTPROGRAM): $(OBJDIR)/test.$(OBJSUFF) $(WXLIB)
-	$(CC) $(LDFLAGS) -o test$(GUISUFFIX) $(OBJDIR)/test.$(OBJSUFF) $(XVIEW_LINK) $(LDLIBS)
-
-cleaneach:
-	rm -f $(OBJECTS) test$(GUISUFFIX) $(OBJDIR)/test.$(OBJSUFF) core
-
-clean_motif:
-	$(MAKE) -f makefile.unx GUISUFFIX=_motif cleaneach 
-
-clean_ol:
-	$(MAKE) -f makefile.unx GUISUFFIX=_ol cleaneach 
-
-clean_hp:
-	$(MAKE) -f makefile.unx GUISUFFIX=_hp cleaneach 
-
diff --git a/samples/toolbar/makefile.wat b/samples/toolbar/makefile.wat
deleted file mode 100644
index dcae6e26f3..0000000000
--- a/samples/toolbar/makefile.wat
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# Makefile for WATCOM
-#
-# Created by D.Chubraev, chubraev@iem.ee.ethz.ch
-# 8 Nov 1994
-#
-
-WXDIR = ..\.. 
-
-!include $(WXDIR)\src\makewat.env
-
-WXLIB = $(WXDIR)\lib
-NAME = test
-LNK = $(name).lnk
-OBJS = $(name).obj
-THISDIR = $(WXDIR)\samples\buttnbar
-
-all:    $(name).exe
-
-wx: .SYMBOLIC
-    cd $(WXDIR)\src\msw
-    wmake -f makefile.wat all
-    cd $(THISDIR)
-
-$(name).exe : $(OBJS) $(name).res $(LNK) $(WXLIB)\wx$(LEVEL).lib
-    wlink @$(LNK)
-    $(BINDCOMMAND) $(name).res
-
-$(name).res :      $(name).rc $(WXDIR)\include\msw\wx.rc
-     $(RC) $(RESFLAGS1) $(name).rc
-
-$(LNK) : makefile.wat
-    %create $(LNK)
-    @%append $(LNK) debug all
-    @%append $(LNK) system $(LINKOPTION)
-    @%append $(LNK) $(MINDATA)
-    @%append $(LNK) $(MAXDATA)
-    @%append $(LNK) $(STACK)
-    @%append $(LNK) name $(name)
-    @%append $(LNK) file $(WXLIB)\wx$(LEVEL).lib
-    @for %i in ($(EXTRALIBS)) do @%append $(LNK) file %i
-    @for %i in ($(OBJS)) do @%append $(LNK) file %i
-
-thing: .SYMBOLIC
-    echo $(WATLIBDIR)
-
-clean:   .SYMBOLIC
-    -erase *.obj *.bak *.err *.pch *.lib *.lnk *.res *.exe *.rex
-
diff --git a/samples/treectrl/aiai.ico b/samples/treectrl/aiai.ico
deleted file mode 100644
index a3db6563cc..0000000000
Binary files a/samples/treectrl/aiai.ico and /dev/null differ
diff --git a/samples/treectrl/makefile.bcc b/samples/treectrl/makefile.bcc
deleted file mode 100644
index b68a9b6d21..0000000000
--- a/samples/treectrl/makefile.bcc
+++ /dev/null
@@ -1,73 +0,0 @@
-#
-# File:		makefile.bcc
-# Author:	Julian Smart
-# Created:	1993
-# Updated:	
-# Copyright:	(c) 1993, AIAI, University of Edinburgh
-#
-# "%W% %G%"
-#
-# Makefile : Builds minimal example (DOS).
-
-!if "$(BCCDIR)" == ""
-!error You must define the BCCDIR variable in autoexec.bat, e.g. BCCDIR=d:\bc4
-!endif
-
-!if "$(WXWIN)" == ""
-!error You must define the WXWIN variable in autoexec.bat, e.g. WXWIN=c:\wx
-!endif
-
-WXDIR = $(WXWIN)
-!include $(WXDIR)\src\makebcc.env
-
-THISDIR = $(WXDIR)\samples\minimal
-WXLIB = $(WXDIR)\lib\wx.lib
-LIBS=$(WXLIB) mathwl cwl import
-INC=-I$(WXDIR)\include\base -I$(WXDIR)\include\msw
-CFG=$(WXDIR)\src\wxwin.cfg
-
-!ifndef FINAL
-FINAL=0
-!endif
-
-!if "$(FINAL)" == "0"
-LINKFLAGS=/v/Vt /Twe /L$(WXDIR)\lib;$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS= -v
-!else
-LINKFLAGS=/Twe /L$(WXDIR)\lib;$(BCCDIR)\lib
-OPT = -O2
-DEBUG_FLAGS=
-!endif
-CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
-
-OBJECTS = minimal.obj
-
-minimal:    minimal.exe
-
-all:    minimal.exe
-
-minimal.exe:    $(WXLIB) minimal.obj minimal.def minimal.res
-        tlink $(LINKFLAGS) @&&!
-c0wl.obj minimal.obj
-minimal
-nul
-$(LIBS)
-minimal.def
-!
-        rc -31 -K minimal.res
-
-.$(SRCSUFF).obj:
-	bcc $(CPPFLAGS) -c {$< }
-
-minimal.obj:      minimal.$(SRCSUFF)
-
-minimal.res :      minimal.rc $(WXDIR)\include\msw\wx.rc
-    rc -r /i$(BCCDIR)\include /i$(WXDIR)\include\msw /i$(WXDIR)\contrib\fafa minimal
-
-clean:
-        -erase *.obj
-        -erase *.exe
-        -erase *.res
-        -erase *.map
-        -erase *.rws
diff --git a/samples/treectrl/makefile.sc b/samples/treectrl/makefile.sc
deleted file mode 100644
index 8709d2ca0f..0000000000
--- a/samples/treectrl/makefile.sc
+++ /dev/null
@@ -1,35 +0,0 @@
-# Symantec C++ makefile for minimal example
-# NOTE that peripheral libraries are now dealt in main wxWindows makefile.
-
-WXDIR = $(WXWIN)
-!include $(WXDIR)\src\makesc.env
-
-WXLIB = $(WXDIR)\lib\wx.lib
-INCDIR = $(WXDIR)\include
-MSWINC = $(INCDIR)\msw
-BASEINC = $(INCDIR)\base
-
-CC=sc
-RC=rc
-CFLAGS = -o -ml -W -Dwx_msw
-LDFLAGS = -ml -W
-
-INCLUDE=$(BASEINC);$(MSWINC)
-
-LIBS=$(WXLIB) libw.lib commdlg.lib shell.lib
-
-.$(SRCSUFF).obj:
-	*$(CC) -c $(CFLAGS) -I$(INCLUDE) $<
-
-.rc.res:
-	*$(RC) -r -I$(INCLUDE) $<
-
-minimal.exe: minimal.obj minimal.def minimal.res
-	*$(CC) $(LDFLAGS) -o$@ $** $(LIBS)
-
-clean:
-        -del *.obj
-	-del *.exe
-	-del *.res
-	-del *.map
-	-del *.rws
diff --git a/samples/treectrl/makefile.unx b/samples/treectrl/makefile.unx
deleted file mode 100644
index 9685d06789..0000000000
--- a/samples/treectrl/makefile.unx
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# File:		makefile.unx
-# Author:	Julian Smart
-# Created:	1993
-# Updated:	
-# Copyright:	(c) 1993, AIAI, University of Edinburgh
-#
-# "%W% %G%"
-#
-# Makefile for minimal example (UNIX).
-
-WXDIR = ../..
-
-# All common UNIX compiler flags and options are now in
-# this central makefile.
-include $(WXDIR)/src/make.env
-
-OBJECTS = $(OBJDIR)/minimal.$(OBJSUFF)
-
-.SUFFIXES:
-
-all:    $(OBJDIR) minimal$(GUISUFFIX)
-
-wx:
-
-
-motif:
-	$(MAKE) -f makefile.unx GUISUFFIX=_motif GUI=-Dwx_motif GUISUFFIX=_motif OPT='$(OPT)' LDLIBS='$(MOTIFLDLIBS)' WXLIB=$(WXDIR)/lib/libwx_motif.a  OPTIONS='$(OPTIONS)' DEBUG='$(DEBUG)' WARN='$(WARN)' XLIB='$(XLIB)' XINCLUDE='$(XINCLUDE)' XVIEW_LINK=
-
-xview:
-	cd $(WXDIR)/src/x; $(MAKE) -f makefile.unx xview
-	$(MAKE) -f makefile.unx GUI=-Dwx_xview GUISUFFIX=_ol CC=$(CC) OPTIONS='$(OPTIONS)' DEBUG='$(DEBUG)' WARN='$(WARN)' XLIB='$(XLIB)' XINCLUDE='$(XINCLUDE)'
-
-hp:
-	cd $(WXDIR)/src/x; $(MAKE) -f makefile.unx hp
-	$(MAKE) -f makefile.unx GUI=-Dwx_motif GUISUFFIX=_hp CC=CC DEBUG='$(DEBUG)' WARN='-w' \
-         XINCLUDE='$(HPXINCLUDE)' XLIB='$(HPXLIB)' XVIEW_LINK='' LDLIBS='$(HPLDLIBS)'
-
-$(OBJDIR):
-	mkdir $(OBJDIR)
-
-minimal$(GUISUFFIX):	$(OBJDIR)/minimal.$(OBJSUFF) $(WXLIB)
-	$(CC) $(LDFLAGS) -o minimal$(GUISUFFIX) $(OBJDIR)/minimal.$(OBJSUFF) $(XVIEW_LINK) $(LDLIBS)
-
-$(OBJDIR)/minimal.$(OBJSUFF):	minimal.$(SRCSUFF)
-	$(CC) -c $(CPPFLAGS) -o $@ minimal.$(SRCSUFF)
-
-clean_motif:
-	$(MAKE) -f makefile.unx GUISUFFIX=_motif cleanany
-
-clean_ol:
-	$(MAKE) -f makefile.unx GUISUFFIX=_ol cleanany
-
-clean_hp:
-	$(MAKE) -f makefile.unx GUISUFFIX=_hp cleanany
-
-cleanany:
-	rm -f $(OBJECTS) minimal$(GUISUFFIX) core
diff --git a/samples/treectrl/makefile.vms b/samples/treectrl/makefile.vms
deleted file mode 100644
index 9b76b144f3..0000000000
--- a/samples/treectrl/makefile.vms
+++ /dev/null
@@ -1,38 +0,0 @@
-#************************************************************************
-# Makefile for MINIMAL under VMS
-# by Stefan Hammes
-# (incomplete) update history:
-# 11.04.95
-#************************************************************************
-
-#************************************************************************
-# Definition section
-# (cave: definitions and includes must begin with ',')
-#************************************************************************
-
-APPOPTS = 
-APPDEFS = 
-APPINCS = 
-
-#************************************************************************
-# Module section
-#************************************************************************
-
-# Name of main module
-MAIN = minimal
-
-# Object modules of the application.
-OBJS = minimal.obj
-OBJLIST =minimal.obj
-
-.include [--.src]makevms.env
-
-# main dependency
-$(MAIN).exe : $(OBJS)
-    $(LINK) $(LINKFLAGS) /exec=$(MAIN).exe $(OBJLIST),$(WXLIB)/lib,$(OPTSFILE)/option
-    - purge *.exe
-
-#************************************************************************
-# Header file depedencies following
-#************************************************************************
-
diff --git a/samples/treectrl/makefile.wat b/samples/treectrl/makefile.wat
deleted file mode 100644
index 21219d7a0e..0000000000
--- a/samples/treectrl/makefile.wat
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Makefile for WATCOM
-#
-# Created by D.Chubraev, chubraev@iem.ee.ethz.ch
-# 8 Nov 1994
-#
-
-WXDIR = ..\.. 
-
-!include $(WXDIR)\src\makewat.env
-
-WXLIB = $(WXDIR)\lib
-NAME = minimal
-LNK = $(name).lnk
-OBJS = $(name).obj 
-
-all: $(name).exe
-
-$(name).exe : $(OBJS) $(name).res $(LNK) $(WXLIB)\wx$(LEVEL).lib
-    wlink @$(LNK)
-    $(BINDCOMMAND) $(name).res
-
-$(name).res :      $(name).rc $(WXDIR)\include\msw\wx.rc
-     $(RC) $(RESFLAGS1) $(name).rc
-
-$(LNK) : makefile.wat
-    %create $(LNK)
-    @%append $(LNK) debug all
-    @%append $(LNK) system $(LINKOPTION)
-    @%append $(LNK) $(MINDATA)
-    @%append $(LNK) $(MAXDATA)
-    @%append $(LNK) $(STACK)
-    @%append $(LNK) name $(name)
-    @%append $(LNK) file $(WXLIB)\wx$(LEVEL).lib
-    @for %i in ($(EXTRALIBS)) do @%append $(LNK) file %i
-    @for %i in ($(OBJS)) do @%append $(LNK) file %i
-
-thing: .SYMBOLIC
-    echo $(WATLIBDIR)
-
-clean:   .SYMBOLIC
-    -erase *.obj *.bak *.err *.pch *.lib *.lnk *.res *.exe
-
diff --git a/samples/validate/aiai.ico b/samples/validate/aiai.ico
deleted file mode 100644
index a3db6563cc..0000000000
Binary files a/samples/validate/aiai.ico and /dev/null differ
diff --git a/samples/validate/makefile.bcc b/samples/validate/makefile.bcc
deleted file mode 100644
index b68a9b6d21..0000000000
--- a/samples/validate/makefile.bcc
+++ /dev/null
@@ -1,73 +0,0 @@
-#
-# File:		makefile.bcc
-# Author:	Julian Smart
-# Created:	1993
-# Updated:	
-# Copyright:	(c) 1993, AIAI, University of Edinburgh
-#
-# "%W% %G%"
-#
-# Makefile : Builds minimal example (DOS).
-
-!if "$(BCCDIR)" == ""
-!error You must define the BCCDIR variable in autoexec.bat, e.g. BCCDIR=d:\bc4
-!endif
-
-!if "$(WXWIN)" == ""
-!error You must define the WXWIN variable in autoexec.bat, e.g. WXWIN=c:\wx
-!endif
-
-WXDIR = $(WXWIN)
-!include $(WXDIR)\src\makebcc.env
-
-THISDIR = $(WXDIR)\samples\minimal
-WXLIB = $(WXDIR)\lib\wx.lib
-LIBS=$(WXLIB) mathwl cwl import
-INC=-I$(WXDIR)\include\base -I$(WXDIR)\include\msw
-CFG=$(WXDIR)\src\wxwin.cfg
-
-!ifndef FINAL
-FINAL=0
-!endif
-
-!if "$(FINAL)" == "0"
-LINKFLAGS=/v/Vt /Twe /L$(WXDIR)\lib;$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS= -v
-!else
-LINKFLAGS=/Twe /L$(WXDIR)\lib;$(BCCDIR)\lib
-OPT = -O2
-DEBUG_FLAGS=
-!endif
-CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
-
-OBJECTS = minimal.obj
-
-minimal:    minimal.exe
-
-all:    minimal.exe
-
-minimal.exe:    $(WXLIB) minimal.obj minimal.def minimal.res
-        tlink $(LINKFLAGS) @&&!
-c0wl.obj minimal.obj
-minimal
-nul
-$(LIBS)
-minimal.def
-!
-        rc -31 -K minimal.res
-
-.$(SRCSUFF).obj:
-	bcc $(CPPFLAGS) -c {$< }
-
-minimal.obj:      minimal.$(SRCSUFF)
-
-minimal.res :      minimal.rc $(WXDIR)\include\msw\wx.rc
-    rc -r /i$(BCCDIR)\include /i$(WXDIR)\include\msw /i$(WXDIR)\contrib\fafa minimal
-
-clean:
-        -erase *.obj
-        -erase *.exe
-        -erase *.res
-        -erase *.map
-        -erase *.rws
diff --git a/samples/validate/makefile.sc b/samples/validate/makefile.sc
deleted file mode 100644
index 8709d2ca0f..0000000000
--- a/samples/validate/makefile.sc
+++ /dev/null
@@ -1,35 +0,0 @@
-# Symantec C++ makefile for minimal example
-# NOTE that peripheral libraries are now dealt in main wxWindows makefile.
-
-WXDIR = $(WXWIN)
-!include $(WXDIR)\src\makesc.env
-
-WXLIB = $(WXDIR)\lib\wx.lib
-INCDIR = $(WXDIR)\include
-MSWINC = $(INCDIR)\msw
-BASEINC = $(INCDIR)\base
-
-CC=sc
-RC=rc
-CFLAGS = -o -ml -W -Dwx_msw
-LDFLAGS = -ml -W
-
-INCLUDE=$(BASEINC);$(MSWINC)
-
-LIBS=$(WXLIB) libw.lib commdlg.lib shell.lib
-
-.$(SRCSUFF).obj:
-	*$(CC) -c $(CFLAGS) -I$(INCLUDE) $<
-
-.rc.res:
-	*$(RC) -r -I$(INCLUDE) $<
-
-minimal.exe: minimal.obj minimal.def minimal.res
-	*$(CC) $(LDFLAGS) -o$@ $** $(LIBS)
-
-clean:
-        -del *.obj
-	-del *.exe
-	-del *.res
-	-del *.map
-	-del *.rws
diff --git a/samples/validate/makefile.unx b/samples/validate/makefile.unx
deleted file mode 100644
index 9685d06789..0000000000
--- a/samples/validate/makefile.unx
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# File:		makefile.unx
-# Author:	Julian Smart
-# Created:	1993
-# Updated:	
-# Copyright:	(c) 1993, AIAI, University of Edinburgh
-#
-# "%W% %G%"
-#
-# Makefile for minimal example (UNIX).
-
-WXDIR = ../..
-
-# All common UNIX compiler flags and options are now in
-# this central makefile.
-include $(WXDIR)/src/make.env
-
-OBJECTS = $(OBJDIR)/minimal.$(OBJSUFF)
-
-.SUFFIXES:
-
-all:    $(OBJDIR) minimal$(GUISUFFIX)
-
-wx:
-
-
-motif:
-	$(MAKE) -f makefile.unx GUISUFFIX=_motif GUI=-Dwx_motif GUISUFFIX=_motif OPT='$(OPT)' LDLIBS='$(MOTIFLDLIBS)' WXLIB=$(WXDIR)/lib/libwx_motif.a  OPTIONS='$(OPTIONS)' DEBUG='$(DEBUG)' WARN='$(WARN)' XLIB='$(XLIB)' XINCLUDE='$(XINCLUDE)' XVIEW_LINK=
-
-xview:
-	cd $(WXDIR)/src/x; $(MAKE) -f makefile.unx xview
-	$(MAKE) -f makefile.unx GUI=-Dwx_xview GUISUFFIX=_ol CC=$(CC) OPTIONS='$(OPTIONS)' DEBUG='$(DEBUG)' WARN='$(WARN)' XLIB='$(XLIB)' XINCLUDE='$(XINCLUDE)'
-
-hp:
-	cd $(WXDIR)/src/x; $(MAKE) -f makefile.unx hp
-	$(MAKE) -f makefile.unx GUI=-Dwx_motif GUISUFFIX=_hp CC=CC DEBUG='$(DEBUG)' WARN='-w' \
-         XINCLUDE='$(HPXINCLUDE)' XLIB='$(HPXLIB)' XVIEW_LINK='' LDLIBS='$(HPLDLIBS)'
-
-$(OBJDIR):
-	mkdir $(OBJDIR)
-
-minimal$(GUISUFFIX):	$(OBJDIR)/minimal.$(OBJSUFF) $(WXLIB)
-	$(CC) $(LDFLAGS) -o minimal$(GUISUFFIX) $(OBJDIR)/minimal.$(OBJSUFF) $(XVIEW_LINK) $(LDLIBS)
-
-$(OBJDIR)/minimal.$(OBJSUFF):	minimal.$(SRCSUFF)
-	$(CC) -c $(CPPFLAGS) -o $@ minimal.$(SRCSUFF)
-
-clean_motif:
-	$(MAKE) -f makefile.unx GUISUFFIX=_motif cleanany
-
-clean_ol:
-	$(MAKE) -f makefile.unx GUISUFFIX=_ol cleanany
-
-clean_hp:
-	$(MAKE) -f makefile.unx GUISUFFIX=_hp cleanany
-
-cleanany:
-	rm -f $(OBJECTS) minimal$(GUISUFFIX) core
diff --git a/samples/validate/makefile.vms b/samples/validate/makefile.vms
deleted file mode 100644
index 9b76b144f3..0000000000
--- a/samples/validate/makefile.vms
+++ /dev/null
@@ -1,38 +0,0 @@
-#************************************************************************
-# Makefile for MINIMAL under VMS
-# by Stefan Hammes
-# (incomplete) update history:
-# 11.04.95
-#************************************************************************
-
-#************************************************************************
-# Definition section
-# (cave: definitions and includes must begin with ',')
-#************************************************************************
-
-APPOPTS = 
-APPDEFS = 
-APPINCS = 
-
-#************************************************************************
-# Module section
-#************************************************************************
-
-# Name of main module
-MAIN = minimal
-
-# Object modules of the application.
-OBJS = minimal.obj
-OBJLIST =minimal.obj
-
-.include [--.src]makevms.env
-
-# main dependency
-$(MAIN).exe : $(OBJS)
-    $(LINK) $(LINKFLAGS) /exec=$(MAIN).exe $(OBJLIST),$(WXLIB)/lib,$(OPTSFILE)/option
-    - purge *.exe
-
-#************************************************************************
-# Header file depedencies following
-#************************************************************************
-
diff --git a/samples/validate/makefile.wat b/samples/validate/makefile.wat
deleted file mode 100644
index 21219d7a0e..0000000000
--- a/samples/validate/makefile.wat
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Makefile for WATCOM
-#
-# Created by D.Chubraev, chubraev@iem.ee.ethz.ch
-# 8 Nov 1994
-#
-
-WXDIR = ..\.. 
-
-!include $(WXDIR)\src\makewat.env
-
-WXLIB = $(WXDIR)\lib
-NAME = minimal
-LNK = $(name).lnk
-OBJS = $(name).obj 
-
-all: $(name).exe
-
-$(name).exe : $(OBJS) $(name).res $(LNK) $(WXLIB)\wx$(LEVEL).lib
-    wlink @$(LNK)
-    $(BINDCOMMAND) $(name).res
-
-$(name).res :      $(name).rc $(WXDIR)\include\msw\wx.rc
-     $(RC) $(RESFLAGS1) $(name).rc
-
-$(LNK) : makefile.wat
-    %create $(LNK)
-    @%append $(LNK) debug all
-    @%append $(LNK) system $(LINKOPTION)
-    @%append $(LNK) $(MINDATA)
-    @%append $(LNK) $(MAXDATA)
-    @%append $(LNK) $(STACK)
-    @%append $(LNK) name $(name)
-    @%append $(LNK) file $(WXLIB)\wx$(LEVEL).lib
-    @for %i in ($(EXTRALIBS)) do @%append $(LNK) file %i
-    @for %i in ($(OBJS)) do @%append $(LNK) file %i
-
-thing: .SYMBOLIC
-    echo $(WATLIBDIR)
-
-clean:   .SYMBOLIC
-    -erase *.obj *.bak *.err *.pch *.lib *.lnk *.res *.exe
-