From 93ccce60f4cbe8b2a3e14e15b8543d42646a47ad Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Wed, 18 May 2005 15:01:36 +0000
Subject: [PATCH] Updated images

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34133 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 samples/xrc/Makefile.in     |   2 +-
 samples/xrc/makefile.bcc    |   2 +-
 samples/xrc/makefile.gcc    |   2 +-
 samples/xrc/makefile.vc     |   2 +-
 samples/xrc/makefile.wat    |   2 +-
 samples/xrc/rc/fuzzy.gif    | Bin 338 -> 116 bytes
 samples/xrc/rc/platform.xpm |  49 ++++++++++++++++++++----------------
 samples/xrc/rc/scanning.gif | Bin 3418 -> 0 bytes
 samples/xrc/rc/sppicon.ico  | Bin 1078 -> 0 bytes
 samples/xrc/rc/update.gif   | Bin 99 -> 124 bytes
 samples/xrc/xrcdemo.bkl     |   2 +-
 11 files changed, 34 insertions(+), 27 deletions(-)
 delete mode 100644 samples/xrc/rc/scanning.gif
 delete mode 100644 samples/xrc/rc/sppicon.ico

diff --git a/samples/xrc/Makefile.in b/samples/xrc/Makefile.in
index cf8ce80d29..6bf1a437f7 100644
--- a/samples/xrc/Makefile.in
+++ b/samples/xrc/Makefile.in
@@ -193,7 +193,7 @@ xrcdemo.app/Contents/PkgInfo: xrcdemo$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info
 
 data: 
 	@mkdir -p ./rc
-	@for f in appicon.ico appicon.xpm 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 scanning.gif sppicon.ico toolbar.xrc uncenter.xpm uncenter.xrc update.gif variable.xpm variable.xrc; do \
+	@for f in appicon.ico appicon.xpm 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 uncenter.xrc update.gif variable.xpm variable.xrc; do \
 	if test ! -f ./rc/$$f ; \
 	then x=yep ; \
 	else x=`find $(srcdir)/rc/$$f -newer ./rc/$$f -print` ; \
diff --git a/samples/xrc/makefile.bcc b/samples/xrc/makefile.bcc
index ff656ce738..e0308e7c3e 100644
--- a/samples/xrc/makefile.bcc
+++ b/samples/xrc/makefile.bcc
@@ -231,7 +231,7 @@ $(OBJS)\xrcdemo.exe: $(XRCDEMO_OBJECTS)  $(OBJS)\xrcdemo_xrcdemo.res
 
 data: 
 	if not exist $(OBJS)\rc mkdir $(OBJS)\rc
-	for %f in (appicon.ico appicon.xpm 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 scanning.gif sppicon.ico toolbar.xrc uncenter.xpm uncenter.xrc update.gif variable.xpm variable.xrc) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc
+	for %f in (appicon.ico appicon.xpm 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 uncenter.xrc update.gif variable.xpm variable.xrc) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc
 
 $(OBJS)\xrcdemo_xrcdemo.obj: .\xrcdemo.cpp
 	$(CXX) -q -c -P -o$@ $(XRCDEMO_CXXFLAGS) $**
diff --git a/samples/xrc/makefile.gcc b/samples/xrc/makefile.gcc
index 237c8e13db..c85a4f4ccc 100644
--- a/samples/xrc/makefile.gcc
+++ b/samples/xrc/makefile.gcc
@@ -222,7 +222,7 @@ $(OBJS)\xrcdemo.exe: $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_xrcdemo_rc.o
 
 data: 
 	if not exist $(OBJS)\rc mkdir $(OBJS)\rc
-	for %%f in (appicon.ico appicon.xpm 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 scanning.gif sppicon.ico toolbar.xrc uncenter.xpm uncenter.xrc update.gif variable.xpm variable.xrc) do if not exist $(OBJS)\rc\%%f copy .\rc\%%f $(OBJS)\rc
+	for %%f in (appicon.ico appicon.xpm 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 uncenter.xrc update.gif variable.xpm variable.xrc) do if not exist $(OBJS)\rc\%%f copy .\rc\%%f $(OBJS)\rc
 
 $(OBJS)\xrcdemo_xrcdemo.o: ./xrcdemo.cpp
 	$(CXX) -c -o $@ $(XRCDEMO_CXXFLAGS) $<
