diff --git a/include/wx/generic/cross.xpm b/include/wx/generic/cross.xpm
new file mode 100644
index 0000000000..5192b65cc0
--- /dev/null
+++ b/include/wx/generic/cross.xpm
@@ -0,0 +1,32 @@
+/* XPM */
+static char *cross_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"10 10 16 1",
+"  c Gray0",
+". c #bf0000",
+"X c #00bf00",
+"o c #bfbf00",
+"O c #0000bf",
+"+ c #bf00bf",
+"@ c #00bfbf",
+"# c None",
+"$ c #808080",
+"% c Red",
+"& c Green",
+"* c Yellow",
+"= c Blue",
+"- c Magenta",
+"; c Cyan",
+": c Gray100",
+/* pixels */
+" ######## ",
+"   ####   ",
+"#   ##   #",
+"##      ##",
+"###    ###",
+"###    ###",
+"##      ##",
+"#   ##   #",
+"   ####   ",
+"  ######  "
+};
diff --git a/include/wx/generic/tick.xpm b/include/wx/generic/tick.xpm
new file mode 100644
index 0000000000..630eaf460f
--- /dev/null
+++ b/include/wx/generic/tick.xpm
@@ -0,0 +1,32 @@
+/* XPM */
+static char *tick_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"10 10 16 1",
+"  c Gray0",
+". c #bf0000",
+"X c #00bf00",
+"o c #bfbf00",
+"O c #0000bf",
+"+ c #bf00bf",
+"@ c #00bfbf",
+"# c None",
+"$ c #808080",
+"% c Red",
+"& c Green",
+"* c Yellow",
+"= c Blue",
+"- c Magenta",
+"; c Cyan",
+": c Gray100",
+/* pixels */
+"##########",
+"######## #",
+"#######   ",
+"######    ",
+"#####    #",
+"  ##    ##",
+"       ###",
+"#     ####",
+"##   #####",
+"### ######"
+};
diff --git a/samples/proplist/Makefile.am b/samples/proplist/Makefile.am
deleted file mode 100644
index 3631656b63..0000000000
--- a/samples/proplist/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-AUTOMAKE_OPTIONS = 1.3 no-dependencies
-
-SUFFIXES = .cpp
-
-DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE)
-
-noinst_PROGRAMS = test
-
-test_SOURCES = test.cpp
diff --git a/samples/proplist/makefile.unx b/samples/proplist/Makefile.in
similarity index 74%
rename from samples/proplist/makefile.unx
rename to samples/proplist/Makefile.in
index f874755623..a6a1f0d772 100644
--- a/samples/proplist/makefile.unx
+++ b/samples/proplist/Makefile.in
@@ -9,6 +9,10 @@
 #
 # Makefile for proplist example (UNIX).
 
+top_srcdir = @top_srcdir@
+top_builddir = ../..
+program_dir = samples/proplist
+
 PROGRAM=test
 
 OBJECTS=$(PROGRAM).o