Updated images

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

diff --git a/samples/xrc/Makefile.in b/samples/xrc/Makefile.in
index cf8ce80d296846f5b819527fdd1052a7d00c35f4..6bf1a437f7c6518eecc45e78d12fa4ac8579a942 100644 (file)
--- 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 ff656ce73803167110ed9bf27a08b04ba55e64b6..e0308e7c3ed35bd3c7b2b498938e0b8e826f2517 100644 (file)
--- 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 237c8e13db31ba924cffe5ae658924b8d44fcd4d..c85a4f4ccc89344eabfb3cdaac94ac97a2e2a92b 100644 (file)
--- 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 9a31119ff5eef8b2c61f1617f349d0183dd9a65a..91607ca8bc8ecadf40246abaa6d834bb8a99f3d4 100644 (file)
--- 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 e25b80ceb1e5628b91c309578b7577490a44c681..5671cb6a5744566ee19f155dffef86dbf282b346 100644 (file)
--- 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 (file)
Binary files a/samples/xrc/rc/fuzzy.gif and b/samples/xrc/rc/fuzzy.gif differ

diff --git a/samples/xrc/rc/platform.xpm b/samples/xrc/rc/platform.xpm
index 8702c4bbf288470392fbe916fa0487ee5a1c5124..3737055fe767bf1cd49a6c4bcdc3611a965ad942 100644 (file)
--- a/samples/xrc/rc/platform.xpm
+++ b/samples/xrc/rc/platform.xpm
@@ -1,21 +1,28 @@
-/* XPM */\r
-static char * platform_xpm[] = {\r
-"16 16 2 1",\r
-"      c None",\r
-".     c #0000FF",\r
-"                ",\r
-"         ..     ",\r
-"        ..      ",\r
-"        .       ",\r
-"    ...  ....   ",\r
-"   ...........  ",\r
-"   ..........   ",\r
-"  ..........    ",\r
-"  ..........    ",\r
-"  ..........    ",\r
-"  ...........   ",\r
-"   ...........  ",\r
-"   ...........  ",\r
-"    .........   ",\r
-"     ... ...    ",\r
-"                "};\r
+/* 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 (file)
index c1b1e15..0000000
Binary files a/samples/xrc/rc/scanning.gif and /dev/null differ

diff --git a/samples/xrc/rc/sppicon.ico b/samples/xrc/rc/sppicon.ico
deleted file mode 100644 (file)
index f3ef791..0000000
Binary files a/samples/xrc/rc/sppicon.ico and /dev/null differ

diff --git a/samples/xrc/rc/update.gif b/samples/xrc/rc/update.gif
index d6ef70a42195bbe2bfdfa65bc7b9337be8976817..9b66868827ac06fd8d93b3eedef9346057d305b1 100644 (file)
Binary files a/samples/xrc/rc/update.gif and b/samples/xrc/rc/update.gif differ

diff --git a/samples/xrc/xrcdemo.bkl b/samples/xrc/xrcdemo.bkl
index 0d008d4951157e61b56b997762a51fc9818cdf39..8133e86db0e440e366edfdfeb38bfdff6fd7e280 100644 (file)
--- 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>