diff --git a/samples/xrc/Makefile.in b/samples/xrc/Makefile.in
index 9b48a90b07..c13d41f484 100644
--- a/samples/xrc/Makefile.in
+++ b/samples/xrc/Makefile.in
@@ -204,7 +204,7 @@ xrcdemo$(EXEEXT): $(XRCDEMO_OBJECTS) $(__xrcdemo___win32rc)
 
 data: 
 	@mkdir -p ./rc
-	@for f in aui.xpm aui.xrc artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm objref.xrc objrefdlg.xpm uncenter.xrc update.gif variable.xpm variable.xrc variants.xpm variants.xrc throbber.gif stop.xpm wxbanner.gif; do \
+	@for f in aui.xpm aui.xrc artprov.xpm artprov.xrc basicdlg.xpm basicdlg2.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas2.xpm custclas.xrc derivdlg.xpm derivdlg2.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm uncenter2.xpm objref.xrc objrefdlg.xpm uncenter.xrc update.gif variable.xpm variable.xrc variants.xpm variants.xrc throbber.gif stop.xpm wxbanner.gif; do \
 	if test ! -f ./rc/$$f -a ! -d ./rc/$$f ; \
 	then x=yep ; \
 	else x=`find $(srcdir)/rc/$$f -newer ./rc/$$f -print` ; \
diff --git a/samples/xrc/makefile.gcc b/samples/xrc/makefile.gcc
index 33cd8e808e..e0cecb840e 100644
--- a/samples/xrc/makefile.gcc
+++ b/samples/xrc/makefile.gcc
@@ -246,7 +246,7 @@ $(OBJS)\xrcdemo.exe: $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_sample_rc.o
 
 data: 
 	if not exist $(OBJS)\rc mkdir $(OBJS)\rc
-	for %%f in (aui.xpm aui.xrc artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm objref.xrc objrefdlg.xpm uncenter.xrc update.gif variable.xpm variable.xrc variants.xpm variants.xrc throbber.gif stop.xpm wxbanner.gif) do if not exist $(OBJS)\rc\%%f copy .\rc\%%f $(OBJS)\rc
+	for %%f in (aui.xpm aui.xrc artprov.xpm artprov.xrc basicdlg.xpm basicdlg2.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas2.xpm custclas.xrc derivdlg.xpm derivdlg2.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm uncenter2.xpm objref.xrc objrefdlg.xpm uncenter.xrc update.gif variable.xpm variable.xrc variants.xpm variants.xrc throbber.gif stop.xpm wxbanner.gif) do if not exist $(OBJS)\rc\%%f copy .\rc\%%f $(OBJS)\rc
 
 $(OBJS)\xrcdemo_sample_rc.o: ./../../samples/sample.rc
 	$(WINDRES) -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --define wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST) --include-dir ./../../samples --define NOPCH
diff --git a/samples/xrc/makefile.vc b/samples/xrc/makefile.vc
index c6e8b88fa7..c85bd2f32e 100644
--- a/samples/xrc/makefile.vc
+++ b/samples/xrc/makefile.vc
@@ -455,7 +455,7 @@ $(OBJS)\xrcdemo.exe: $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_sample.res
 
 data: 
 	if not exist $(OBJS)\rc mkdir $(OBJS)\rc
-	for %f in (aui.xpm aui.xrc artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm objref.xrc objrefdlg.xpm uncenter.xrc update.gif variable.xpm variable.xrc variants.xpm variants.xrc throbber.gif stop.xpm wxbanner.gif) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc
+	for %f in (aui.xpm aui.xrc artprov.xpm artprov.xrc basicdlg.xpm basicdlg2.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas2.xpm custclas.xrc derivdlg.xpm derivdlg2.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm uncenter2.xpm objref.xrc objrefdlg.xpm uncenter.xrc update.gif variable.xpm variable.xrc variants.xpm variants.xrc throbber.gif stop.xpm wxbanner.gif) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc
 
 $(OBJS)\xrcdemo_sample.res: .\..\..\samples\sample.rc
 	rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_1)  $(__TARGET_CPU_COMPFLAG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1)  /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc
