From: Václav Slavík Date: Tue, 23 Mar 2004 23:19:30 +0000 (+0000) Subject: use shared samples icon X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/814e9c24c21afa37575ec161ec6711e1f6182f8b use shared samples icon git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26317 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/samples/taskbar/Makefile.in b/samples/taskbar/Makefile.in index cbff66dc99..f7a4f13ab0 100644 --- a/samples/taskbar/Makefile.in +++ b/samples/taskbar/Makefile.in @@ -41,9 +41,9 @@ LIBDIRNAME = $(top_builddir)lib TASKBAR_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) TASKBAR_OBJECTS = \ + $(__taskbar___win32rc) \ $(__taskbar_os2_lib_res) \ - taskbar_tbtest.o \ - $(__taskbar___win32rc) + taskbar_tbtest.o ### Conditionally set variables: ### @@ -69,6 +69,7 @@ TASKBAR_OBJECTS = \ COND_PLATFORM_OS2_1___taskbar___os2_emxbindcmd = $(NM) taskbar$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep taskbar$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__taskbar___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___taskbar___os2_emxbindcmd) +@COND_PLATFORM_WIN32_1@__taskbar___win32rc = taskbar_sample_rc.o @COND_PLATFORM_OS2_1@__taskbar_os2_lib_res = \ @COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__taskbar_bundle___depname = taskbar_bundle @@ -80,7 +81,6 @@ COND_MONOLITHIC_0___WXLIB_CORE_p = \ @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) -@COND_PLATFORM_WIN32_1@__taskbar___win32rc = taskbar_tbtest_rc.o COND_MONOLITHIC_1___WXLIB_MONO_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) @@ -156,12 +156,12 @@ taskbar.app/Contents/PkgInfo: taskbar$(EXEEXT) $(top_srcdir)/src/mac/Info.plist. @COND_PLATFORM_MACOSX_1@taskbar_bundle: taskbar.app/Contents/PkgInfo +taskbar_sample_rc.o: $(srcdir)/../../samples/sample.rc + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples --include-dir $(top_srcdir)/include + taskbar_tbtest.o: $(srcdir)/tbtest.cpp $(CXXC) -c -o $@ $(TASKBAR_CXXFLAGS) $< -taskbar_tbtest_rc.o: $(srcdir)/tbtest.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples --include-dir $(top_srcdir)/include - # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d diff --git a/samples/taskbar/makefile.bcc b/samples/taskbar/makefile.bcc index cb48aa5a6d..8c2e6848e2 100644 --- a/samples/taskbar/makefile.bcc +++ b/samples/taskbar/makefile.bcc @@ -168,13 +168,13 @@ clean: -if exist $(OBJS)\taskbar.ilf del $(OBJS)\taskbar.ilf -if exist $(OBJS)\taskbar.ils del $(OBJS)\taskbar.ils -$(OBJS)\taskbar.exe: $(TASKBAR_OBJECTS) $(OBJS)\taskbar_tbtest.res +$(OBJS)\taskbar.exe: $(TASKBAR_OBJECTS) $(OBJS)\taskbar_sample.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| - c0w32.obj $(TASKBAR_OBJECTS),$@,, $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\taskbar_tbtest.res + c0w32.obj $(TASKBAR_OBJECTS),$@,, $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\taskbar_sample.res | +$(OBJS)\taskbar_sample.res: .\..\..\samples\sample.rc + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i$(SETUPHDIR) -i. $(__DLLFLAG_p_1) -i.\..\..\samples $** + $(OBJS)\taskbar_tbtest.obj: .\tbtest.cpp $(CXX) -q -c -P -o$@ $(TASKBAR_CXXFLAGS) $** - -$(OBJS)\taskbar_tbtest.res: .\tbtest.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i$(SETUPHDIR) -i. $(__DLLFLAG_p_1) -i.\..\..\samples $** diff --git a/samples/taskbar/makefile.gcc b/samples/taskbar/makefile.gcc index cc001b8767..e53451d00f 100644 --- a/samples/taskbar/makefile.gcc +++ b/samples/taskbar/makefile.gcc @@ -22,8 +22,8 @@ TASKBAR_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ $(__DLLFLAG_p) -I.\..\..\samples $(__EXCEPTIONSFLAG_4) \ $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) TASKBAR_OBJECTS = \ - $(OBJS)\taskbar_tbtest.o \ - $(OBJS)\taskbar_tbtest_rc.o + $(OBJS)\taskbar_sample_rc.o \ + $(OBJS)\taskbar_tbtest.o ### Conditionally set variables: ### @@ -168,13 +168,13 @@ clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o -if exist $(OBJS)\taskbar.exe del $(OBJS)\taskbar.exe -$(OBJS)\taskbar.exe: $(TASKBAR_OBJECTS) $(OBJS)\taskbar_tbtest_rc.o +$(OBJS)\taskbar.exe: $(TASKBAR_OBJECTS) $(OBJS)\taskbar_sample_rc.o $(CXX) -o $@ $(TASKBAR_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 +$(OBJS)\taskbar_sample_rc.o: ./../../samples/sample.rc + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../include --include-dir $(SETUPHDIR) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples + $(OBJS)\taskbar_tbtest.o: ./tbtest.cpp $(CXX) -c -o $@ $(TASKBAR_CXXFLAGS) $< -$(OBJS)\taskbar_tbtest_rc.o: ./tbtest.rc - windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../include --include-dir $(SETUPHDIR) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples - .PHONY: all clean diff --git a/samples/taskbar/makefile.vc b/samples/taskbar/makefile.vc index f1f9bcb922..1786a6f4d1 100644 --- a/samples/taskbar/makefile.vc +++ b/samples/taskbar/makefile.vc @@ -23,8 +23,8 @@ TASKBAR_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \ $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) TASKBAR_OBJECTS = \ - $(OBJS)\taskbar_tbtest.obj \ - $(OBJS)\taskbar_tbtest.res + $(OBJS)\taskbar_sample.res \ + $(OBJS)\taskbar_tbtest.obj ### Conditionally set variables: ### @@ -252,13 +252,13 @@ clean: -if exist $(OBJS)\taskbar.ilk del $(OBJS)\taskbar.ilk -if exist $(OBJS)\taskbar.pdb del $(OBJS)\taskbar.pdb -$(OBJS)\taskbar.exe: $(TASKBAR_OBJECTS) $(OBJS)\taskbar_tbtest.res +$(OBJS)\taskbar.exe: $(TASKBAR_OBJECTS) $(OBJS)\taskbar_sample.res link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< $(TASKBAR_OBJECTS) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib << +$(OBJS)\taskbar_sample.res: .\..\..\samples\sample.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i .\..\..\include /i $(SETUPHDIR) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples $** + $(OBJS)\taskbar_tbtest.obj: .\tbtest.cpp $(CXX) /c /nologo /TP /Fo$@ $(TASKBAR_CXXFLAGS) $** - -$(OBJS)\taskbar_tbtest.res: .\tbtest.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i .\..\..\include /i $(SETUPHDIR) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples $** diff --git a/samples/taskbar/makefile.wat b/samples/taskbar/makefile.wat index 904c1d8807..d7d940300b 100644 --- a/samples/taskbar/makefile.wat +++ b/samples/taskbar/makefile.wat @@ -199,7 +199,7 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\taskbar.exe del $(OBJS)\taskbar.exe -$(OBJS)\taskbar.exe : $(TASKBAR_OBJECTS) $(OBJS)\taskbar_tbtest.res +$(OBJS)\taskbar.exe : $(TASKBAR_OBJECTS) $(OBJS)\taskbar_sample.res @%create $(OBJS)\taskbar.lbc @%append $(OBJS)\taskbar.lbc option quiet @%append $(OBJS)\taskbar.lbc name $^@ @@ -207,11 +207,11 @@ $(OBJS)\taskbar.exe : $(TASKBAR_OBJECTS) $(OBJS)\taskbar_tbtest.res @%append $(OBJS)\taskbar.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' @for %i in ($(TASKBAR_OBJECTS)) do @%append $(OBJS)\taskbar.lbc file %i @for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ) do @%append $(OBJS)\taskbar.lbc library %i - @%append $(OBJS)\taskbar.lbc option resource=$(OBJS)\taskbar_tbtest.res + @%append $(OBJS)\taskbar.lbc option resource=$(OBJS)\taskbar_sample.res wlink @$(OBJS)\taskbar.lbc +$(OBJS)\taskbar_sample.res : .AUTODEPEND .\..\..\samples\sample.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples $< + $(OBJS)\taskbar_tbtest.obj : .AUTODEPEND .\tbtest.cpp $(CXX) -zq -fo=$^@ $(TASKBAR_CXXFLAGS) $< - -$(OBJS)\taskbar_tbtest.res : .AUTODEPEND .\tbtest.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples $< diff --git a/samples/taskbar/mondrian.ico b/samples/taskbar/mondrian.ico deleted file mode 100644 index 2310c5d275..0000000000 Binary files a/samples/taskbar/mondrian.ico and /dev/null differ diff --git a/samples/taskbar/mondrian.xpm b/samples/taskbar/mondrian.xpm deleted file mode 100644 index f1846ef369..0000000000 --- a/samples/taskbar/mondrian.xpm +++ /dev/null @@ -1,34 +0,0 @@ -/* XPM */ -static char * mondrian_xpm[] = { -"16 16 15 1", -" c None", -". c #400000", -"+ c #800000", -"@ c #808080", -"# c #404040", -"$ c #FF0000", -"% c #FFFFFF", -"& c #000040", -"* c #000080", -"= c #0000FF", -"- c #808000", -"; c #003000", -"> c #006000", -", c #FFFF00", -"' c #00BF00", -".++.@@@@@@@@@@@#", -"+$$+%%%%%%%%%%%@", -"+$$+%%%%%%%%%%%@", -"+$$+%%%%%%%%%%%@", -"#@@#@@@@@@@@@&*&", -"@%%@%%%%%%%%%*=*", -"@%%@%%%%%%%%%*=*", -"@%%@%%%%%%%%%#@#", -"@%%@%%%%%%%%%@%@", -"@%%@%%%%%%%%%@%@", -"@%%@%%%%%%%%%@%@", -"@%%@%%%%%%%%%@%@", -"@%%@------;>>@%@", -"@%%@,,,,,,>''@%@", -"@%%@,,,,,,>''@%@", -"#@@#------;>>#@#"}; diff --git a/samples/taskbar/taskbar.bkl b/samples/taskbar/taskbar.bkl index 730a2aa9d2..4cdc7a14e2 100644 --- a/samples/taskbar/taskbar.bkl +++ b/samples/taskbar/taskbar.bkl @@ -8,7 +8,6 @@ adv core base - tbtest.rc diff --git a/samples/taskbar/taskbar.dsp b/samples/taskbar/taskbar.dsp index 7d0cea5320..e82d28df1e 100644 --- a/samples/taskbar/taskbar.dsp +++ b/samples/taskbar/taskbar.dsp @@ -468,11 +468,11 @@ LINK32=link.exe # PROP Default_Filter "" # Begin Source File -SOURCE=.\tbtest.cpp +SOURCE=.\..\..\samples\sample.rc # End Source File # Begin Source File -SOURCE=.\tbtest.rc +SOURCE=.\tbtest.cpp # End Source File # End Group # End Target diff --git a/samples/taskbar/tbtest.rc b/samples/taskbar/tbtest.rc deleted file mode 100644 index 7655c62a4c..0000000000 --- a/samples/taskbar/tbtest.rc +++ /dev/null @@ -1,3 +0,0 @@ -mondrian ICON "mondrian.ico" -#include "wx/msw/wx.rc" -