diff --git a/samples/xrc/makefile.vc b/samples/xrc/makefile.vc
index 9a31119ff5..91607ca8bc 100644
--- a/samples/xrc/makefile.vc
+++ b/samples/xrc/makefile.vc
@@ -282,7 +282,7 @@ $(OBJS)\xrcdemo.exe: $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_xrcdemo.res
 
 data: 
 	if not exist $(OBJS)\rc mkdir $(OBJS)\rc
-	for %f in (appicon.ico appicon.xpm 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 scanning.gif sppicon.ico toolbar.xrc uncenter.xpm uncenter.xrc update.gif variable.xpm variable.xrc) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc
+	for %f in (appicon.ico appicon.xpm 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 uncenter.xrc update.gif variable.xpm variable.xrc) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc
 
 $(OBJS)\xrcdemo_xrcdemo.obj: .\xrcdemo.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(XRCDEMO_CXXFLAGS) $**
diff --git a/samples/xrc/makefile.wat b/samples/xrc/makefile.wat
index e25b80ceb1..5671cb6a57 100644
--- a/samples/xrc/makefile.wat
+++ b/samples/xrc/makefile.wat
@@ -269,7 +269,7 @@ $(OBJS)\xrcdemo.exe :  $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_xrcdemo.res
 
 data : .SYMBOLIC 
 	if not exist $(OBJS)\rc mkdir $(OBJS)\rc
-	for %f in (appicon.ico appicon.xpm 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 scanning.gif sppicon.ico toolbar.xrc uncenter.xpm uncenter.xrc update.gif variable.xpm variable.xrc) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc
+	for %f in (appicon.ico appicon.xpm 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 uncenter.xrc update.gif variable.xpm variable.xrc) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc
 
 $(OBJS)\xrcdemo_xrcdemo.obj :  .AUTODEPEND .\xrcdemo.cpp
 	$(CXX) -zq -fo=$^@ $(XRCDEMO_CXXFLAGS) $<