diff --git a/samples/xrc/rc/basicdlg2.xpm b/samples/xrc/rc/basicdlg2.xpm
new file mode 100644
index 0000000000..2aa77491d1
--- /dev/null
+++ b/samples/xrc/rc/basicdlg2.xpm
@@ -0,0 +1,40 @@
+/* XPM */
+static const char *const basicdlg_xpm[] = {
+"32 32 5 1",
+" 	c None",
+".	c #000000",
+"+	c #808080",
+"@	c #0000FF",
+"#	c #FFFFFF",
+"                                ",
+"                                ",
+"................................",
+"................................",
+"..++++++++++++++++++++++++++++..",
+"..++++++++++++++++++++++++++++..",
+"..++@@@@@@@@@@@@@@@@@@@@@@@@++..",
+"..++@@@@@@@@@@@@@@@@@@@@@@@@++..",
+"..++++++++++++++++++++++++++++..",
+"..++++++++++++++++++++++++++++..",
+"..++########################++..",
+"..++########################++..",
+"..++########################++..",
+"..++########################++..",
+"..++########################++..",
+"..++########################++..",
+"..++########################++..",
+"..++########################++..",
+"..++########################++..",
+"..++########################++..",
+"..++########################++..",
+"..++########################++..",
+"..++########################++..",
+"..++########################++..",
+"..++########################++..",
+"..++########################++..",
+"..++++++++++++++++++++++++++++..",
+"..++++++++++++++++++++++++++++..",
+"................................",
+"................................",
+"                                ",
+"                                "};
diff --git a/samples/xrc/rc/controls.xrc b/samples/xrc/rc/controls.xrc
index ed0cadffc9..78c96300d5 100644
--- a/samples/xrc/rc/controls.xrc
+++ b/samples/xrc/rc/controls.xrc
@@ -426,19 +426,19 @@ lay them out using wxSizers, absolute positioning, everything you like!
                                     <selection>2</selection>
                                     <object class="ownerdrawnitem">
                                         <text>This is a</text>
-                                        <bitmap>basicdlg.xpm</bitmap>
+                                        <bitmap>basicdlg.xpm;basicdlg2.xpm</bitmap>
                                      </object>
                                     <object class="ownerdrawnitem">
                                         <text>read-only</text>
-                                        <bitmap>derivdlg.xpm</bitmap>
+                                        <bitmap>derivdlg.xpm;derivdlg2.xpm</bitmap>
                                      </object>
                                     <object class="ownerdrawnitem">
                                         <text>wxBitmapComboBox</text>
-                                        <bitmap>uncenter.xpm</bitmap>
+                                        <bitmap>uncenter.xpm;uncenter2.xpm</bitmap>
                                      </object>
                                     <object class="ownerdrawnitem">
                                         <text>control</text>
-                                        <bitmap>custclas.xpm</bitmap>
+                                        <bitmap>custclas.xpm;custclas2.xpm</bitmap>
                                     </object>
                                 </object>
                             </object>
