From: Julian Smart Date: Wed, 18 May 2005 15:01:36 +0000 (+0000) Subject: Updated images X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/93ccce60f4cbe8b2a3e14e15b8543d42646a47ad 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 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 51683572a3..b6296c5135 100644 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 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 c1b1e15caf..0000000000 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 index f3ef7918d2..0000000000 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 d6ef70a421..9b66868827 100644 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 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