diff --git a/samples/xrc/rc/fuzzy.gif b/samples/xrc/rc/fuzzy.gif
index 51683572a39198c19305042a72e62294d611d220..b6296c5135d6cab1bb1780faa890c6e6f73ab104 100644
GIT binary patch
literal 116
zcmZ?wbhEHb6ky<I*vtR||Ns97(?k(EAXOl}3@n-kCp=g4Dm?EtWxd8$cQtI*<%&fT
c>I=1&SADA7m^-g6VNJb-{D$V}NF@eq0R5O4zW@LL

literal 338
zcmZ?wbhEHb6ky<ISjxa4B_$;%C)e58`T6tb|NsBDx3@DeFns_1y|lDcRaLd8rza&P
zrM9+KNl7UxD$2pZ;ra9DzkdC?apQ)ywY9CS?c>LfLqbCI^z@RFl3ZL|%FD~oojcdn
z)ph*%@gF~a%$hap%9Sg=zP{ex-VYx>3<wCgdGqGGckj-hKfh?vqTb%#d-v|0K7Beb
zFHcBFC^0e7)6>(&#s=sN;(_8%7Dg@xdj=h#vl&2sVqnWZFu&jjGYi9!CjkZuJS<*G
zjSfr27TF(WY*Z-VZ%c97s9+$GR&v;}#zE=o4izKCAgzyCM~gg@K7~jI@;9(ZHMdGP
zdCG*y%CX4F%PA<jC@HhBtEj4}^Uu{tjMUW9*3s3|(_g8n?_!{05V2*8BZD;nmb#%y

diff --git a/samples/xrc/rc/platform.xpm b/samples/xrc/rc/platform.xpm
index 8702c4bbf2..3737055fe7 100644
--- a/samples/xrc/rc/platform.xpm
+++ b/samples/xrc/rc/platform.xpm
@@ -1,21 +1,28 @@
-/* XPM */
-static char * platform_xpm[] = {
-"16 16 2 1",
-" 	c None",
-".	c #0000FF",
-"                ",
-"         ..     ",
-"        ..      ",
-"        .       ",
-"    ...  ....   ",
-"   ...........  ",
-"   ..........   ",
-"  ..........    ",
-"  ..........    ",
-"  ..........    ",
-"  ...........   ",
-"   ...........  ",
-"   ...........  ",
-"    .........   ",
-"     ... ...    ",
-"                "};
+/* XPM */
+static char *platform_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 6 1",
+". c Black",
+"o c #FFFFFF",
+"X c #000080",
+"O c #FFFF00",
+"  c None",
+"+ c #FF0000",
+/* pixels */
+"                ",
+"                ",
+"                ",
+"    .......     ",
+"    .XXXXX.     ",
+"    .oXXXX.     ",
+"    .oXXX.......",
+".....oXXX.OOOOO.",
+".+++.XXXX.oOOOO.",
+".o++......oOOOO.",
+".o++++.  .oOOOO.",
+".o++++.  .OOOOO.",
+".+++++.  .......",
+".......         ",
+"                ",
+"                "
+};
diff --git a/samples/xrc/rc/scanning.gif b/samples/xrc/rc/scanning.gif
deleted file mode 100644
index c1b1e15caf32f4de18a98b25f8c8aca6f0e8b9ef..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3418
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
GZ2b?O4sMzN

diff --git a/samples/xrc/rc/sppicon.ico b/samples/xrc/rc/sppicon.ico
deleted file mode 100644
index f3ef7918d273b912ce9d18f570cec891290ad3c7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1078
zcmcgqF>ZuF3^b=mX?X%wbkEoVDP7)j9j&{i%a?cn65mKkmj-DwW8({}i%zE~%7E=1
zukH03L>f6s+qOcS8<7{-u5<oz5_yB~3?Drmq>(3Rk;$|xj}C{5;1yLj&{)beO|aZ3
z_DU&SLGaK;z5{N<=+Nwb+GQ&R7J8vw3YG^R`<9?N^83C|DQSiUG!F*d>yO{(dME7W
zH^Mn}kOYZ2DP|b>t2srzM{V45w{d@;!Z2ulj|tFzKE^S60NUd>=W}o@2)J#3TUP6~
z%+BYs;!Bhj0o+H}&ddB0M_Lt+w7MPws`Gd-aqWkl0@r?xnezVc@_K-`^RwTID)Ex>
epMk$#hUd#2ZizSb>f=Ub(IcYQqwl}gJo^hm2;JWR

diff --git a/samples/xrc/rc/update.gif b/samples/xrc/rc/update.gif
index d6ef70a42195bbe2bfdfa65bc7b9337be8976817..9b66868827ac06fd8d93b3eedef9346057d305b1 100644
GIT binary patch
literal 124
zcmZ?wbhEHb<Y(Y#*vtR|#?7<;|NjqW5+-y&N<exUSPTssJheF@y3U#lh<_`MQJs_^
o-gk{-Uc&2xpVmx#S6%%gD#|SE>~qFfMLQL^)U&oS2{Kp%07nrWP5=M^

literal 99
zcmZ?wbhEHb<Y(Y#SjYeZ|NsAIsAn*4o~`(kg^`PanL!663X*4FGLh-yJS@g9&(VEW
yLuHd;2T$nq@3o50ZJ)hdqF3E0pi!pKyK4KC>Dp73OS5JqZa8eLF|C`4!5RP~=N`@g

diff --git a/samples/xrc/xrcdemo.bkl b/samples/xrc/xrcdemo.bkl
index 0d008d4951..8133e86db0 100644
--- a/samples/xrc/xrcdemo.bkl
+++ b/samples/xrc/xrcdemo.bkl
@@ -27,7 +27,7 @@
             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 scanning.gif sppicon.ico toolbar.xrc uncenter.xpm
+            resource.xrc toolbar.xrc uncenter.xpm
             uncenter.xrc update.gif variable.xpm variable.xrc
         </files>
     </wx-data>
-- 
2.50.0