diff --git a/build/cmake/samples/CMakeLists.txt b/build/cmake/samples/CMakeLists.txt index 82357c1604..f6da7a9467 100644 --- a/build/cmake/samples/CMakeLists.txt +++ b/build/cmake/samples/CMakeLists.txt @@ -142,7 +142,7 @@ wx_add_sample(stc stctest.cpp edit.cpp prefs.cpp edit.h defsext.h prefs.h DATA stctest.cpp NAME stctest LIBRARIES wxstc DEPENDS wxUSE_STC) wx_add_sample(svg svgtest.cpp RES svgtest.rc DEPENDS wxUSE_SVG) wx_add_sample(taborder) -wx_add_sample(taskbar tbtest.cpp tbtest.h DEPENDS wxUSE_TASKBARICON) +wx_add_sample(taskbar tbtest.cpp tbtest.h DATA info.svg DEPENDS wxUSE_TASKBARICON) wx_add_sample(text DEPENDS wxUSE_TEXTCTRL) wx_add_sample(thread DEPENDS wxUSE_THREADS) wx_add_sample(toolbar RES toolbar.rc DEPENDS wxUSE_TOOLBAR) @@ -218,7 +218,7 @@ wx_list_add_prefix(WIDGETS_RC_FILES icons/ wx_add_sample(widgets IMPORTANT ${SAMPLE_WIDGETS_SRC} DATA ${WIDGETS_RC_FILES} textctrl.cpp ../image/toucan.png:toucan.png ) -wx_add_sample(wizard DEPENDS wxUSE_WIZARDDLG) +wx_add_sample(wizard DATA wiztest.svg wiztest2.svg DEPENDS wxUSE_WIZARDDLG) wx_add_sample(wrapsizer) wx_list_add_prefix(XRC_RC_FILES rc/ diff --git a/build/cmake/samples/html.cmake b/build/cmake/samples/html.cmake index 03097ca497..af782aa593 100644 --- a/build/cmake/samples/html.cmake +++ b/build/cmake/samples/html.cmake @@ -10,7 +10,7 @@ set(wxSAMPLE_FOLDER html) set(wxSAMPLE_SUBDIR html/) -wx_add_sample(about DATA data/about.htm data/logo.png LIBRARIES wxhtml) +wx_add_sample(about DATA data/about.htm data/logo.png data/bg.svg LIBRARIES wxhtml) wx_list_add_prefix(HELP_DATA_FILES helpfiles/ Index.hhk another.hhc diff --git a/samples/html/about/Makefile.in b/samples/html/about/Makefile.in index cd5cfc4b70..9f2b476d56 100644 --- a/samples/html/about/Makefile.in +++ b/samples/html/about/Makefile.in @@ -189,7 +189,7 @@ about$(EXEEXT): $(ABOUT_OBJECTS) $(__about___win32rc) data_files: @mkdir -p ./data - @for f in about.htm logo.png; do \ + @for f in about.htm bg.svg logo.png; do \ if test ! -f ./data/$$f -a ! -d ./data/$$f ; \ then x=yep ; \ else x=`find $(srcdir)/data/$$f -newer ./data/$$f -print` ; \ diff --git a/samples/html/about/about.bkl b/samples/html/about/about.bkl index f6486e0efa..074f8e9d65 100644 --- a/samples/html/about/about.bkl +++ b/samples/html/about/about.bkl @@ -15,7 +15,7 @@ $(BUILDDIR)/data $(SRCDIR)/data - about.htm logo.png + about.htm bg.svg logo.png diff --git a/samples/html/about/makefile.gcc b/samples/html/about/makefile.gcc index 61d6fb308e..2c674746cc 100644 --- a/samples/html/about/makefile.gcc +++ b/samples/html/about/makefile.gcc @@ -226,7 +226,7 @@ $(OBJS)\about.exe: $(ABOUT_OBJECTS) $(OBJS)\about_sample_rc.o data_files: if not exist $(OBJS)\data mkdir $(OBJS)\data - for %%f in (about.htm logo.png) do if not exist $(OBJS)\data\%%f copy .\data\%%f $(OBJS)\data + for %%f in (about.htm bg.svg logo.png) do if not exist $(OBJS)\data\%%f copy .\data\%%f $(OBJS)\data $(OBJS)\about_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/html/about/makefile.vc b/samples/html/about/makefile.vc index d651152eff..b2f876f57c 100644 --- a/samples/html/about/makefile.vc +++ b/samples/html/about/makefile.vc @@ -435,7 +435,7 @@ $(OBJS)\about.exe: $(ABOUT_OBJECTS) $(OBJS)\about_sample.res data_files: if not exist $(OBJS)\data mkdir $(OBJS)\data - for %f in (about.htm logo.png) do if not exist $(OBJS)\data\%f copy .\data\%f $(OBJS)\data + for %f in (about.htm bg.svg logo.png) do if not exist $(OBJS)\data\%f copy .\data\%f $(OBJS)\data $(OBJS)\about_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/taskbar/Makefile.in b/samples/taskbar/Makefile.in index d5aacfd470..5545bdbf83 100644 --- a/samples/taskbar/Makefile.in +++ b/samples/taskbar/Makefile.in @@ -134,7 +134,7 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \ ### Targets: ### -all: taskbar$(EXEEXT) $(__taskbar_bundle___depname) +all: taskbar$(EXEEXT) $(__taskbar_bundle___depname) data install: @@ -182,6 +182,18 @@ taskbar$(EXEEXT): $(TASKBAR_OBJECTS) $(__taskbar___win32rc) @COND_PLATFORM_MACOSX_1@taskbar_bundle: $(____taskbar_BUNDLE_TGT_REF_DEP) +data: + @mkdir -p . + @for f in info.svg; do \ + if test ! -f ./$$f -a ! -d ./$$f ; \ + then x=yep ; \ + else x=`find $(srcdir)/$$f -newer ./$$f -print` ; \ + fi; \ + case "$$x" in ?*) \ + cp -pRf $(srcdir)/$$f . ;; \ + esac; \ + done + taskbar_sample_rc.o: $(srcdir)/../../samples/sample.rc $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include @@ -192,4 +204,4 @@ taskbar_tbtest.o: $(srcdir)/tbtest.cpp # Include dependency info, if present: @IF_GNU_MAKE@-include ./.deps/*.d -.PHONY: all install uninstall clean distclean taskbar_bundle +.PHONY: all install uninstall clean distclean taskbar_bundle data diff --git a/samples/taskbar/icon.svg b/samples/taskbar/icon.svg deleted file mode 100644 index cbf82fdafa..0000000000 --- a/samples/taskbar/icon.svg +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/samples/taskbar/makefile.gcc b/samples/taskbar/makefile.gcc index 41bf6a51a8..bc5aa2e270 100644 --- a/samples/taskbar/makefile.gcc +++ b/samples/taskbar/makefile.gcc @@ -207,7 +207,7 @@ $(OBJS): ### Targets: ### -all: $(OBJS)\taskbar.exe +all: $(OBJS)\taskbar.exe data clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o @@ -220,13 +220,17 @@ $(OBJS)\taskbar.exe: $(TASKBAR_OBJECTS) $(OBJS)\taskbar_sample_rc.o $(CXX) -o $@ @$@.rsp $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lws2_32 -lwininet -loleacc -luxtheme @-del $@.rsp +data: + if not exist $(OBJS) mkdir $(OBJS) + for %%f in (info.svg) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS) + $(OBJS)\taskbar_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 $(OBJS)\taskbar_tbtest.o: ./tbtest.cpp $(CXX) -c -o $@ $(TASKBAR_CXXFLAGS) $(CPPDEPS) $< -.PHONY: all clean +.PHONY: all clean data SHELL := $(COMSPEC) diff --git a/samples/taskbar/makefile.vc b/samples/taskbar/makefile.vc index 43c198e407..72475ab8d4 100644 --- a/samples/taskbar/makefile.vc +++ b/samples/taskbar/makefile.vc @@ -414,7 +414,7 @@ $(OBJS): ### Targets: ### -all: $(OBJS)\taskbar.exe +all: $(OBJS)\taskbar.exe data clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj @@ -429,6 +429,10 @@ $(OBJS)\taskbar.exe: $(TASKBAR_OBJECTS) $(OBJS)\taskbar_sample.res $(TASKBAR_OBJECTS) $(TASKBAR_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib << +data: + if not exist $(OBJS) mkdir $(OBJS) + for %f in (info.svg) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + $(OBJS)\taskbar_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/taskbar/taskbar.bkl b/samples/taskbar/taskbar.bkl index d861910f93..f322ca73c0 100644 --- a/samples/taskbar/taskbar.bkl +++ b/samples/taskbar/taskbar.bkl @@ -10,4 +10,8 @@ base + + info.svg + + diff --git a/samples/taskbar/tbtest.cpp b/samples/taskbar/tbtest.cpp index 6a1f957343..b91ebb6134 100644 --- a/samples/taskbar/tbtest.cpp +++ b/samples/taskbar/tbtest.cpp @@ -27,6 +27,7 @@ #include "smile.xpm" #include "smile2.xpm" +#include "wx/artprov.h" #include "wx/taskbar.h" #include "tbtest.h" @@ -119,7 +120,7 @@ MyDialog::MyDialog(const wxString& title) m_taskBarIcon = new MyTaskBarIcon(); // we should be able to show up to 128 characters on Windows - if (!m_taskBarIcon->SetIcon(wxBitmapBundle::FromSVGFile("icon.svg", wxSize(32, 32)), + if (!m_taskBarIcon->SetIcon(wxArtProvider::GetBitmapBundle(wxART_WX_LOGO, wxART_OTHER, wxSize(32, 32)), "wxTaskBarIcon Sample\n" "With a very, very, very, very\n" "long tooltip whose length is\n" @@ -130,7 +131,7 @@ MyDialog::MyDialog(const wxString& title) #if defined(__WXOSX__) && wxOSX_USE_COCOA m_dockIcon = new MyTaskBarIcon(wxTBI_DOCK); - if ( !m_dockIcon->SetIcon(wxBitmapBundle::FromSVGFile("icon.svg", wxSize(32, 32))) ) + if ( !m_dockIcon->SetIcon(wxArtProvider::GetBitmapBundle(wxART_WX_LOGO, wxART_OTHER, wxSize(32, 32))) ) { wxLogError("Could not set icon."); } diff --git a/samples/wizard/Makefile.in b/samples/wizard/Makefile.in index 9d568c19d4..e77b1db7b0 100644 --- a/samples/wizard/Makefile.in +++ b/samples/wizard/Makefile.in @@ -134,7 +134,7 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \ ### Targets: ### -all: wizard$(EXEEXT) $(__wizard_bundle___depname) +all: wizard$(EXEEXT) $(__wizard_bundle___depname) data install: @@ -182,6 +182,18 @@ wizard$(EXEEXT): $(WIZARD_OBJECTS) $(__wizard___win32rc) @COND_PLATFORM_MACOSX_1@wizard_bundle: $(____wizard_BUNDLE_TGT_REF_DEP) +data: + @mkdir -p . + @for f in wiztest.svg wiztest2.svg; do \ + if test ! -f ./$$f -a ! -d ./$$f ; \ + then x=yep ; \ + else x=`find $(srcdir)/$$f -newer ./$$f -print` ; \ + fi; \ + case "$$x" in ?*) \ + cp -pRf $(srcdir)/$$f . ;; \ + esac; \ + done + wizard_sample_rc.o: $(srcdir)/../../samples/sample.rc $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include @@ -192,4 +204,4 @@ wizard_wizard.o: $(srcdir)/wizard.cpp # Include dependency info, if present: @IF_GNU_MAKE@-include ./.deps/*.d -.PHONY: all install uninstall clean distclean wizard_bundle +.PHONY: all install uninstall clean distclean wizard_bundle data diff --git a/samples/wizard/makefile.gcc b/samples/wizard/makefile.gcc index 50fcff2179..e73e2a7dfc 100644 --- a/samples/wizard/makefile.gcc +++ b/samples/wizard/makefile.gcc @@ -207,7 +207,7 @@ $(OBJS): ### Targets: ### -all: $(OBJS)\wizard.exe +all: $(OBJS)\wizard.exe data clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o @@ -220,13 +220,17 @@ $(OBJS)\wizard.exe: $(WIZARD_OBJECTS) $(OBJS)\wizard_sample_rc.o $(CXX) -o $@ @$@.rsp $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lws2_32 -lwininet -loleacc -luxtheme @-del $@.rsp +data: + if not exist $(OBJS) mkdir $(OBJS) + for %%f in (wiztest.svg wiztest2.svg) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS) + $(OBJS)\wizard_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 $(OBJS)\wizard_wizard.o: ./wizard.cpp $(CXX) -c -o $@ $(WIZARD_CXXFLAGS) $(CPPDEPS) $< -.PHONY: all clean +.PHONY: all clean data SHELL := $(COMSPEC) diff --git a/samples/wizard/makefile.vc b/samples/wizard/makefile.vc index 69b4590772..66801b7a3a 100644 --- a/samples/wizard/makefile.vc +++ b/samples/wizard/makefile.vc @@ -414,7 +414,7 @@ $(OBJS): ### Targets: ### -all: $(OBJS)\wizard.exe +all: $(OBJS)\wizard.exe data clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj @@ -429,6 +429,10 @@ $(OBJS)\wizard.exe: $(WIZARD_OBJECTS) $(OBJS)\wizard_sample.res $(WIZARD_OBJECTS) $(WIZARD_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib << +data: + if not exist $(OBJS) mkdir $(OBJS) + for %f in (wiztest.svg wiztest2.svg) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + $(OBJS)\wizard_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/wizard/wizard.bkl b/samples/wizard/wizard.bkl index ad5630fac6..f5aa689f5b 100644 --- a/samples/wizard/wizard.bkl +++ b/samples/wizard/wizard.bkl @@ -9,4 +9,11 @@ base + + + wiztest.svg + wiztest2.svg + + +