Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Copy SVG files with samples

Browse Source 
Add few recently added SVG files used for bitmap bundles in samples
also to bakefiles and CMakeLists.

Closes #22197.
This commit is contained in:
PB
2022-03-15 22:28:35 +01:00
committed by Vadim Zeitlin
parent 0d37f733b5
commit e5f195da33
16 changed files with 71 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build/cmake/samples/CMakeLists.txt
View File

@@ -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) 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(svg svgtest.cpp RES svgtest.rc DEPENDS wxUSE_SVG)
wx_add_sample(taborder) 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(text DEPENDS wxUSE_TEXTCTRL)
wx_add_sample(thread DEPENDS wxUSE_THREADS) wx_add_sample(thread DEPENDS wxUSE_THREADS)
wx_add_sample(toolbar RES toolbar.rc DEPENDS wxUSE_TOOLBAR) 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} wx_add_sample(widgets IMPORTANT ${SAMPLE_WIDGETS_SRC}
DATA ${WIDGETS_RC_FILES} textctrl.cpp ../image/toucan.png:toucan.png 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_add_sample(wrapsizer)
wx_list_add_prefix(XRC_RC_FILES rc/ wx_list_add_prefix(XRC_RC_FILES rc/

2
build/cmake/samples/html.cmake
View File

@@ -10,7 +10,7 @@
set(wxSAMPLE_FOLDER html) set(wxSAMPLE_FOLDER html)
set(wxSAMPLE_SUBDIR 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/ wx_list_add_prefix(HELP_DATA_FILES helpfiles/
Index.hhk Index.hhk
another.hhc another.hhc

2
samples/html/about/Makefile.in
View File

@@ -189,7 +189,7 @@ about$(EXEEXT): $(ABOUT_OBJECTS) $(__about___win32rc)
data_files: data_files:
@mkdir -p ./data @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 ; \ if test ! -f ./data/$$f -a ! -d ./data/$$f ; \
then x=yep ; \ then x=yep ; \
else x=`find $(srcdir)/data/$$f -newer ./data/$$f -print` ; \ else x=`find $(srcdir)/data/$$f -newer ./data/$$f -print` ; \

2
samples/html/about/about.bkl
View File

@@ -15,7 +15,7 @@
<dstdir>$(BUILDDIR)/data</dstdir> <dstdir>$(BUILDDIR)/data</dstdir>
<srcdir>$(SRCDIR)/data</srcdir> <srcdir>$(SRCDIR)/data</srcdir>
<files> <files>
about.htm logo.png about.htm bg.svg logo.png
</files> </files>
</wx-data> </wx-data>

2
samples/html/about/makefile.gcc
View File

@@ -226,7 +226,7 @@ $(OBJS)\about.exe: $(ABOUT_OBJECTS) $(OBJS)\about_sample_rc.o
data_files: data_files:
if not exist $(OBJS)\data mkdir $(OBJS)\data 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 $(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 $(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

2
samples/html/about/makefile.vc
View File

@@ -435,7 +435,7 @@ $(OBJS)\about.exe: $(ABOUT_OBJECTS) $(OBJS)\about_sample.res
data_files: data_files:
if not exist $(OBJS)\data mkdir $(OBJS)\data 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 $(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 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

16
samples/taskbar/Makefile.in
View File

@@ -134,7 +134,7 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
### Targets: ### ### Targets: ###
all: taskbar$(EXEEXT) $(__taskbar_bundle___depname) all: taskbar$(EXEEXT) $(__taskbar_bundle___depname) data
install: install:
@@ -182,6 +182,18 @@ taskbar$(EXEEXT): $(TASKBAR_OBJECTS) $(__taskbar___win32rc)
@COND_PLATFORM_MACOSX_1@taskbar_bundle: $(____taskbar_BUNDLE_TGT_REF_DEP) @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 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 $(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: # Include dependency info, if present:
@IF_GNU_MAKE@-include ./.deps/*.d @IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean taskbar_bundle .PHONY: all install uninstall clean distclean taskbar_bundle data

28
samples/taskbar/icon.svg
View File

@@ -1,28 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg id="svg36" width="13.156" height="9.064" version="1.1" viewBox="0 0 13.156 9.064" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<defs id="defs5">
<clipPath id="clipPath18872">
<use id="use2" width="100%" height="100%" xlink:href="#g18868"/>
</clipPath>
</defs>
<g id="g34" transform="translate(-6.0491 -2.694)">
<g id="g13" transform="translate(-4.6599,-12.159)">
<rect id="rect7" x="10.709" y="17.917" width="6" height="6"/>
<rect id="rect9" x="11.224" y="18.432" width="5" height="5" fill="#f00"/>
<rect id="rect11" x="11.481" y="19.745" width=".48911" height="3.1149" fill="#fff"/>
</g>
<rect id="rect15" x="10.232" y="4.4574" width=".48911" height="3.1149" fill="#fff"/>
<g id="g32" transform="translate(-4.6599,-12.159)">
<rect id="rect17" x="14.004" y="14.853" width="6" height="6"/>
<rect id="rect19" x="14.493" y="15.343" width="5" height="5" fill="#00f"/>
<rect id="rect21" x="14.892" y="16.617" width=".48911" height="3.1149" fill="#fff"/>
<rect id="rect23" x="17.865" y="17.093" width="6" height="6"/>
<g id="g28" clip-path="url(#clipPath18872)">
<g id="g18868">
<rect id="rect25" x="18.38" y="17.608" width="5" height="5" fill="#ff0"/>
</g>
</g>
<rect id="rect30" x="18.702" y="19.037" width=".69505" height="3.1149" fill="#fff" stroke-width="1.1921"/>
</g>
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 1.4 KiB

8
samples/taskbar/makefile.gcc
View File

@@ -207,7 +207,7 @@ $(OBJS):
### Targets: ### ### Targets: ###
all: $(OBJS)\taskbar.exe all: $(OBJS)\taskbar.exe data
clean: clean:
-if exist $(OBJS)\*.o del $(OBJS)\*.o -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 $(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 @-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 $(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 $(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 $(OBJS)\taskbar_tbtest.o: ./tbtest.cpp
$(CXX) -c -o $@ $(TASKBAR_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(TASKBAR_CXXFLAGS) $(CPPDEPS) $<
.PHONY: all clean .PHONY: all clean data
SHELL := $(COMSPEC) SHELL := $(COMSPEC)

6
samples/taskbar/makefile.vc
View File

@@ -414,7 +414,7 @@ $(OBJS):
### Targets: ### ### Targets: ###
all: $(OBJS)\taskbar.exe all: $(OBJS)\taskbar.exe data
clean: clean:
-if exist $(OBJS)\*.obj del $(OBJS)\*.obj -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 $(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 $(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 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

4
samples/taskbar/taskbar.bkl
View File

@@ -10,4 +10,8 @@
<wx-lib>base</wx-lib> <wx-lib>base</wx-lib>
</exe> </exe>
<wx-data id="data">
<files>info.svg</files>
</wx-data>
</makefile> </makefile>

5
samples/taskbar/tbtest.cpp
View File

@@ -27,6 +27,7 @@
#include "smile.xpm" #include "smile.xpm"
#include "smile2.xpm" #include "smile2.xpm"
#include "wx/artprov.h"
#include "wx/taskbar.h" #include "wx/taskbar.h"
#include "tbtest.h" #include "tbtest.h"
@@ -119,7 +120,7 @@ MyDialog::MyDialog(const wxString& title)
m_taskBarIcon = new MyTaskBarIcon(); m_taskBarIcon = new MyTaskBarIcon();
// we should be able to show up to 128 characters on Windows // 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" "wxTaskBarIcon Sample\n"
"With a very, very, very, very\n" "With a very, very, very, very\n"
"long tooltip whose length is\n" "long tooltip whose length is\n"
@@ -130,7 +131,7 @@ MyDialog::MyDialog(const wxString& title)
#if defined(__WXOSX__) && wxOSX_USE_COCOA #if defined(__WXOSX__) && wxOSX_USE_COCOA
m_dockIcon = new MyTaskBarIcon(wxTBI_DOCK); 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."); wxLogError("Could not set icon.");
} }

16
samples/wizard/Makefile.in
View File

@@ -134,7 +134,7 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
### Targets: ### ### Targets: ###
all: wizard$(EXEEXT) $(__wizard_bundle___depname) all: wizard$(EXEEXT) $(__wizard_bundle___depname) data
install: install:
@@ -182,6 +182,18 @@ wizard$(EXEEXT): $(WIZARD_OBJECTS) $(__wizard___win32rc)
@COND_PLATFORM_MACOSX_1@wizard_bundle: $(____wizard_BUNDLE_TGT_REF_DEP) @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 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 $(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: # Include dependency info, if present:
@IF_GNU_MAKE@-include ./.deps/*.d @IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean wizard_bundle .PHONY: all install uninstall clean distclean wizard_bundle data

8
samples/wizard/makefile.gcc
View File

@@ -207,7 +207,7 @@ $(OBJS):
### Targets: ### ### Targets: ###
all: $(OBJS)\wizard.exe all: $(OBJS)\wizard.exe data
clean: clean:
-if exist $(OBJS)\*.o del $(OBJS)\*.o -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 $(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 @-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 $(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 $(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 $(OBJS)\wizard_wizard.o: ./wizard.cpp
$(CXX) -c -o $@ $(WIZARD_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(WIZARD_CXXFLAGS) $(CPPDEPS) $<
.PHONY: all clean .PHONY: all clean data
SHELL := $(COMSPEC) SHELL := $(COMSPEC)

6
samples/wizard/makefile.vc
View File

@@ -414,7 +414,7 @@ $(OBJS):
### Targets: ### ### Targets: ###
all: $(OBJS)\wizard.exe all: $(OBJS)\wizard.exe data
clean: clean:
-if exist $(OBJS)\*.obj del $(OBJS)\*.obj -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 $(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 $(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 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

7
samples/wizard/wizard.bkl
View File

@@ -9,4 +9,11 @@
<wx-lib>base</wx-lib> <wx-lib>base</wx-lib>
</exe> </exe>
<wx-data id="data">
<files>
wiztest.svg
wiztest2.svg
</files>
</wx-data>
</makefile> </makefile>