diff --git a/samples/xrc/rc/custclas2.xpm b/samples/xrc/rc/custclas2.xpm
new file mode 100644
index 0000000000..71735ef0dd
--- /dev/null
+++ b/samples/xrc/rc/custclas2.xpm
@@ -0,0 +1,42 @@
+/* XPM */
+static const char *const custclas_xpm[] = {
+"32 32 7 1",
+" 	c None",
+".	c #EBF70E",
+"+	c #000000",
+"@	c #808080",
+"#	c #0000FF",
+"$	c #FFFFFF",
+"%	c #0E2CEF",
+"                                ",
+"                                ",
+"      ..                        ",
+"      ..                        ",
+"      ..                        ",
+"      ..                        ",
+"  ..  ..  ..                    ",
+"  ..  ..  ..                    ",
+"    ......                      ",
+"    ......                      ",
+"......++........++++++++++++++++",
+"......++........++++++++++++++++",
+"++@@......@@@@@@@@@@@@@@@@@@@@++",
+"++@@......@@@@@@@@@@@@@@@@@@@@++",
+"++..##..##..########$$$$$$$$@@++",
+"++..##..##..########$$$$$$$$@@++",
+"++@@%%..%%%%%%%%%%%%$$$$$$$$@@++",
+"++@@%%..%%%%%%%%%%%%$$$$$$$$@@++",
+"++@@%%..%%%%%%%%%%%%$$$$$$$$@@++",
+"++@@%%..%%%%%%%%%%%%$$$$$$$$@@++",
+"++@@@@@@@@@@@@@@@@@@@@@@@@@@@@++",
+"++@@@@@@@@@@@@@@@@@@@@@@@@@@@@++",
+"++++++++++++++++++++++++++++++++",
+"++++++++++++++++++++++++++++++++",
+"                                ",
+"                                ",
+"                                ",
+"                                ",
+"                                ",
+"                                ",
+"                                ",
+"                                "};
diff --git a/samples/xrc/rc/derivdlg2.xpm b/samples/xrc/rc/derivdlg2.xpm
new file mode 100644
index 0000000000..c758f82e07
--- /dev/null
+++ b/samples/xrc/rc/derivdlg2.xpm
@@ -0,0 +1,41 @@
+/* XPM */
+static const char *const derivdlg_xpm[] = {
+"32 32 6 1",
+" 	c None",
+".	c #EBF70E",
+"+	c #000000",
+"@	c #808080",
+"#	c #0000FF",
+"$	c #FFFFFF",
+"      ..                        ",
+"      ..                        ",
+"++++++..++++++++++++++++++++++++",
+"++++++..++++++++++++++++++++++++",
+"++..@@..@@..@@@@@@@@@@@@@@@@@@++",
+"++..@@..@@..@@@@@@@@@@@@@@@@@@++",
+"++@@......##################@@++",
+"++@@......##################@@++",
+"......@@........@@@@@@@@@@@@@@++",
+"......@@........@@@@@@@@@@@@@@++",
+"++@@......$$$$$$$$$$$$$$$$$$@@++",
+"++@@......$$$$$$$$$$$$$$$$$$@@++",
+"++..$$..@@..@@@@@@@@@@@@$$$$@@++",
+"++..$$..@@..@@@@@@@@@@@@$$$$@@++",
+"++@@$$..@@@@@@@@@@@@@@@@$$$$@@++",
+"++@@$$..@@@@@@@@@@@@@@@@$$$$@@++",
+"++@@$$..$$$$$$$$$$$$$$$$$$$$@@++",
+"++@@$$..$$$$$$$$$$$$$$$$$$$$@@++",
+"++@@$$$$$$$$$$$$$$$$$$$$$$$$@@++",
+"++@@$$$$$$$$$$$$$$$$$$$$$$$$@@++",
+"++@@$$$$$$$$@@@@@@@@$$$$$$$$@@++",
+"++@@$$$$$$$$@@@@@@@@$$$$$$$$@@++",
+"++@@$$$$$$$$@@@@@@@@$$$$$$$$@@++",
+"++@@$$$$$$$$@@@@@@@@$$$$$$$$@@++",
+"++@@$$$$$$$$$$$$$$$$$$$$$$$$@@++",
+"++@@$$$$$$$$$$$$$$$$$$$$$$$$@@++",
+"++@@@@@@@@@@@@@@@@@@@@@@@@@@@@++",
+"++@@@@@@@@@@@@@@@@@@@@@@@@@@@@++",
+"++++++++++++++++++++++++++++++++",
+"++++++++++++++++++++++++++++++++",
+"                                ",
+"                                "};
diff --git a/samples/xrc/rc/uncenter2.xpm b/samples/xrc/rc/uncenter2.xpm
new file mode 100644
index 0000000000..88af876efc
--- /dev/null
+++ b/samples/xrc/rc/uncenter2.xpm
@@ -0,0 +1,40 @@
+/* XPM */
+static const char *const uncenter_xpm[] = {
+"32 32 5 1",
+" 	c None",
+".	c #000000",
+"+	c #808080",
+"@	c #0000FF",
+"#	c #FFFFFF",
+"                                ",
+"                                ",
+"................................",
+"................................",
+"..++++++++++++++++++++++++++++..",
+"..++++++++++++++++++++++++++++..",
+"..++@@@@@@@@@@@@@@@@@@@@@@@@++..",
+"..++@@@@@@@@@@@@@@@@@@@@@@@@++..",
+"..++++++++++++++++++++++++++++..",
+"..++++++++++++++++++++++++++++..",
+"..++########################++..",
+"..++########################++..",
+"..++######........##########++..",
+"..++######........##########++..",
+"..++######....##############++..",
+"..++######....##############++..",
+"..++######..##..############++..",
+"..++######..##..############++..",
+"..++######..####..##########++..",
+"..++######..####..##########++..",
+"..++##############..########++..",
+"..++##############..########++..",
+"..++################..######++..",
+"..++################..######++..",
+"..++########################++..",
+"..++########################++..",
+"..++++++++++++++++++++++++++++..",
+"..++++++++++++++++++++++++++++..",
+"................................",
+"................................",
+"                                ",
+"                                "};
diff --git a/samples/xrc/xrcdemo.bkl b/samples/xrc/xrcdemo.bkl
index d717303b8b..895615d54b 100644
--- a/samples/xrc/xrcdemo.bkl
+++ b/samples/xrc/xrcdemo.bkl
@@ -32,11 +32,11 @@
         <srcdir>$(SRCDIR)/rc</srcdir>
         <files>
             aui.xpm aui.xrc
-            artprov.xpm artprov.xrc basicdlg.xpm
-            basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc
-            derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc
+            artprov.xpm artprov.xrc basicdlg.xpm basicdlg2.xpm
+            basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas2.xpm custclas.xrc
+            derivdlg.xpm derivdlg2.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc
             fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif
-            resource.xrc toolbar.xrc uncenter.xpm
+            resource.xrc toolbar.xrc uncenter.xpm uncenter2.xpm
             objref.xrc objrefdlg.xpm
             uncenter.xrc update.gif
             variable.xpm variable.xrc