Tag 3.0.2 release.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/WX_3_0_2@77956 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-10-05 14:26:44 +00:00
1549 changed files with 568090 additions and 585164 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,35 +0,0 @@
 # Windows-specific files that require CRLF:
 *.bat       eol=crlf
 *.bcc       eol=crlf
 *.dsw       eol=crlf
 *.gcc       eol=crlf
 *.props     eol=crlf
 *.rc        eol=crlf
 *.sln       eol=crlf
 *.vc        eol=crlf
 *.vcproj    eol=crlf
 *.vcxproj   eol=crlf
 # Documentation used with Windows installer:
 /BuildGit.txt         text=auto
 /docs/changes.txt     text=auto
 /docs/licence.txt     text=auto
 /docs/readme.txt      text=auto
 /docs/msw/*.txt       text=auto
 # Unix-specific files that require LF:
 *.h.in       eol=lf
 *.m4         eol=lf
 *.sh         eol=lf
 configure.in eol=lf
 Makefile.am  eol=lf
 Makefile.in  eol=lf
 makefile.unx eol=lf
 config.guess eol=lf
 config.sub   eol=lf
 configure    eol=lf
 configure.in eol=lf
--- a/.gitignore
+++ b/.gitignore
@@ -1,432 +0,0 @@
 # /
 /.gdb_history
 /config.cache
 /configarg.cache
 /config.status
 /wx-config
 /config.log
 /stamp-h.in
 /Makefile
 /setup.h
 /*tags
 /autom4te.cache
 # /build/
 # /build/autoconf_prepend-include/autoconf/
 /build/autoconf_prepend-include/autoconf/autoconf.m4f
 # /build/bakefiles/
 /build/bakefiles/.bakefile_gen.state
 /build/bakefiles/Bakefiles.local.bkgen
 /build/bakefiles/wxwin.pyc
 /build/bakefiles/wxpresets/presets/wx_presets.pyc
 # /build/msw/
 /build/msw/.m*
 /build/msw/config.dmc
 /build/msw/makefile.dmc
 /build/msw/*c*_msw
 /build/msw/*c*_mswd
 /build/msw/*c*_mswu
 /build/msw/*c*_mswud
 /build/msw/*c*_mswdll
 /build/msw/*c*_mswddll
 /build/msw/*c*_mswudll
 /build/msw/*c*_mswuddll
 /build/msw/*c*_mswuniv
 /build/msw/*c*_mswunivd
 /build/msw/*c*_mswunivu
 /build/msw/*c*_mswunivud
 /build/msw/*c*_mswunivdll
 /build/msw/*c*_mswunivddll
 /build/msw/*c*_mswunivudll
 /build/msw/*c*_mswunivuddll
 /build/msw/*c*_mswhdll
 /build/msw/*c*_mswuhdll
 /build/msw/*.vcproj.*.user
 /build/msw/*.vcxproj.user
 /build/msw/vc*_mswud
 /build/msw/wx_vc8arm_*.vcproj
 /build/msw/wx_vc8arm.sln
 /build/msw/ipch
 /build/msw/wx_vc12.opensdf
 /build/msw/wx_vc12.sdf
 /build/msw/*.suo
 # /demos/
 /demos/*/*.sln
 /demos/*/*.dsw
 /demos/*/vc_msw
 /demos/*/vc_msw_x64
 /demos/*/vc_mswd
 /demos/*/vc_mswd_x64
 /demos/*/vc_mswu
 /demos/*/vc_mswu_x64
 /demos/*/vc_mswud
 /demos/*/vc_mswud_x64
 /demos/*/vc_mswdll
 /demos/*/vc_mswdll_x64
 /demos/*/vc_mswddll
 /demos/*/vc_mswddll_x64
 /demos/*/vc_mswudll
 /demos/*/vc_mswudll_x64
 /demos/*/vc_mswuddll
 /demos/*/vc_mswuddll_x64
 /demos/*/vc_mswuniv
 /demos/*/vc_mswuniv_x64
 /demos/*/vc_mswunivd
 /demos/*/vc_mswunivd_x64
 /demos/*/vc_mswunivu
 /demos/*/vc_mswunivu_x64
 /demos/*/vc_mswunivud
 /demos/*/vc_mswunivud_x64
 /demos/*/vc_mswunivdll
 /demos/*/vc_mswunivdll_x64
 /demos/*/vc_mswunivddll
 /demos/*/vc_mswunivddll_x64
 /demos/*/vc_mswunivudll
 /demos/*/vc_mswunivudll_x64
 /demos/*/vc_mswunivuddll
 /demos/*/vc_mswunivuddll_x64
 /demos/*/*Classic?Debug*
 /demos/*/*Classic?Release*
 /demos/*/*Carbon?Debug*
 /demos/*/*Carbon?Release*
 # /demos/bombs/
 /demos/bombs/bombsM5.mcp
 /demos/bombs/bombsM*Data
 # /demos/forty/
 /demos/forty/fortyM5.mcp
 /demos/forty/fortyM*Data
 # /demos/fractal/
 /demos/fractal/fractalM5.mcp
 /demos/fractal/fractalM*Data
 # /demos/life/
 /demos/life/lifeM5.mcp
 /demos/life/lifeM*Data
 # /demos/poem/
 /demos/poem/poemM5.mcp
 /demos/poem/poemM*Data
 # /distrib/release/
 /distrib/release
 # /docs/doxygen/
 /docs/doxygen/doxygen.log
 /docs/doxygen/out
 # /include/
 /include/Makefile.in
 /include/*.mch
 # /include/wx/
 /include/wx/Makefile.in
 # /include/wx/generic/
 /include/wx/generic/Makefile.in
 # /include/wx/gtk/
 /include/wx/gtk/setup.h
 /include/wx/gtk/Makefile.in
 # /include/wx/gtk1/
 /include/wx/gtk1/setup.h
 /include/wx/gtk1/Makefile.in
 # /include/wx/html/
 /include/wx/html/Makefile.in
 # /include/wx/motif/
 /include/wx/motif/Makefile.in
 # /include/wx/msw/
 /include/wx/msw/setup.h
 /include/wx/msw/Makefile.in
 /include/wx/msw/Makefile
 # /include/wx/osx/
 /include/wx/osx/setup.h
 # /include/wx/protocol/
 /include/wx/protocol/Makefile.in
 # /include/wx/univ/
 /include/wx/univ/setup.h
 # /include/wx/unix/
 /include/wx/unix/Makefile.in
 # /lib/
 /lib/base
 /lib/based
 /lib/basedll
 /lib/basedlld
 /lib/basedllu
 /lib/basedllud
 /lib/baseu
 /lib/baseud
 /lib/bcc_lib
 /lib/cdef*.res
 /lib/dmc_lib
 /lib/evc_armv4_lib
 /lib/evc_emulator_lib
 /lib/expat*.lib
 /lib/gcc_lib
 /lib/gcc_lib32
 /lib/gcc_lib64
 /lib/jpeg*.lib
 /lib/ldef*.res
 /lib/Linux
 /lib/linux
 /lib/linux-gnu
 /lib/msw
 /lib/mswd
 /lib/mswdll
 /lib/mswdlld
 /lib/mswdllu
 /lib/mswdllud
 /lib/mswu
 /lib/mswud
 /lib/png*.lib
 /lib/regex*.lib
 /lib/shell32_sc.lib
 /lib/tiff*.lib
 /lib/univ
 /lib/univd
 /lib/univdll
 /lib/univdlld
 /lib/vc_dll
 /lib/vc_lib
 /lib/vc_x64_dll
 /lib/vc_x64_lib
 /lib/wat_lib
 /lib/winmm32_sc.lib
 /lib/wsock32_sc.lib
 /lib/wx_*.rsrc
 /lib/wxbase*.dll
 /lib/wxbase*.exp
 /lib/wxbase*.ilk
 /lib/wxbase*.lib
 /lib/wxmsw*.dll
 /lib/wxmsw*.exp
 /lib/wxmsw*.ilk
 /lib/wxmsw*.lib
 /lib/zlib*.lib
 # /locale/
 /locale/*.mo
 # /locale/msw/
 /locale/msw/*.mo
 # /misc/
 /misc/system.list
 /misc/bin
 /misc/.gdb_history
 /misc/Test
 /misc/config.cache
 /misc/config.status
 /misc/system.list
 /misc/linux.system.cache
 /misc/wx-config
 /misc/config.log
 /misc/linux-gnu.system.cache
 /misc/*.dsp
 /misc/*.dsw
 /misc/*.plg
 /misc/*.opt
 /misc/*.aps
 /misc/*.ncb
 /misc/*.pro
 /misc/*.opt
 /misc/Release
 /misc/Debug
 /misc/ReleaseDLL
 /misc/DebugDLL
 /misc/robert
 /misc/Makefile.in
 /misc/setup.h.in
 /misc/stamp-h.in
 /misc/Makefile
 /misc/configure
 /misc/setup.h
 /misc/stamp-h
 /misc/libtool
 # /samples/
 /samples/**/*.sln
 /samples/**/*.dsw
 /samples/**/vc_msw
 /samples/**/vc_msw_x64
 /samples/**/vc_mswd
 /samples/**/vc_mswd_x64
 /samples/**/vc_mswu
 /samples/**/vc_mswu_x64
 /samples/**/vc_mswud
 /samples/**/vc_mswud_x64
 /samples/**/vc_mswdll
 /samples/**/vc_mswdll_x64
 /samples/**/vc_mswddll
 /samples/**/vc_mswddll_x64
 /samples/**/vc_mswudll
 /samples/**/vc_mswudll_x64
 /samples/**/vc_mswuddll
 /samples/**/vc_mswuddll_x64
 /samples/**/vc_mswuniv
 /samples/**/vc_mswuniv_x64
 /samples/**/vc_mswunivd
 /samples/**/vc_mswunivd_x64
 /samples/**/vc_mswunivu
 /samples/**/vc_mswunivu_x64
 /samples/**/vc_mswunivud
 /samples/**/vc_mswunivud_x64
 /samples/**/vc_mswunivdll
 /samples/**/vc_mswunivdll_x64
 /samples/**/vc_mswunivddll
 /samples/**/vc_mswunivddll_x64
 /samples/**/vc_mswunivudll
 /samples/**/vc_mswunivudll_x64
 /samples/**/vc_mswunivuddll
 /samples/**/vc_mswunivuddll_x64
 # /samples/image/
 /samples/image/saved.xpm
 /samples/image/test.png
 /samples/image/test.xpm
 # /src/
 /src/FreeBSD
 /src/Linux
 /src/linux
 /src/linux-gnu
 /src/Makefile.in
 /src/*.lo
 /src/*.la
 /src/make.env
 /src/makeprog.env
 /src/makelib.env
 /src/ReleaseDebug
 /src/wxwindowsM*Data
 /src/wxwindowsM5.mcp
 /src/build
 /src/*.ncb
 /src/*.opt
 /src/*.plg
 # /src/common/
 /src/common/y_tab.c
 # /src/gtk/
 /src/gtk/Makefile.in
 /src/gtk/*.lo
 /src/gtk/*.la
 # /src/gtk1/
 /src/gtk1/Makefile.in
 /src/gtk1/*.lo
 /src/gtk1/*.la
 # /src/jpeg/
 /src/jpeg/jpegM*Data
 /src/jpeg/jpegM5.mcp
 /src/jpeg/Debug
 /src/jpeg/Release
 # /src/motif/
 /src/motif/Makefile.in
 # /src/msw/
 /src/msw/Makefile.in
 # /src/regex/
 /src/regex/Debug
 /src/regex/Release
 /src/regex/*.vcl
 # /src/zlib/
 /src/zlib/zlibM*Data
 /src/zlib/zlibM5.mcp
 /src/zlib/Debug
 /src/zlib/Release
 # /tests/
 /tests/*.sln
 /tests/*.dsw
 /tests/vc_msw
 /tests/vc_msw_x64
 /tests/vc_mswd
 /tests/vc_mswd_x64
 /tests/vc_mswu
 /tests/vc_mswu_x64
 /tests/vc_mswud
 /tests/vc_mswud_x64
 /tests/vc_mswdll
 /tests/vc_mswdll_x64
 /tests/vc_mswddll
 /tests/vc_mswddll_x64
 /tests/vc_mswudll
 /tests/vc_mswudll_x64
 /tests/vc_mswuddll
 /tests/vc_mswuddll_x64
 /tests/vc_mswuniv
 /tests/vc_mswuniv_x64
 /tests/vc_mswunivd
 /tests/vc_mswunivd_x64
 /tests/vc_mswunivu
 /tests/vc_mswunivu_x64
 /tests/vc_mswunivud
 /tests/vc_mswunivud_x64
 /tests/vc_mswunivdll
 /tests/vc_mswunivdll_x64
 /tests/vc_mswunivddll
 /tests/vc_mswunivddll_x64
 /tests/vc_mswunivudll
 /tests/vc_mswunivudll_x64
 /tests/vc_mswunivuddll
 /tests/vc_mswunivuddll_x64
 /tests/test_test.dsw
 /tests/test.opt
 /tests/test.sln
 /tests/test.suo
 /tests/test_test.vcproj
 # /tests/benchmarks/
 /tests/benchmarks/*.sln
 /tests/benchmarks/*.dsw
 # /utils/
 /utils/**/vc_mswu
 /utils/**/vc_mswu_x64
 /utils/**/vc_mswud
 /utils/**/vc_mswud_x64
 /utils/**/vc_mswudll
 /utils/**/vc_mswudll_x64
 /utils/**/vc_mswuddll
 /utils/**/vc_mswuddll_x64
 # /utils/emulator/src/
 /utils/emulator/src/*.sln
 /utils/emulator/src/*.dsw
 # /utils/helpview/src/
 /utils/helpview/src/*.sln
 /utils/helpview/src/*.dsw
 # /utils/hhp2cached/
 /utils/hhp2cached/*.sln
 /utils/hhp2cached/*.dsw
 /utils/hhp2cached/HHP2CachedM*Data
 /utils/hhp2cached/*Classic?Debug*
 /utils/hhp2cached/*Classic?Release*
 /utils/hhp2cached/*Carbon?Debug*
 /utils/hhp2cached/*Carbon?Release*
 # /utils/wxrc/
 /utils/wxrc/*.sln
 /utils/wxrc/*.dsw
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,6 @@
 # It is used automatically for the repositories on Github if it's found in the
 # root directory of the project.
 language: cpp
 sudo: required
 compiler: gcc
@@ -19,7 +18,6 @@ notifications:
        on_failure: change
 before_install:
    - sudo apt-get update
    - sudo apt-get install -y libcppunit-dev
 env:
--- a/BuildSVN.txt
+++ b/BuildSVN.txt
@@ -1,8 +1,8 @@
 ------------------------------------------------------------------------
-                How to build the sources from git
+                How to build the sources from SVN
 ------------------------------------------------------------------------
-Before building from git sources under Windows, you need to copy the
+Before building from svn sources under Windows, you need to copy the
 file include/wx/msw/setup0.h to include/wx/msw/setup.h. This is
 necessary in order to allow having local modifications to the latter
 file without showing it as modified, as it is not under version
--- a/Makefile.in
+++ b/Makefile.in
@@ -65,7 +65,6 @@ EXTRALIBS_MEDIA = @EXTRALIBS_MEDIA@
 EXTRALIBS_GUI = @EXTRALIBS_GUI@
 EXTRALIBS_OPENGL = @EXTRALIBS_OPENGL@
 EXTRALIBS_SDL = @EXTRALIBS_SDL@
 EXTRALIBS_WEBVIEW = @EXTRALIBS_WEBVIEW@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 DYLIB_RPATH_INSTALL = @DYLIB_RPATH_INSTALL@
@@ -77,7 +76,7 @@ wx_top_builddir = @wx_top_builddir@
 DESTDIR = 
 WX_RELEASE = 3.0
 WX_RELEASE_NODOT = 30
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 WXREGEX_CFLAGS = -DNDEBUG -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(____SHARED) \
 	$(CPPFLAGS) $(CFLAGS)
@@ -2089,7 +2088,7 @@ LOCALE_MSW_LINGUAS =  it
@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
@COND_USE_PLUGINS_0@PLUGIN_ADV_EXTRALIBS = $(EXTRALIBS_SDL)
@COND_PLATFORM_MACOSX_1@WXMACVERSION_CMD = \
-@COND_PLATFORM_MACOSX_1@	-compatibility_version 4.0 -current_version 4.0
+@COND_PLATFORM_MACOSX_1@	-compatibility_version 3.0 -current_version 3.0
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -15200,9 +15199,9 @@ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1___htmldll_library_link_LIBR_0 \
@COND_USE_SOVERSION_0@dll___targetsuf2 = .$(SO_SUFFIX)
@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@dll___targetsuf3 \
@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@	= \
-@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@	.$(SO_SUFFIX).0.3.0
+@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@	.$(SO_SUFFIX).0.2.0
@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@dll___targetsuf3 \
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .0.3.0.$(SO_SUFFIX)
+@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .0.2.0.$(SO_SUFFIX)
@COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@dll___targetsuf3 = -0.$(SO_SUFFIX)
@COND_USE_SOVERSION_0@dll___targetsuf3 = .$(SO_SUFFIX)
@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).0
@@ -15494,7 +15493,7 @@ distclean: clean
@COND_SHARED_0_USE_STC_1@	rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxscintilla$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
@COND_MONOLITHIC_1_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__monodll___win32rc) $(__wxscintilla_library_link_DEP)
-@COND_MONOLITHIC_1_SHARED_1@	$(SHARED_LD_CXX) $@ $(MONODLL_OBJECTS) $(__wxscintilla_library_link_LIBR)    -L$(LIBDIRNAME) $(__monodll___macinstnamecmd) $(__monodll___importlib) $(__monodll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_XML) $(EXTRALIBS_HTML) $(EXTRALIBS_MEDIA) $(PLUGIN_ADV_EXTRALIBS) $(EXTRALIBS_WEBVIEW) $(__wxscintilla_library_link_LIBR_1) $(LIBS)
+@COND_MONOLITHIC_1_SHARED_1@	$(SHARED_LD_CXX) $@ $(MONODLL_OBJECTS) $(__wxscintilla_library_link_LIBR)    -L$(LIBDIRNAME) $(__monodll___macinstnamecmd) $(__monodll___importlib) $(__monodll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_XML) $(EXTRALIBS_HTML) $(EXTRALIBS_MEDIA) $(PLUGIN_ADV_EXTRALIBS) $(__wxscintilla_library_link_LIBR_1) $(LIBS)
@COND_MONOLITHIC_1_SHARED_1@	$(DYLIB_RPATH_POSTLINK)
@COND_MONOLITHIC_1_SHARED_1@	
@COND_MONOLITHIC_1_SHARED_1@	$(__monodll___so_symlinks_cmd)
@@ -15751,7 +15750,7 @@ distclean: clean
@COND_MONOLITHIC_0_USE_HTML_1@wxhtml: $(____wxhtml_namedll_DEP) $(____wxhtml_namelib_DEP)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(WEBVIEWDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__webviewdll___win32rc) $(__coredll___depname) $(__basedll___depname)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@	$(SHARED_LD_CXX) $@ $(WEBVIEWDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME)    -L$(LIBDIRNAME) $(__webviewdll___macinstnamecmd) $(__webviewdll___importlib) $(__webviewdll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_WEBVIEW) $(LIBS)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@	$(SHARED_LD_CXX) $@ $(WEBVIEWDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME)    -L$(LIBDIRNAME) $(__webviewdll___macinstnamecmd) $(__webviewdll___importlib) $(__webviewdll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(LIBS)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@	$(DYLIB_RPATH_POSTLINK)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@	
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@	$(__webviewdll___so_symlinks_cmd)
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,43 +0,0 @@
 version: '{build}'
 branches:
  only:
  - master
  - WX_3_0_BRANCH
 environment:
  matrix:
  - TOOLSET: msbuild
    CONFIGURATION: DLL Release
    ARCH: x64
    wxUSE_STL: 1
  - TOOLSET: nmake
    VS: '9.0'
    BUILD: release
    ARCH: x86
    wxUSE_STL: 0
  - TOOLSET: nmake
    VS: '14.0'
    BUILD: debug
    ARCH: amd64
    wxUSE_STL: 1
  - TOOLSET: mingw
    wxUSE_STL: 0
  - TOOLSET: msys2
    MSYSTEM: MINGW32
  - TOOLSET: cygwin
 clone_depth: 50
 before_build:
 - ps: |
    $env:PATH = $env:PATH -replace "C:\\Program Files \(x86\)\\Git\\bin",""
    if (($env:compiler -ne "msys2") -and ($env:compiler -ne "cygwin")) {
      gc include\wx\msw\setup0.h |
      %{$_ -replace "define wxUSE_STL 0", "define wxUSE_STL $env:wxUSE_STL"} |
      sc include\wx\msw\setup.h
    }
 build_script: build\tools\appveyor.bat
 test: off
--- a/build/aclocal/bakefile.m4
+++ b/build/aclocal/bakefile.m4
@@ -626,7 +626,7 @@ AC_DEFUN([AC_BAKEFILE_CHECK_BASIC_STUFF],
        AC_SUBST(AR)
    else
        AC_CHECK_TOOL(AR, ar, ar)
-        AROPTIONS=rc
+        AROPTIONS=rcu
    fi
    AC_SUBST(AROPTIONS)
--- a/build/aclocal/visibility.m4
+++ b/build/aclocal/visibility.m4
@@ -49,22 +49,9 @@ AC_DEFUN([WX_VISIBILITY],
         error this platform has no visibility;
         #endif
-         /* At the time of Xcode 4.1 / Clang 3, Clang++ still didn't
+         /* at the time of Xcode 4.1 / Clang 3, Clang++ still didn't have the bugs sorted out: */
-            have the bugs sorted out. These were fixed starting with
+         #if defined(__clang__)
-            Xcode 4.6.0 / Apple Clang 4.2 (which is based on Clang 3.2 so
+         clang compiler is still broken w.r.t. visibility;
            check for that version too). */
         #ifdef __clang__
            #ifdef __APPLE__
                #if __clang_major__ < 4 \
                    || (__clang_major__ == 4 && __clang_minor__ < 2)
                    error Clang compiler version < 4.2 is broken w.r.t. visibility;
                #endif
            #else
                #if __clang_major__ < 3 \
                    || (__clang_major__ == 3 && __clang_minor__ < 2)
                    error Clang compiler version < 3.2 is broken w.r.t. visibility;
                #endif
            #endif
         #endif
         extern __attribute__((__visibility__("hidden"))) int hiddenvar;
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -710,10 +710,6 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
            <res-include>$(TOP_SRCDIR)include</res-include>
            <postlink-command>$(DYLIB_RPATH_POSTLINK)</postlink-command>
        </if>
        <if cond="FORMAT=='borland'">
            <!-- path to windows.h for this compiler -->
            <res-include>$(DOLLAR)(BCCDIR)\include\windows\sdk</res-include>
        </if>
        <win32-res>$(WXTOPDIR)src/msw/version.rc</win32-res>
    </template>
--- a/build/bakefiles/common_samples_intree.bkl
+++ b/build/bakefiles/common_samples_intree.bkl
@@ -29,10 +29,6 @@
            <res-include>$(RCDEFDIR)</res-include>
            <res-include>$(TOP_SRCDIR)include</res-include>
        </if>
        <if cond="FORMAT=='borland'">
            <!-- path to windows.h for this compiler -->
            <res-include>$(DOLLAR)(BCCDIR)\include\windows\sdk</res-include>
        </if>
        <win32-res>$(WXTOPDIR)samples/sample.rc</win32-res>
        <if cond="FORMAT=='autoconf'">
--- a/build/bakefiles/config.bkl
+++ b/build/bakefiles/config.bkl
@@ -423,7 +423,6 @@ to run the tests, include CppUnit library here.
        <option name="EXTRALIBS_GUI"/>
        <option name="EXTRALIBS_OPENGL"/>
        <option name="EXTRALIBS_SDL"/>
        <option name="EXTRALIBS_WEBVIEW"/>
        <option name="CXXWARNINGS"/>
        <option name="HOST_SUFFIX"/>
        <option name="DYLIB_RPATH_INSTALL"/>
@@ -507,7 +506,6 @@ it if SHARED=1 unless you know what you are doing.
            <if cond="COMPILER=='gcc'">-lopengl32 -lglu32</if>
        </set>
        <set var="EXTRALIBS_SDL"/>
        <set var="EXTRALIBS_WEBVIEW"/>
        <set var="WITH_PLUGIN_SDL">0</set>
--- a/build/bakefiles/monolithic.bkl
+++ b/build/bakefiles/monolithic.bkl
@@ -26,7 +26,6 @@
        <ldlibs>$(EXTRALIBS_HTML)</ldlibs>
        <ldlibs>$(EXTRALIBS_MEDIA)</ldlibs>
        <ldlibs>$(PLUGIN_MONOLIB_EXTRALIBS)</ldlibs>
        <ldlibs>$(EXTRALIBS_WEBVIEW)</ldlibs>
        <library>$(wxscintilla_library_link)</library>
    </dll>
--- a/build/bakefiles/multilib.bkl
+++ b/build/bakefiles/multilib.bkl
@@ -183,7 +183,6 @@
        <sources>$(WEBVIEW_SRC)</sources>
        <library>coredll</library>
        <library>basedll</library>
        <ldlibs>$(EXTRALIBS_WEBVIEW)</ldlibs>
        <msvc-headers>$(WEBVIEW_HDR)</msvc-headers>
    </dll>
--- a/build/bakefiles/version.bkl
+++ b/build/bakefiles/version.bkl
@@ -22,9 +22,9 @@
       3. Else, i.e. if there were no changes at all to API but only internal
          changes, change C:R:A to C:R+1:A
    -->
-    <set var="WX_CURRENT">3</set>
+    <set var="WX_CURRENT">2</set>
    <set var="WX_REVISION">0</set>
-    <set var="WX_AGE">3</set>
+    <set var="WX_AGE">2</set>
    <!-- ================================================================== -->
--- a/build/bakefiles/wxwin.py
+++ b/build/bakefiles/wxwin.py
@@ -51,7 +51,6 @@ EXTRALIBS = {
    'html' : '$(EXTRALIBS_HTML)',
    'adv' : '$(PLUGIN_ADV_EXTRALIBS)',
    'media' : '$(EXTRALIBS_MEDIA)',
    'webview' : '$(EXTRALIBS_WEBVIEW)',
 }
 def mkLibName(wxid):
--- a/build/msw/makefile.bcc
+++ b/build/msw/makefile.bcc
@@ -5488,7 +5488,7 @@ $(SETUPHDIR)\wx\msw\rcdefs.h: $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcdefs
 build_cfg_file: $(SETUPHDIR)
 	@echo WXVER_MAJOR=3 >$(BUILD_CFG_FILE)
 	@echo WXVER_MINOR=0 >>$(BUILD_CFG_FILE)
-	@echo WXVER_RELEASE=3 >>$(BUILD_CFG_FILE)
+	@echo WXVER_RELEASE=2 >>$(BUILD_CFG_FILE)
 	@echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE)
 	@echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE)
 	@echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE)
@@ -8719,7 +8719,7 @@ $(OBJS)\monodll_animateg.obj: ..\..\src\generic\animateg.cpp
 !endif
 $(OBJS)\monodll_version.res: ..\..\src\msw\version.rc
-	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG) -i$(BCCDIR)\include\windows\sdk  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -i..\..\src\stc\scintilla\include -i..\..\src\stc\scintilla\lexlib -i..\..\src\stc\scintilla\src -d__WX__ -dSCI_LEXER -dLINK_LEXERS -dwxUSE_BASE=1 -dWXMAKINGDLL ..\..\src\msw\version.rc
+	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -i..\..\src\stc\scintilla\include -i..\..\src\stc\scintilla\lexlib -i..\..\src\stc\scintilla\src -d__WX__ -dSCI_LEXER -dLINK_LEXERS -dwxUSE_BASE=1 -dWXMAKINGDLL ..\..\src\msw\version.rc
 $(OBJS)\monolib_dummy.obj: ..\..\src\common\dummy.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) -H ..\..\src\common\dummy.cpp
@@ -11193,7 +11193,7 @@ $(OBJS)\basedll_dummy.obj: ..\..\src\common\dummy.cpp
 	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) -H ..\..\src\common\dummy.cpp
 $(OBJS)\basedll_version.res: ..\..\src\msw\version.rc
-	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG) -i$(BCCDIR)\include\windows\sdk  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dwxUSE_GUI=0 -dWXMAKINGDLL_BASE -dwxUSE_BASE=1 ..\..\src\msw\version.rc
+	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dwxUSE_GUI=0 -dWXMAKINGDLL_BASE -dwxUSE_BASE=1 ..\..\src\msw\version.rc
 $(OBJS)\basedll_any.obj: ..\..\src\common\any.cpp
 	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\any.cpp
@@ -11880,7 +11880,7 @@ $(OBJS)\netdll_dummy.obj: ..\..\src\common\dummy.cpp
 	$(CXX) -q -c -P -o$@ $(NETDLL_CXXFLAGS) -H ..\..\src\common\dummy.cpp
 $(OBJS)\netdll_version.res: ..\..\src\msw\version.rc
-	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG) -i$(BCCDIR)\include\windows\sdk  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dwxUSE_GUI=0 -dWXUSINGDLL -dWXMAKINGDLL_NET ..\..\src\msw\version.rc
+	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dwxUSE_GUI=0 -dWXUSINGDLL -dWXMAKINGDLL_NET ..\..\src\msw\version.rc
 $(OBJS)\netdll_fs_inet.obj: ..\..\src\common\fs_inet.cpp
 	$(CXX) -q -c -P -o$@ $(NETDLL_CXXFLAGS) ..\..\src\common\fs_inet.cpp
@@ -11961,7 +11961,7 @@ $(OBJS)\coredll_dummy.obj: ..\..\src\common\dummy.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) -H ..\..\src\common\dummy.cpp
 $(OBJS)\coredll_version.res: ..\..\src\msw\version.rc
-	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG) -i$(BCCDIR)\include\windows\sdk  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_CORE -dwxUSE_BASE=0 ..\..\src\msw\version.rc
+	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_CORE -dwxUSE_BASE=0 ..\..\src\msw\version.rc
 $(OBJS)\coredll_event.obj: ..\..\src\common\event.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\event.cpp
@@ -14864,7 +14864,7 @@ $(OBJS)\advdll_dummy.obj: ..\..\src\common\dummy.cpp
 	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) -H ..\..\src\common\dummy.cpp
 $(OBJS)\advdll_version.res: ..\..\src\msw\version.rc
-	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG) -i$(BCCDIR)\include\windows\sdk  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_ADV ..\..\src\msw\version.rc
+	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_ADV ..\..\src\msw\version.rc
 $(OBJS)\advdll_bmpcbox.obj: ..\..\src\msw\bmpcbox.cpp
 	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\bmpcbox.cpp
@@ -15167,7 +15167,7 @@ $(OBJS)\mediadll_dummy.obj: ..\..\src\common\dummy.cpp
 	$(CXX) -q -c -P -o$@ $(MEDIADLL_CXXFLAGS) -H ..\..\src\common\dummy.cpp
 $(OBJS)\mediadll_version.res: ..\..\src\msw\version.rc
-	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG) -i$(BCCDIR)\include\windows\sdk  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_MEDIA ..\..\src\msw\version.rc
+	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_MEDIA ..\..\src\msw\version.rc
 $(OBJS)\mediadll_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
 	$(CXX) -q -c -P -o$@ $(MEDIADLL_CXXFLAGS) ..\..\src\common\mediactrlcmn.cpp
@@ -15200,7 +15200,7 @@ $(OBJS)\htmldll_dummy.obj: ..\..\src\common\dummy.cpp
 	$(CXX) -q -c -P -o$@ $(HTMLDLL_CXXFLAGS) -H ..\..\src\common\dummy.cpp
 $(OBJS)\htmldll_version.res: ..\..\src\msw\version.rc
-	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG) -i$(BCCDIR)\include\windows\sdk  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_HTML ..\..\src\msw\version.rc
+	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_HTML ..\..\src\msw\version.rc
 $(OBJS)\htmldll_helpbest.obj: ..\..\src\msw\helpbest.cpp
 	$(CXX) -q -c -P -o$@ $(HTMLDLL_CXXFLAGS) ..\..\src\msw\helpbest.cpp
@@ -15365,7 +15365,7 @@ $(OBJS)\webviewdll_dummy.obj: ..\..\src\common\dummy.cpp
 	$(CXX) -q -c -P -o$@ $(WEBVIEWDLL_CXXFLAGS) -H ..\..\src\common\dummy.cpp
 $(OBJS)\webviewdll_version.res: ..\..\src\msw\version.rc
-	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG) -i$(BCCDIR)\include\windows\sdk  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_WEBVIEW ..\..\src\msw\version.rc
+	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_WEBVIEW ..\..\src\msw\version.rc
 $(OBJS)\webviewdll_webview_ie.obj: ..\..\src\msw\webview_ie.cpp
 	$(CXX) -q -c -P -o$@ $(WEBVIEWDLL_CXXFLAGS) ..\..\src\msw\webview_ie.cpp
@@ -15398,7 +15398,7 @@ $(OBJS)\qadll_dummy.obj: ..\..\src\common\dummy.cpp
 	$(CXX) -q -c -P -o$@ $(QADLL_CXXFLAGS) -H ..\..\src\common\dummy.cpp
 $(OBJS)\qadll_version.res: ..\..\src\msw\version.rc
-	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG) -i$(BCCDIR)\include\windows\sdk  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_QA ..\..\src\msw\version.rc
+	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_QA ..\..\src\msw\version.rc
 $(OBJS)\qadll_debugrpt.obj: ..\..\src\common\debugrpt.cpp
 	$(CXX) -q -c -P -o$@ $(QADLL_CXXFLAGS) ..\..\src\common\debugrpt.cpp
@@ -15419,7 +15419,7 @@ $(OBJS)\xmldll_dummy.obj: ..\..\src\common\dummy.cpp
 	$(CXX) -q -c -P -o$@ $(XMLDLL_CXXFLAGS) -H ..\..\src\common\dummy.cpp
 $(OBJS)\xmldll_version.res: ..\..\src\msw\version.rc
-	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG) -i$(BCCDIR)\include\windows\sdk  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dwxUSE_GUI=0 -dWXUSINGDLL -dWXMAKINGDLL_XML ..\..\src\msw\version.rc
+	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dwxUSE_GUI=0 -dWXUSINGDLL -dWXMAKINGDLL_XML ..\..\src\msw\version.rc
 $(OBJS)\xmldll_xml.obj: ..\..\src\xml\xml.cpp
 	$(CXX) -q -c -P -o$@ $(XMLDLL_CXXFLAGS) ..\..\src\xml\xml.cpp
@@ -15440,7 +15440,7 @@ $(OBJS)\xrcdll_dummy.obj: ..\..\src\common\dummy.cpp
 	$(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) -H ..\..\src\common\dummy.cpp
 $(OBJS)\xrcdll_version.res: ..\..\src\msw\version.rc
-	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG) -i$(BCCDIR)\include\windows\sdk  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_XRC ..\..\src\msw\version.rc
+	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_XRC ..\..\src\msw\version.rc
 $(OBJS)\xrcdll_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp
 	$(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_animatctrl.cpp
@@ -15845,7 +15845,7 @@ $(OBJS)\auidll_dummy.obj: ..\..\src\common\dummy.cpp
 	$(CXX) -q -c -P -o$@ $(AUIDLL_CXXFLAGS) -H ..\..\src\common\dummy.cpp
 $(OBJS)\auidll_version.res: ..\..\src\msw\version.rc
-	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG) -i$(BCCDIR)\include\windows\sdk  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_AUI ..\..\src\msw\version.rc
+	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_AUI ..\..\src\msw\version.rc
 $(OBJS)\auidll_framemanager.obj: ..\..\src\aui\framemanager.cpp
 	$(CXX) -q -c -P -o$@ $(AUIDLL_CXXFLAGS) ..\..\src\aui\framemanager.cpp
@@ -15902,7 +15902,7 @@ $(OBJS)\ribbondll_dummy.obj: ..\..\src\common\dummy.cpp
 	$(CXX) -q -c -P -o$@ $(RIBBONDLL_CXXFLAGS) -H ..\..\src\common\dummy.cpp
 $(OBJS)\ribbondll_version.res: ..\..\src\msw\version.rc
-	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG) -i$(BCCDIR)\include\windows\sdk  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_RIBBON ..\..\src\msw\version.rc
+	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_RIBBON ..\..\src\msw\version.rc
 $(OBJS)\ribbondll_art_internal.obj: ..\..\src\ribbon\art_internal.cpp
 	$(CXX) -q -c -P -o$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\art_internal.cpp
@@ -15977,7 +15977,7 @@ $(OBJS)\propgriddll_dummy.obj: ..\..\src\common\dummy.cpp
 	$(CXX) -q -c -P -o$@ $(PROPGRIDDLL_CXXFLAGS) -H ..\..\src\common\dummy.cpp
 $(OBJS)\propgriddll_version.res: ..\..\src\msw\version.rc
-	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG) -i$(BCCDIR)\include\windows\sdk  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_PROPGRID ..\..\src\msw\version.rc
+	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_PROPGRID ..\..\src\msw\version.rc
 $(OBJS)\propgriddll_advprops.obj: ..\..\src\propgrid\advprops.cpp
 	$(CXX) -q -c -P -o$@ $(PROPGRIDDLL_CXXFLAGS) ..\..\src\propgrid\advprops.cpp
@@ -16034,7 +16034,7 @@ $(OBJS)\richtextdll_dummy.obj: ..\..\src\common\dummy.cpp
 	$(CXX) -q -c -P -o$@ $(RICHTEXTDLL_CXXFLAGS) -H ..\..\src\common\dummy.cpp
 $(OBJS)\richtextdll_version.res: ..\..\src\msw\version.rc
-	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG) -i$(BCCDIR)\include\windows\sdk  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_RICHTEXT ..\..\src\msw\version.rc
+	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_RICHTEXT ..\..\src\msw\version.rc
 $(OBJS)\richtextdll_richtextbuffer.obj: ..\..\src\richtext\richtextbuffer.cpp
 	$(CXX) -q -c -P -o$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextbuffer.cpp
@@ -16109,7 +16109,7 @@ $(OBJS)\stcdll_dummy.obj: ..\..\src\common\dummy.cpp
 	$(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) -H ..\..\src\common\dummy.cpp
 $(OBJS)\stcdll_version.res: ..\..\src\msw\version.rc
-	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG) -i$(BCCDIR)\include\windows\sdk  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -i..\..\src\stc\scintilla\include -i..\..\src\stc\scintilla\lexlib -i..\..\src\stc\scintilla\src -d__WX__ -dSCI_LEXER -dLINK_LEXERS -dWXUSINGDLL -dWXMAKINGDLL_STC ..\..\src\msw\version.rc
+	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -i..\..\src\stc\scintilla\include -i..\..\src\stc\scintilla\lexlib -i..\..\src\stc\scintilla\src -d__WX__ -dSCI_LEXER -dLINK_LEXERS -dWXUSINGDLL -dWXMAKINGDLL_STC ..\..\src\msw\version.rc
 $(OBJS)\stcdll_stc.obj: ..\..\src\stc\stc.cpp
 	$(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) ..\..\src\stc\stc.cpp
@@ -16136,7 +16136,7 @@ $(OBJS)\gldll_dummy.obj: ..\..\src\common\dummy.cpp
 	$(CXX) -q -c -P -o$@ $(GLDLL_CXXFLAGS) -H ..\..\src\common\dummy.cpp
 $(OBJS)\gldll_version.res: ..\..\src\msw\version.rc
-	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG) -i$(BCCDIR)\include\windows\sdk  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_GL ..\..\src\msw\version.rc
+	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_GL ..\..\src\msw\version.rc
 $(OBJS)\gldll_glcmn.obj: ..\..\src\common\glcmn.cpp
 	$(CXX) -q -c -P -o$@ $(GLDLL_CXXFLAGS) ..\..\src\common\glcmn.cpp
--- a/build/msw/makefile.gcc
+++ b/build/msw/makefile.gcc
@@ -5659,7 +5659,7 @@ $(SETUPHDIR)\wx\msw\rcdefs.h: $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcdefs
 build_cfg_file: $(SETUPHDIR)
 	@echo WXVER_MAJOR=3 >$(BUILD_CFG_FILE)
 	@echo WXVER_MINOR=0 >>$(BUILD_CFG_FILE)
-	@echo WXVER_RELEASE=3 >>$(BUILD_CFG_FILE)
+	@echo WXVER_RELEASE=2 >>$(BUILD_CFG_FILE)
 	@echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE)
 	@echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE)
 	@echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE)
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -6174,7 +6174,7 @@ $(SETUPHDIR)\wx\msw\rcdefs.h: $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcdefs
 build_cfg_file: $(SETUPHDIR)
 	@echo WXVER_MAJOR=3 >$(BUILD_CFG_FILE)
 	@echo WXVER_MINOR=0 >>$(BUILD_CFG_FILE)
-	@echo WXVER_RELEASE=3 >>$(BUILD_CFG_FILE)
+	@echo WXVER_RELEASE=2 >>$(BUILD_CFG_FILE)
 	@echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE)
 	@echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE)
 	@echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE)
--- a/build/msw/makefile.wat
+++ b/build/msw/makefile.wat
@@ -5931,7 +5931,7 @@ $(SETUPHDIR)\wx\msw\rcdefs.h :  $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcde
 build_cfg_file : .SYMBOLIC $(SETUPHDIR)
 	@echo WXVER_MAJOR=3 >$(BUILD_CFG_FILE)
 	@echo WXVER_MINOR=0 >>$(BUILD_CFG_FILE)
-	@echo WXVER_RELEASE=3 >>$(BUILD_CFG_FILE)
+	@echo WXVER_RELEASE=2 >>$(BUILD_CFG_FILE)
 	@echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE)
 	@echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE)
 	@echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE)
--- a/build/msw/wx_vc12_wx_setup.props
+++ b/build/msw/wx_vc12_wx_setup.props
@@ -70,9 +70,6 @@
    <wxBaseLibNamePrefix>wxbase$(wxShortVersionString)$(wxSuffix)</wxBaseLibNamePrefix>
  </PropertyGroup>
  <ItemDefinitionGroup>
    <ClCompile>
      <AdditionalOptions Condition="'$(PlatformToolset)' == 'v140_xp'">/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions>
    </ClCompile>
    <Link>
      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;advapi32.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;wininet.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
    </Link>
--- a/build/osx/readme.txt
+++ b/build/osx/readme.txt
@@ -7,7 +7,7 @@ Building Projects
 -----------------
 makeprojects is an AppleScript that uses the XML Tools from 
-http://www.latenightsw.com/freeware/xml-tools/
+http://www.latenightsw.com/freeware/XMLTools2/
 the reason for this script is to support a single place of definition for the files needed
 for a certain platform by building Xcode projects from the bakefiles files.bkl file list.
@@ -25,6 +25,6 @@ Prerequisites
 you need the xml scripting additions from latenightsw, 
-http://www.latenightsw.com/freeware/xml-tools/
+http://www.latenightsw.com/freeware/XMLTools2/
 Stefan Csomor
--- a/build/osx/wx.xcconfig
+++ b/build/osx/wx.xcconfig
@@ -10,8 +10,8 @@ OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS) -fvisibility-inlines-hidden
 GCC_PREFIX_HEADER = $(WXROOT)/include/wx/wxprec.h
 GCC_PRECOMPILE_PREFIX_HEADER = YES
-HEADER_SEARCH_PATHS = "$(WXROOT)/src/tiff/libtiff" "$(WXROOT)/src/regex"
+HEADER_SEARCH_PATHS = "$(WXROOT)/src/tiff/libtiff"
-USER_HEADER_SEARCH_PATHS = "$(WXROOT)/include" "$(WXROOT)/build/osx/setup/$(WXTOOLKIT)/include" "$(WXROOT)/src/zlib" "$(WXROOT)/src/jpeg" "$(WXROOT)/src/png" "$(WXROOT)/src/expat/lib" "$(WXROOT)/src/tiff/libtiff" "$(WXROOT)/src/stc/scintilla/src" "$(WXROOT)/src/stc/scintilla/include" "$(WXROOT)/src/stc/scintilla/lexlib"
+USER_HEADER_SEARCH_PATHS = "$(WXROOT)/include" "$(WXROOT)/build/osx/setup/$(WXTOOLKIT)/include" "$(WXROOT)/src/zlib" "$(WXROOT)/src/jpeg" "$(WXROOT)/src/png" "$(WXROOT)/src/regex" "$(WXROOT)/src/expat/lib" "$(WXROOT)/src/tiff/libtiff" "$(WXROOT)/src/stc/scintilla/src" "$(WXROOT)/src/stc/scintilla/include" "$(WXROOT)/src/stc/scintilla/lexlib"
 ALWAYS_SEARCH_USER_PATHS = NO
 GCC_PREPROCESSOR_DEFINITIONS = $(WX_PREPROCESSOR_DEFINITIONS) WXBUILDING $(WXPLATFORM) __WX__ wxUSE_BASE=1 _FILE_OFFSET_BITS=64 _LARGE_FILES MACOS_CLASSIC __WXMAC_XCODE__=1 SCI_LEXER WX_PRECOMP=1 wxUSE_UNICODE_UTF8=0 wxUSE_UNICODE_WCHAR=1
 GCC_PFE_FILE_C_DIALECTS = c++ objective-c++
--- a/build/osx/wxvers.xcconfig
+++ b/build/osx/wxvers.xcconfig
@@ -1,4 +1,4 @@
 // update this file with new version numbers
 DYLIB_COMPATIBILITY_VERSION = 3.0
-DYLIB_CURRENT_VERSION = 3.0.3
+DYLIB_CURRENT_VERSION = 3.0.2
--- a/build/tools/appveyor.bat
+++ b/build/tools/appveyor.bat
@@ -1,45 +0,0 @@
 goto %TOOLSET%
 :msbuild
 cd build\msw
 msbuild /m:2 /v:n /p:Platform=%ARCH% /p:Configuration="%CONFIGURATION%" wx_vc12.sln
 goto :eof
 :nmake
 cd build\msw
 call "C:\Program Files (x86)\Microsoft Visual Studio %VS%\VC\vcvarsall.bat" %ARCH%
 nmake -f makefile.vc BUILD=%BUILD%
 goto :eof
 :mingw
 cd build\msw
 path C:\MinGW\bin;%path%
 echo --- Tools versions:
 g++ --version | head -1
 mingw32-make --version | head -1
 ar --version | head -1
 echo.
 echo --- Starting the build
 echo.
 mingw32-make SHELL=cmd -f makefile.gcc setup_h BUILD=debug SHARED=0 USE_GUI=0
 mingw32-make SHELL=cmd -j3 -f makefile.gcc BUILD=debug SHARED=0 USE_GUI=0
 goto :eof
 :msys2
 path C:\msys64\%MSYSTEM%\bin;C:\msys64\usr\bin;%path%
 set CHERE_INVOKING=yes
 :: Workaround for "configure: Bad file descriptor"
 perl -i".bak" -pe "s/^test -n \".DJDIR\"/#$&/" configure
 bash -lc "g++ --version"
 bash -lc "CXXFLAGS=-Wno-deprecated-declarations ./configure --enable-debug --disable-xrc && make -j3"
 goto :eof
 :cygwin
 C:\cygwin\setup-x86.exe -qnNdO -R C:/cygwin -s http://cygwin.mirror.constant.com -l C:/cygwin/var/cache/setup -P libjpeg-devel -P libpng-devel -P libtiff-devel -P libexpat-devel
 path c:\cygwin\bin;%path%
 set CHERE_INVOKING=yes
 :: Workaround for "configure: Bad file descriptor"
 perl -i".bak" -pe "s/^test -n \".DJDIR\"/#$&/" configure
 bash -lc "g++ --version"
 bash -lc "LDFLAGS=-L/usr/lib/w32api ./configure --enable-debug --disable-shared --disable-html --disable-richtext --disable-stc && make -j3"
 goto :eof
--- a/build/tools/bld_chm_exe.bat
+++ b/build/tools/bld_chm_exe.bat
@@ -0,0 +1,82 @@
 rem Uncomment the next line to set the version; used also in wxWidgets.iss
 SET WXW_VER=3.0.2
 if (%WXW_VER%)==() SET WXW_VER=SVN
 echo docs building for %WXW_VER%
 rem  This builds the docs in %WXWIN% in a number of formats 
 rem  and a clean inno setup in a second tree
 rem  it uses a number of tools, gnuwin32 zip & dos2unix, 
 rem  writes a log file in c:\
 echo Building wxWidgets-%WXW_VER% docs... > c:\temp.log
 set WXWIN=c:\wx\wxWidgets
 set DAILY=c:\daily
 set INNO=c:\wx\inno\wxWidgets
 rem svn already in my path...
 set PATH=%PATH%;c:\wx\Gnu\bin;c:\progra~1\htmlhe~1;C:\PROGRA~1\INNOSE~1;c:\wx\doxygen\bin
 set PATH=%PATH%;C:\wx\Graphviz\bin
 echo %PATH% >>  c:\temp.log
 rem update wxwidgets (holds docs) and inno (wxMSW setup.exe only)
 c:
 cd %WXWIN%
 svn cleanup >>  c:\temp.log
 svn up >>  c:\temp.log
 rem now inno
 cd %INNO% >>  c:\temp.log
 rem Don't update the svn automatically
 rem svn cleanup >>  c:\temp.log
 rem svn up >>  c:\temp.log
 if exist include\wx\msw\setup.h del include\wx\msw\setup.h
 if exist include\wx\univ\setup.h del include\wx\univ\setup.h
 del c*.*
 svn up configure
 svn up configure.in
 svn up config.guess
 svn up config.sub
 dos2unix configure
 dos2unix config.guess
 dos2unix config.sub
 copy include\wx\msw\setup0.h include\wx\msw\setup.h
 copy include\wx\univ\setup0.h include\wx\univ\setup.h
 echo SVN update  >>  c:\temp.log
 rem make   chm
 rem Now create standalone copies of docs (chm and htb)
 cd %WXWIN%\docs\doxygen
 del out\html\*.html
 del out\html\*.htb
 del out\html\*.zip
 del out\*.chm
 call regen chm
 cd %WXWIN%\docs\doxygen\out
 zip wxWidgets-%WXW_VER%-docs-chm.zip wx.chm
 copy wxWidgets-%WXW_VER%-docs-chm.zip %DAILY%
 cd html
 del *.dot
 del *.md5
 zip -r wx.htb *.*
 copy wx.htb %DAILY%\wxWidgets-%WXW_VER%-docs-html.zip
 zip wxWidgets-%WXW_VER%-docs-htb.zip wx.htb
 copy wxWidgets-%WXW_VER%-docs-htb.zip %DAILY%
 mkdir %INNO%\docs\htmlhelp
 copy %WXWIN%\docs\doxygen\out\wx.chm %INNO%\docs\htmlhelp\wx.chm
 cd %WXWIN%\build\tools
 iscc wxwidgets.iss >> c:\temp.log
 copy %INNO%\..\wxMSW-%WXW_VER%-Setup.exe c:\daily
 echo docs built for %WXW_VER%
 echo docs built for %WXW_VER% >> c:\temp.log
--- a/build/tools/build-wxwidgets.py
+++ b/build/tools/build-wxwidgets.py
@@ -16,8 +16,6 @@ import shutil
 import types
 import subprocess
 PY3 = sys.version_info[0] == 3
 # builder object
 wxBuilder = None
@@ -203,7 +201,6 @@ def main(scriptName, args):
        "jobs"          : (defJobs, "Number of jobs to run at one time in make. Default: %s" % defJobs),
        "install"       : (False, "Install the toolkit to the installdir directory, or the default dir."),
        "installdir"    : ("", "Directory where built wxWidgets will be installed"),
        "gtk3"          : (False, "On Linux build for gtk3 (default gtk2)"),
        "mac_distdir"   : (None, "If set on Mac, will create an installer package in the specified dir."),
        "mac_universal_binary" 
                        : ("", "Comma separated list of architectures to include in the Mac universal binary"),
@@ -216,8 +213,8 @@ def main(scriptName, args):
        "rebake"        : (False, "Regenerate Bakefile and autoconf files"),
        "unicode"       : (False, "Build the library with unicode support"),
        "wxpython"      : (False, "Build the wxWidgets library with all options needed by wxPython"),
-        "osx_cocoa"     : (False, "Build the Cocoa port"),
+        "cocoa"         : (False, "Build the old Mac Cocoa port."),
-        "osx_carbon"    : (False, "Build the Carbon port"),
+        "osx_cocoa"     : (False, "Build the new Cocoa port"),
        "shared"        : (False, "Build wx as a dynamic library"),
        "extra_make"    : ("", "Extra args to pass on [n]make's command line."),
        "features"      : ("", "A comma-separated list of wxUSE_XYZ defines on Win, or a list of configure flags on unix."),
@@ -261,13 +258,11 @@ def main(scriptName, args):
        if options.debug:
            configure_opts.append("--enable-debug")
        if options.cocoa:
            configure_opts.append("--with-old_cocoa")
        if options.osx_cocoa:
            configure_opts.append("--with-osx_cocoa")
        elif options.osx_carbon:
            configure_opts.append("--with-osx_carbon")
        if options.gtk3:
            configure_opts.append("--with-gtk=3")
        wxpy_configure_opts = [
                            "--with-opengl",
@@ -294,10 +289,14 @@ def main(scriptName, args):
        # TODO: there should be a command line option to set the SDK...
        if sys.platform.startswith("darwin"):
            for xcodePath in getXcodePaths():
-                sdks = [ xcodePath+"/SDKs/MacOSX10.{}.sdk".format(n) 
+                sdks = [
-                         for n in range(5, 15) ]
+                    xcodePath+"/SDKs/MacOSX10.5.sdk",
                    xcodePath+"/SDKs/MacOSX10.6.sdk",
                    xcodePath+"/SDKs/MacOSX10.7.sdk",
                    xcodePath+"/SDKs/MacOSX10.8.sdk",
                    ]
-                # use the lowest available sdk on the build machine
+                # use the lowest available sdk
                for sdk in sdks:
                    if os.path.exists(sdk):
                        wxpy_configure_opts.append(
@@ -408,10 +407,7 @@ def main(scriptName, args):
        mswIncludeDir = os.path.join(wxRootDir, "include", "wx", "msw")
        setup0File = os.path.join(mswIncludeDir, "setup0.h")
-        with open(setup0File, "rb") as f:
+        setupText = open(setup0File, "rb").read()
            setupText = f.read()
            if PY3:
                setupText = setupText.decode('utf-8')
        for flag in flags:
            setupText, subsMade = re.subn(flag + "\s+?\d", "%s %s" % (flag, flags[flag]), setupText)
@@ -419,11 +415,9 @@ def main(scriptName, args):
                print("Flag %s wasn't found in setup0.h!" % flag)
                sys.exit(1)
-        with open(os.path.join(mswIncludeDir, "setup.h"), "wb") as f:
+        setupFile = open(os.path.join(mswIncludeDir, "setup.h"), "wb")
-            if PY3:
+        setupFile.write(setupText)
-                setupText = setupText.encode('utf-8')
+        setupFile.close()
            f.write(setupText)
        args = []
        if toolkit == "msvc":
            print("setting build options...")
--- a/build/tools/git-make-release
+++ b/build/tools/git-make-release
@@ -0,0 +1,84 @@
 #!/bin/sh
 #
 # This is the script used by VZ to make wxWidgets releases. It is unofficial
 # because it must be ran from git-svn repository and not the official svn one
 # and relies on having a recent Perl installation. But it has the advantage of
 # being very simple because git knows which files should be included in the
 # distribution and we don't need to maintain the list of them ourselves but we
 # also don't run the risk of including anything unwanted.
 #
 # Another prerequisite for using it is to create the list of files to be
 # converted to DOS EOLs for Windows distribution, it must exist in the parent
 # directory and be called eol-native. This can be done using the companion
 # svn-find-native-eols.pl script. And will only need to be redone when
 # svn:eol-style property changes for any files (most likely because it will be
 # set for a newly added file).
 #
 # To summarize, here are the steps to create the release:
 #
 #   % cd $svn
 #   % $git/build/tools/svn-find-native-eols.pl > $git/../eol-native
 #   % cd $git
 #   % git svn tag WX_x_y_z
 #   % ./build/tools/git-make-release x.y.z
 #   % ... upload ../wxWidgets-x.y.z.{7z,tar.bz2,zip} ...
 #
 # If anything is wrong and some minor fixes are required, only the last two
 # steps (tagging and git-make-release) must be repeated.
 version=$1
 if [ -z "$version" ]; then
    echo "Must specify the distribution version." >&2
    exit 1
 fi
 EOL_FILE=../eol-native
 if [ ! -r "$EOL_FILE" ]; then
    echo "Use build/tools/svn-find-native-eols.pl to generate $EOL_FILE." >&2
    exit 1
 fi
 set -e
 set -x
 prefix=wxWidgets-$version
 destdir=$(dirname $(readlink -f $0))/../../../$prefix
 cleanup() {
    rm -rf $destdir
 }
 trap cleanup INT TERM EXIT
 cleanup
 git archive --prefix=$prefix/ HEAD | (cd ..; tar x)
 cd ..
 # All setup0.h files are supposed to be renamed to just setup.h when checked
 # out and in the distribution.
 find $prefix/include/wx -type f -name setup0.h | while read f; do
    mv $f ${f%0.h}.h
 done
 # Compile gettext catalogs.
 make -C $prefix/locale allmo
 tar cjf $prefix.tar.bz2 $prefix
 cd $prefix
 set +x
 for f in `cat $EOL_FILE`; do
    case $f in
        */setup0.h)
            # we renamed this file above so adjust
            f=${f%0.h}.h
            ;;
    esac
    unix2dos -q $f
 done
 set -x
 zip -q -r ../$prefix.zip .
 7z a ../$prefix.7z . >/dev/null
 7z a ../${prefix}_headers.7z include >/dev/null
--- a/build/tools/make-html-docs
+++ b/build/tools/make-html-docs
@@ -0,0 +1,30 @@
 #!/bin/sh
 #
 # This script creates archives of HTML documentation in  tar.bz2 and zip
 # formats. It relies on docs/doxygen/regen.sh to really generate the docs.
 #
 # The script should be ran from the root of wxWidgets checkout and creates the
 # output files in its parent directory.
 version=$1
 if [ -z "$version" ]; then
    echo "Must specify the distribution version." >&2
    exit 1
 fi
 set -e
 set -x
 docs_dir_name=wxWidgets-$version
 docs_file_basename=wxWidgets-$version-docs-html
 cd docs/doxygen
 ./regen.sh html
 cd out
 mv html $docs_dir_name
 tar cjf ../../../../$docs_file_basename.tar.bz2 $docs_dir_name
 cd $docs_dir_name
 zip -q -r ../../../../../$docs_file_basename.zip .
 cd ..
 mv $docs_dir_name html
--- a/build/tools/msvs/build2015.bat
+++ b/build/tools/msvs/build2015.bat
@@ -1,64 +0,0 @@
 if "%1" == "" goto ERR_NOPARM
 if "%2" == "" goto ERR_NOPARM
 if "%3" == "" goto ERR_NOPARM
 cd c:\wxWidgets-%1.%2.%3\build\msw
 rem ================ VS 2015 Official Build ===============
 rem
 rem Copy this file to the \wxwidgets-x.y.z\build\msw folder
 rem
 rem Open a Visual Studio 2015 Developer command prompt.
 rem
 rem cd \wxwidgets-x.y.z\build\msw
 rem build2015
 rem
 rem ========================================================
 rem Remove the existing destination folders if the exist so that a complete rebuild occurs.
 rmdir vc140_mswuddll /s /q
 rmdir vc140_mswuddll_x64 /s /q
 rmdir vc140_mswudll /s /q
 rmdir vc140_mswudll_x64 /s /q
 rmdir ..\..\lib\vc140_dll /s /q
 rmdir ..\..\lib\vc140_x64_dll /s /q
 rem Delete the build output files from the last run, if any.
 del 2015x86_Debug.txt
 del 2015x86_Release.txt
 del 2015x64_Debug.txt
 del 2015x64_Release.txt
 call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64
 rem 64 bit release build
 rem ------------------
 nmake -f makefile.vc BUILD=release SHARED=1 COMPILER_VERSION=140 OFFICIAL_BUILD=1 TARGET_CPU=AMD64 >> 2015x64_Release.txt
 rem 64 bit debug build
 rem ------------------
 nmake -f makefile.vc BUILD=debug SHARED=1 COMPILER_VERSION=140 OFFICIAL_BUILD=1 TARGET_CPU=AMD64 >> 2015x64_Debug.txt
 call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86
 rem 32 bit release build
 rem ------------------
 nmake -f makefile.vc BUILD=release SHARED=1 COMPILER_VERSION=140 OFFICIAL_BUILD=1 CPPFLAGS=/arch:SSE CFLAGS=/arch:SSE >> 2015x86_Release.txt
 rem 32 bit debug build
 rem ------------------
 nmake -f makefile.vc BUILD=debug SHARED=1 COMPILER_VERSION=140 OFFICIAL_BUILD=1 CPPFLAGS=/arch:SSE CFLAGS=/arch:SSE >> 2015x86_Debug.txt
 goto End
 :ERR_NOPARM
   @echo.
   @echo ERROR: NO PARAMETER SUPPLIED
   @echo MajorVers MinorVers BuildVers
 :End
 cd c:\wxWidgets
--- a/build/tools/release.bat
+++ b/build/tools/release.bat
@@ -1,71 +0,0 @@
@echo off
 setlocal enabledelayedexpansion
 rem This script builds the CHM manual and the Windows installer for release.
 if "%1" == "" (
    echo You must specify a release version.
    exit /b 1
 )
 pushd "%~dp0..\.."
 set root=%cd%
 set version=%1
 set prefix=wxWidgets-%1
 set release_path=%root%\distrib\release\%version%
 where /q 7z
 if %ERRORLEVEL% neq 0 (
    echo Error: 7-Zip was not found in your PATH.
    exit /b 1
 )
 where /q dot
 if %ERRORLEVEL% neq 0 (
    echo Error: GraphViz was not found in your PATH.
    exit /b 1
 )
 where /q doxygen
 if %ERRORLEVEL% neq 0 (
    echo Error: Doxygen was not found in your PATH.
    exit /b 1
 )
 where /q hhc
 if %ERRORLEVEL% neq 0 (
    echo Error: HTML Help Workshop was not found in your PATH.
    exit /b 1
 )
 where /q iscc
 if %ERRORLEVEL% neq 0 (
    echo Error: Inno Setup was not found in your PATH.
    exit /b 1
 )
 if not exist "%release_path%\%prefix%.zip" (
    echo Error: Release ZIP package not found: %release_path%\%prefix%.zip
    exit /b 1
 )
 pushd "%root%\docs\doxygen"
 echo Building the CHM manual...
 call regen.bat chm
 if %errorlevel% neq 0 exit /b %errorlevel%
 copy out\wx.chm "%release_path%\%prefix%.chm"
 popd
 if exist "%release_path%\%prefix%" rd /s /q "%release_path%\%prefix%"
 md "%release_path%\%prefix%"
 pushd "%release_path%\%prefix%"
 echo Extracting release ZIP for installer...
 7z x "..\%prefix%.zip"
 if %errorlevel% neq 0 exit /b %errorlevel%
 md docs\htmlhelp
 copy "..\%prefix%.chm" docs\htmlhelp\wx.chm
 set WXW_VER=%1
 echo Building the installer...
 iscc /Qp build\tools\wxwidgets.iss
 if %errorlevel% neq 0 exit /b %errorlevel%
 popd
 echo Cleaning up installer files...
 rd /s /q "%release_path%\%prefix%"
--- a/build/tools/release.sh
+++ b/build/tools/release.sh
@@ -1,71 +0,0 @@
 #!/bin/sh
 #
 # This is the official script used to make wxWidgets releases.
 #
 # We use the git export features to track which files should be included in the
 # distribution and we don't need to maintain the list of them ourselves but we
 # also don't run the risk of including anything unwanted.
 #
 # See docs/tech/tn0022.txt for usage instructions.
 version=$1
 if [ -z "$version" ]; then
    echo "Must specify the distribution version." >&2
    exit 1
 fi
 root="$(readlink -f $(dirname $(readlink -f $0))/../..)"
 cd "$root"
 if ! git diff --quiet; then
    echo "Working copy has modifications, commit or stash them." >&2
    exit 2
 fi
 set -e
 set -x
 prefix=wxWidgets-$version
 destdir="$root/distrib/release/$version"
 cleanup() {
    rm -rf $destdir/$prefix
 }
 trap cleanup INT TERM EXIT
 cleanup
 mkdir -p $destdir
 git archive --prefix=$prefix/ HEAD | (cd $destdir; tar x)
 cd $destdir
 # All setup0.h files are supposed to be renamed to just setup.h when checked
 # out and in the distribution.
 find $prefix/include/wx -type f -name setup0.h | while read f; do
    mv $f ${f%0.h}.h
 done
 # Compile gettext catalogs.
 make -C $prefix/locale allmo
 tar cjf $prefix.tar.bz2 $prefix
 cd $prefix
 zip -q -r ../$prefix.zip .
 7z a ../$prefix.7z . >/dev/null
 7z a ../${prefix}-headers.7z include >/dev/null
 # Build HTML documentation packages.
 prefix_docs=$prefix-docs-html
 cd "$root/docs/doxygen"
 rm -rf out
 ./regen.sh html
 cd out
 mv html "$prefix_docs"
 tar cjf "$destdir/$prefix_docs.tar.bz2" "$prefix_docs"
 cd "$prefix_docs"
 zip -q -r "$destdir/$prefix_docs.zip" .
 cd "$root"
 rm -rf "$root/docs/doxygen/out"
--- a/build/tools/svn-find-native-eols.pl
+++ b/build/tools/svn-find-native-eols.pl
@@ -0,0 +1,36 @@
 #!/usr/bin/perl
 #
 # This script produces the list of all files using native svn:eol-style.
 #
 # It's used as a helper for distribution creation as this is also the
 # list of files which need to have their line endings converted for
 # the use on the platform other than the current one.
 #
 # Notice that the script requires Perl 5.10 (which could be easily avoided but
 # as this is for my personal use mostly so far, I didn't bother) and Perl svn
 # bindings.
 use 5.10.0;
 use strict;
 use warnings;
 use SVN::Client;
 # Normally we get the list directly from the server but this is slow,
 # so if you already have an (up to date!) svn checkout, you can also
 # pass a path to it here, the script will work much faster then.
 my $root = $ARGV[0] // 'https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk';
 my $ctx = SVN::Client->new
    or die "Failed to create svn context, do you have svn auth stored?\n";
 my $props = $ctx->proplist($root, undef, 1)
    or die "Failed to list properties for files under $root.\n";
 foreach my $prop (@$props) {
    my $eol = ${$prop->prop_hash()}{'svn:eol-style'};
    if ( defined $eol && ($eol eq 'native') ) {
        my $rel = $prop->node_name();
        substr($rel, 0, length($root) + 1, ''); # +1 for leading slash
        say $rel;
    }
 }
--- a/build/tools/wxwidgets.iss
+++ b/build/tools/wxwidgets.iss
@@ -7,9 +7,9 @@
    #define WXW_DIR "..\.."
 #endif
-#if GetEnv("WXW_VER") == "Snapshot"
+#if GetEnv("WXW_VER") == "SVN"
    #define INFOFILE  WXW_DIR + "\BuildSVN.txt"
-    #define WX_VERSION "Snapshot"
+    #define WX_VERSION "SVN"
 #elif GetEnv("WXW_VER") != ""
    #define INFOFILE WXW_DIR + "\docs\msw\install.txt"
    #define WX_VERSION GetEnv("WXW_VER")
@@ -44,7 +44,7 @@ SolidCompression=yes
 [Files]
 ; source files
-Source: "{#WXW_DIR}\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "{#WXW_DIR}\*"; DestDir: "{app}"; Excludes: "cocoa,dfb,gtk,gtk1,motif,msdos,os2,osx,wxWindows.xcod*,x11,distrib"; Flags: ignoreversion recursesubdirs createallsubdirs
 [INI]
 Filename: "{app}\wx.url"; Section: "InternetShortcut"; Key: "URL"; String: "http://www.wxwidgets.org"
--- a/832
+++ b/832
--- a/configure.in
+++ b/configure.in
@@ -14,7 +14,7 @@ dnl ---------------------------------------------------------------------------
 dnl initialization
 dnl ---------------------------------------------------------------------------
-AC_INIT([wxWidgets], [3.0.3], [wx-dev@lists.wxwidgets.org])
+AC_INIT([wxWidgets], [3.0.2], [wx-dev@lists.wxwidgets.org])
 dnl the file passed to AC_CONFIG_SRCDIR should be specific to our package
 AC_CONFIG_SRCDIR([wx-config.in])
@@ -40,7 +40,7 @@ dnl wx_release_number += 1
 wx_major_version_number=3
 wx_minor_version_number=0
-wx_release_number=3
+wx_release_number=2
 wx_subrelease_number=0
 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
@@ -838,8 +838,6 @@ dnl wxDC is implemented in terms of wxGraphicsContext in wxOSX so the latter
 dnl can't be disabled, don't even provide an option to do it
 if test "$wxUSE_MAC" != 1; then
 WX_ARG_FEATURE(graphics_ctx,[  --enable-graphics_ctx   use graphics context 2D drawing API], wxUSE_GRAPHICS_CONTEXT)
 else
 WX_ARG_DISABLE(qtkit,       [  --disable-qtkit         force AVFoundation instead of QTKit (requires OS X 10.7+)], wxOSX_USE_QTKIT)
 fi
 dnl ---------------------------------------------------------------------------
@@ -3150,7 +3148,7 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
        if test "$ac_find_includes" != "" ; then
            AC_MSG_RESULT(found in $ac_find_includes)
            WX_INCLUDE_PATH_EXIST($ac_find_includes, $TOOLKIT_INCLUDE)
-            TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE $ac_path_to_include"
+            TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE$ac_path_to_include"
        else
            save_CFLAGS=$CFLAGS
            CFLAGS="$TOOLKIT_INCLUDE $CFLAGS"
@@ -3184,7 +3182,7 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
            AC_MSG_RESULT(found in $ac_find_libraries)
            WX_LINK_PATH_EXIST($ac_find_libraries, $GUI_TK_LIBRARY)
-            GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link"
+            GUI_TK_LIBRARY="$GUI_TK_LIBRARY$ac_path_to_link"
        else
            dnl it might happen that we found headers in one of the standard
            dnl paths but the libs are elsewhere but still in default (linker)
@@ -3225,7 +3223,7 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
                for libsm_ice in "" " -lSM -lICE"; do
                    if test "$libs_found" = 0; then
                        save_LIBS="$LIBS"
-                        LIBS="$GUI_TK_LIBRARY -lXm ${libp} -lXmu -lXext -lXt ${libsm_ice} -lX11"
+                        LIBS="$GUI_TK_LIBRARY -lXm ${libp} -lXmu -lXext -lXt${libsm_ice} -lX11"
                        save_CFLAGS=$CFLAGS
                        CFLAGS="$TOOLKIT_INCLUDE $CFLAGS"
@@ -3244,7 +3242,7 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
                                libp_link="$libp"
                                libsm_ice_link="$libsm_ice"
                                AC_MSG_RESULT(
-                                    [need ${libp_link} ${libsm_ice_link}])
+                                    [need${libp_link}${libsm_ice_link}])
                                libs_found=1
                            ], []
                        )
@@ -3307,7 +3305,7 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
        CFLAGS=$save_CFLAGS
-        GUI_TK_LIBRARY="$GUI_TK_LIBRARY ${libsgm_link} -lXm ${libp_link} -lXmu -lXext -lXt ${libsm_ice_link} -lX11"
+        GUI_TK_LIBRARY="$GUI_TK_LIBRARY${libsgm_link} -lXm${libp_link} -lXmu -lXext -lXt${libsm_ice_link} -lX11"
        TOOLKIT=MOTIF
        GUIDIST=MOTIF_DIST
    fi
@@ -3320,7 +3318,7 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
            WX_PATH_FIND_LIBRARIES(Xpm)
            if test "$ac_find_libraries" != "" ; then
                WX_LINK_PATH_EXIST($ac_find_libraries,$GUI_TK_LIBRARY)
-                GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link"
+                GUI_TK_LIBRARY="$GUI_TK_LIBRARY$ac_path_to_link"
                AC_MSG_RESULT(found in $ac_find_libraries)
                AC_CACHE_CHECK([for X11/xpm.h],
@@ -3638,7 +3636,7 @@ if test "$wxUSE_OPENGL" = "yes" -o "$wxUSE_OPENGL" = "auto"; then
                        WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
                        if test "$ac_path_to_link" != " -L/usr/lib" -a \
                                "$ac_path_to_link" != "$LDFLAGS_GL" ; then
-                          LDFLAGS_GL="$LDFLAGS_GL $ac_path_to_link"
+                          LDFLAGS_GL="$LDFLAGS_GL$ac_path_to_link"
                        fi
                      fi
@@ -3653,7 +3651,7 @@ if test "$wxUSE_OPENGL" = "yes" -o "$wxUSE_OPENGL" = "auto"; then
                      if test "$ac_find_libraries" != "std" ; then
                        WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
                        if test "$ac_path_to_link" != " -L/usr/lib" ; then
-                          LDFLAGS_GL="$LDFLAGS_GL $ac_path_to_link"
+                          LDFLAGS_GL="$LDFLAGS_GL$ac_path_to_link"
                        fi
                      fi
                      OPENGL_LIBS="-lMesaGL -lMesaGLU"
@@ -5412,7 +5410,7 @@ if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then
                            [
                                AC_DEFINE(HAVE_DLOPEN)
                                HAVE_DL_FUNCS=1
-                                DL_LINK="-ldl $DL_LINK"
+                                DL_LINK=" -ldl$DL_LINK"
                            ],
                            [
                                AC_CHECK_FUNCS(shl_load,
@@ -5424,7 +5422,7 @@ if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then
                                                AC_CHECK_LIB(shl_load, dld,
                                                             [
                                                                HAVE_SHL_FUNCS=1
-                                                                DL_LINK="-ldld $DL_LINK"
+                                                                DL_LINK=" -ldld$DL_LINK"
                                                             ])
                                              ])
                            ])
@@ -5598,17 +5596,6 @@ WITH_PLUGIN_SDL=0
 if test "$wxUSE_SOUND" = "yes"; then
  if test "$USE_UNIX" = 1 ; then
    if test "$wxUSE_LIBSDL" != "no"; then
      PKG_PROG_PKG_CONFIG()
      PKG_CHECK_MODULES([SDL], [sdl2 >= 2.0.0],
                  [
                    EXTRALIBS_SDL="$SDL_LIBS"
                    CFLAGS="$SDL_CFLAGS $CFLAGS"
                    CXXFLAGS="$SDL_CFLAGS $CXXFLAGS"
                    AC_DEFINE(wxUSE_LIBSDL)
                  ],
                  [
                    AC_MSG_NOTICE([SDL 2.0 not available. Falling back to 1.2.])
      AM_PATH_SDL([1.2.0],
                  [
                    EXTRALIBS_SDL="$SDL_LIBS"
@@ -5617,7 +5604,6 @@ if test "$wxUSE_SOUND" = "yes"; then
                    AC_DEFINE(wxUSE_LIBSDL)
                  ],
                  [wxUSE_LIBSDL="no"])
 		  ])
      if test "$wxUSE_LIBSDL" = "yes" -a "$wxUSE_PLUGINS" = "yes" ; then
        WITH_PLUGIN_SDL=1
      fi
@@ -6549,7 +6535,7 @@ if test "$USE_WIN32" = 1 -a \( "$wxUSE_DATAOBJ"       = "yes" \
                           [AC_MSG_RESULT(no)],
                           [AC_MSG_RESULT(yes)
                            WXCONFIG_CXXFLAGS="$WXCONFIG_CXXFLAGS -fvtable-thunks"])
-            LIBS="-lrpcrt4 -loleaut32 -lole32 -luuid $LIBS"
+            LIBS=" -lrpcrt4 -loleaut32 -lole32 -luuid$LIBS"
            if test "$wxUSE_OLE" = "yes" ; then
                AC_DEFINE(wxUSE_OLE)
                AC_DEFINE(wxUSE_OLE_AUTOMATION)
@@ -7263,7 +7249,7 @@ if test "$wxUSE_WEBVIEW" = "yes"; then
                              [
                                USE_WEBVIEW_WEBKIT=1
                                CPPFLAGS="$CPPFLAGS $WEBKIT_CFLAGS"
-                                EXTRALIBS_WEBVIEW="$WEBKIT_LIBS"
+                                GUI_TK_LIBRARY="$GUI_TK_LIBRARY $WEBKIT_LIBS"
                              ],
                              [
                                AC_MSG_WARN([webkitgtk not found.])
@@ -7560,28 +7546,14 @@ if test "$wxUSE_MEDIACTRL" = "yes" -o "$wxUSE_MEDIACTRL" = "auto"; then
        dnl Test for at least 0.8 gstreamer module from pkg-config
        dnl Even totem doesn't accept 0.9 evidently.
        dnl
-        dnl So, we first check to see if 1.0 if available - if not we
+        dnl So, we first check to see if 0.10 if available - if not we
-        dnl try the older 0.10 and 0.8 versions
+        dnl try the older 0.8 version
        dnl -------------------------------------------------------------------
        GST_VERSION_MAJOR=1
        GST_VERSION_MINOR=0
        GST_VERSION=$GST_VERSION_MAJOR.$GST_VERSION_MINOR
        if test "$wxUSE_GSTREAMER8" = "no"; then
            PKG_CHECK_MODULES(GST,
                [gstreamer-$GST_VERSION gstreamer-video-$GST_VERSION],
                [
                    wxUSE_GSTREAMER="yes"
                ],
                [
                    AC_MSG_WARN([GStreamer 1.0 not available, falling back to 0.10])
        GST_VERSION_MAJOR=0
        GST_VERSION_MINOR=10
        GST_VERSION=$GST_VERSION_MAJOR.$GST_VERSION_MINOR
                ]
            )
-            if test $GST_VERSION_MINOR = "10"; then
+        if test "$wxUSE_GSTREAMER8" = "no"; then
            PKG_CHECK_MODULES(GST,
                [gstreamer-$GST_VERSION gstreamer-plugins-base-$GST_VERSION],
                [
@@ -7590,13 +7562,11 @@ if test "$wxUSE_MEDIACTRL" = "yes" -o "$wxUSE_MEDIACTRL" = "auto"; then
                ],
                [
                    AC_MSG_WARN([GStreamer 0.10 not available, falling back to 0.8])
                    GST_VERSION_MINOR=8
                ]
            )
            fi
        else
            dnl check only for 0.8
            GST_VERSION_MAJOR=0
            GST_VERSION_MINOR=8
        fi
@@ -7606,7 +7576,7 @@ if test "$wxUSE_MEDIACTRL" = "yes" -o "$wxUSE_MEDIACTRL" = "auto"; then
                [gstreamer-$GST_VERSION gstreamer-interfaces-$GST_VERSION gstreamer-gconf-$GST_VERSION],
                wxUSE_GSTREAMER="yes",
                [
-                    AC_MSG_WARN([GStreamer 0.8/0.10/1.0 not available.])
+                    AC_MSG_WARN([GStreamer 0.8/0.10 not available.])
                ])
        fi
@@ -7621,50 +7591,9 @@ if test "$wxUSE_MEDIACTRL" = "yes" -o "$wxUSE_MEDIACTRL" = "auto"; then
        fi
    elif test "$wxUSE_MAC" = 1; then 
        if test "$wxUSE_OSX_IPHONE" = 1; then
            dnl this will also be used for cocoa in the future
            GST_LIBS="-framework AVFoundation -framework CoreMedia"
        else
         dnl We always have the necessary libraries under Mac 
         dnl but we need to link with it explicitly.
            dnl QTKit is no longer available as of 10.12 SDK
            old_CPPFLAGS="$CPPFLAGS"
            CPPFLAGS="-x objective-c++ $CPPFLAGS"
            if test "$wxOSX_USE_QTKIT" = "no"; then
                dnl Do not test for QTKit if has been disabled from the command line
                AC_DEFINE(wxOSX_USE_QTKIT,0)
                GST_LIBS="-framework AVFoundation -framework CoreMedia"
            else
                dnl check if QTKit is available, otherwise force AVFoundation usage
                AC_CHECK_HEADER([QTKit/QTKit.h],
                                [
         GST_LIBS="-framework QTKit"
                                ],
                                [
                                    AC_DEFINE(wxOSX_USE_QTKIT,0)
                                    wxOSX_USE_QTKIT=no
                                    GST_LIBS="-framework AVFoundation -framework CoreMedia"
                                ])
            fi
            if test "$wxOSX_USE_QTKIT" = "no"; then
                dnl AVKit is only available since OS X 10.9
                AC_MSG_CHECKING([if AVKit is available])
                AC_TRY_COMPILE(
                    [#include "AvailabilityMacros.h"],
                    [
                        #if defined(MAC_OS_X_VERSION_10_9) && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_9
                            // AVKit available
                        #else
                            choke me
                        #endif
                    ],
                    [GST_LIBS="$GST_LIBS -framework AVKit"; AC_MSG_RESULT(yes)],
                    AC_MSG_RESULT(no)
                )
            fi
            CPPFLAGS="$old_CPPFLAGS"
        fi
    fi
    if test $USE_MEDIA = 1; then
@@ -8073,7 +8002,6 @@ AC_SUBST(EXTRALIBS_GUI)
 AC_SUBST(EXTRALIBS_OPENGL)
 AC_SUBST(EXTRALIBS_SDL)
 AC_SUBST(EXTRALIBS_STC)
 AC_SUBST(EXTRALIBS_WEBVIEW)
 AC_SUBST(WITH_PLUGIN_SDL)
 AC_SUBST(UNICODE)
 AC_SUBST(DEBUG_INFO)
--- a/demos/bombs/Makefile.in
+++ b/demos/bombs/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 DESTDIR = 
 WX_RELEASE = 3.0
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 BOMBS_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
--- a/demos/bombs/makefile.bcc
+++ b/demos/bombs/makefile.bcc
@@ -253,9 +253,5 @@ $(OBJS)\bombs_game.obj: .\game.cpp
 	$(CXX) -q -c -P -o$@ $(BOMBS_CXXFLAGS) .\game.cpp
 $(OBJS)\bombs_bombs.res: .\bombs.rc
 <<<<<<< HEAD
 	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -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) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\bombs.rc
 =======
 	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -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) -i.\..\..\samples -i$(BCCDIR)\include\windows\sdk -dNOPCH .\bombs.rc
 >>>>>>> cbd92ce... Fix resource compiler include path for Borland.
--- a/demos/forty/Makefile.in
+++ b/demos/forty/Makefile.in
@@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@
 DESTDIR = 
 WX_RELEASE = 3.0
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 FORTY_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
--- a/demos/forty/makefile.bcc
+++ b/demos/forty/makefile.bcc
@@ -289,9 +289,5 @@ $(OBJS)\forty_scorefil.obj: .\scorefil.cpp
 	$(CXX) -q -c -P -o$@ $(FORTY_CXXFLAGS) .\scorefil.cpp
 $(OBJS)\forty_forty.res: .\forty.rc
 <<<<<<< HEAD
 	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -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) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\forty.rc
 =======
 	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -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) -i.\..\..\samples -i$(BCCDIR)\include\windows\sdk -dNOPCH .\forty.rc
 >>>>>>> cbd92ce... Fix resource compiler include path for Borland.
--- a/demos/fractal/Makefile.in
+++ b/demos/fractal/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 DESTDIR = 
 WX_RELEASE = 3.0
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 FRACTAL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
--- a/demos/fractal/makefile.bcc
+++ b/demos/fractal/makefile.bcc
@@ -245,9 +245,5 @@ $(OBJS)\fractal_fractal.obj: .\fractal.cpp
 	$(CXX) -q -c -P -o$@ $(FRACTAL_CXXFLAGS) .\fractal.cpp
 $(OBJS)\fractal_fractal.res: .\fractal.rc
 <<<<<<< HEAD
 	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -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) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\fractal.rc
 =======
 	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -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) -i.\..\..\samples -i$(BCCDIR)\include\windows\sdk -dNOPCH .\fractal.rc
 >>>>>>> cbd92ce... Fix resource compiler include path for Borland.
--- a/demos/life/Makefile.in
+++ b/demos/life/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 DESTDIR = 
 WX_RELEASE = 3.0
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 LIFE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
--- a/demos/life/makefile.bcc
+++ b/demos/life/makefile.bcc
@@ -261,9 +261,5 @@ $(OBJS)\life_reader.obj: .\reader.cpp
 	$(CXX) -q -c -P -o$@ $(LIFE_CXXFLAGS) .\reader.cpp
 $(OBJS)\life_life.res: .\life.rc
 <<<<<<< HEAD
 	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -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) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\life.rc
 =======
 	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -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) -i.\..\..\samples -i$(BCCDIR)\include\windows\sdk -dNOPCH .\life.rc
 >>>>>>> cbd92ce... Fix resource compiler include path for Borland.
--- a/demos/poem/Makefile.in
+++ b/demos/poem/Makefile.in
@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
 DESTDIR = 
 WX_RELEASE = 3.0
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 WXPOEM_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
--- a/demos/poem/makefile.bcc
+++ b/demos/poem/makefile.bcc
@@ -253,9 +253,5 @@ $(OBJS)\wxpoem_wxpoem.obj: .\wxpoem.cpp
 	$(CXX) -q -c -P -o$@ $(WXPOEM_CXXFLAGS) .\wxpoem.cpp
 $(OBJS)\wxpoem_wxpoem.res: .\wxpoem.rc
 <<<<<<< HEAD
 	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -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) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\wxpoem.rc
 =======
 	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -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) -i.\..\..\samples -i$(BCCDIR)\include\windows\sdk -dNOPCH .\wxpoem.rc
 >>>>>>> cbd92ce... Fix resource compiler include path for Borland.
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -127,12 +127,6 @@ Changes in behaviour not resulting in compilation errors, please read this!
  to check if the changes correspond to your expectations. And if you do need
  the old behaviour please contact us at wx-dev to let us know about it!
 - Revert to using equally-sized buttons in wxToolBar by default: restore the
  behaviour of the pre-3.0 versions in which toolbar buttons had the same
  width for the toolbars not using wxTB_HORZ_LAYOUT style. Toolbars with this
  style still size their buttons appropriately for their contents as they
  already did in the previous 3.0.x releases.
 - wxWindow::Freeze/Thaw() are not virtual any more, if you overrode them in
  your code you need to override DoFreeze/DoThaw() instead now.
@@ -351,9 +345,9 @@ Changes in behaviour which may result in compilation errors
 - Removed global GetLine() function from wx/protocol/protocol.h, use
  wxProtocol::ReadLine() instead.
- wxVariantData no longer derives from wxObject; instead of using
+- wxVariant no longer derives from wxObject. wxVariantData also no longer
-  wxDynamicCast with wxVariantData you can use the macro
+  derives from wxObject; instead of using wxDynamicCast with wxVariantData you
-  wxDynamicCastVariantData with the same arguments.
+  can use the macro wxDynamicCastVariantData with the same arguments.
 - wxWindow::Next/PrevControlId() don't exist any more as they couldn't be
  implemented correctly any longer because automatically generated ids are not
@@ -580,109 +574,6 @@ Major new features in this release
 3.0.3: (released 2017-05-02)
 ----------------------------
 All:
 - Fix wxFileName::MakeRelativeTo() for directory relatively to itself.
 - Fix wxLocale::IsOk() return true even if setting the locale failed.
 - Fix wxFTP::Pwd() to actually work.
 - Null-terminate wxApp::argv for compatibility with the real argv.
 Unix:
 - Fix wxIPaddress::Hostname() failing if /etc/hosts contained very long names.
 - Fix wxDateTime::ParseRfc822Date() for some TZ/DST combinations.
 - Fix bug in wxExecute() if child exited too quickly (Kevin B. McCarty).
 All (GUI):
 - Fix hang when deleting columns from wxTreeListCtrl.
 - Fix crash when deleting items from wxTreeListCtrl (Rexxar).
 - Allow requesting modern (3.x+) OpenGL version in wxGLCanvas (Fabio Arnold).
 - Allow using Ctrl-dragging to add to selection in wxGrid (Knut Petter Lehre).
 - Fix several floating point rounding bugs in wxPropertyGrid (Artur Wieczorek).
 - Restore support for wxFD_OVERWRITE_PROMPT and wxFD_FILE_MUST_EXIST in
  wxGenericFileDialog which was accidentally lost some time ago (Carl Godkin).
 - Fix handling of fast consecutive clicks in wxRibbonBar (atobi).
 - Fix updating nested window scrollbars in some cases (sbrowne).
 - Improve wxLIST_AUTOSIZE_XXX support in generic wxListCtrl (Kinaou Hervé).
 - Fix wxPGChoices copy ctor (Snoits).
 - Fix wxPixelData<wxImage>::Offset() for alpha (Markus Rollmann).
 - Fix bug in wxImage::ClearAlpha() for shared data (Markus Rollmann).
 - Accept wxALIGN_CENTRE_HORIZONTAL in wxStaticText XRC handler (David Hart).
 - Fix appearance after updating a wxGrid with hidden rows/columns (iwbnwif).
 - Make wxAuiNotebookXmlHandler actually work.
 - Fix key handling in wxStyledTextCtrl in non-Unicode build (David Costanzo).
 wxGTK:
 - Support for GStreamer 1.0 in wxMediaCtrl (Sebastian Dröge).
 - Fix infinite sizing loop with GTK3 when using wxScrolled with a non-default
  target window.
 - Fix wxBitmap ctor from XBM for non-square bitmaps.
 - Fix crashes in wxGTK3 when running with non-X11 backend (Marco Trevisan).
 - Fix coordinates of wxSetCursorEvent propagated to parent windows.
 - Fix GTK+ warnings when refreshing wxListCtrl items (Scott Talbert).
 - Fix using wxHTTP and wxFTP from worker thread.
 - Make items selected from keyboard visible in wxListCtrl (Jonathan Dagresta).
 - Cosmetic fix for empty wxCheckBoxes display (Chuddah).
 - Fix crashes in wxFileSystemWatcher implementation (David Hart).
 - Fix key events codes when using Wayland (David Hart).
 wxMSW:
 - Fix compilation with g++ 4.9 in non-C++11 mode.
 - Fix rendering of owner drawn multi-column menus (Pete Bannister).
 - Fix regression in accessibility support (Leland Lucius).
 - Fix regression in wxDC drawing with bottom-to-top y axis (Artur Wieczorek).
 - Fix compilation with C++Builder XE compiler (Nichka).
 - Fix best height of wxSlider with labels but without ticks (Artur Wieczorek).
 - Fix initial text value of wxSpinCtrlDouble (Laurent Poujoulat).
 - Fix best size calculation for bitmaps with buttons (Artur Wieczorek).
 - Fix flicker when resizing windows with status bar (Artur Wieczorek).
 - Fix size of the icon returned from wxFSVolume::GetIcon() (troelsk).
 - Fix autosize after expanding/collapsing items in wxDataViewCtrl (ciglesias).
 - Fix inserting tools removed from wxToolBar back into it (sbrowne).
 - Fix disabling submenu items in the menus (Artur Wieczorek).
 - Fix wxEVT_TREE_STATE_IMAGE_CLICK generation (Antal).
 - Fix wxDV_ROW_LINES in horizontally scrolled wxDataViewCtrl.
 - Fix RegisterHotKey() with negative IDs (troelsk).
 - Fix event object type for wxEVT_SPINCTRL events.
 - Fix bug if wxToolBar tool was deleted from its own handler (Artur Wieczorek).
 - Improve wxSearchCtrl appearance, don't make it too tall (Artur Wieczorek).
 - Fix creating or modifying file associations under recent Windows versions.
 wxOSX:
 - Compilation fix for wxWebView under 10.10.
 - Fix conversion of wxBitmap to wxImage in 64 bit builds.
 - Fix length of text in wxTextDataObject.
 - Fix using wxHTTP and wxFTP from worker thread.
 - Compilation fix for wxMediaCtrl under 10.12 (Tobias Taschner)
 - Added --disable-qtkit to force usage of AVFoundation under 10.7-10.11 (Tobias Taschner)
 - Fix wxFileDialog::GetFilterIndex() for file open dialogs (phsilva).
 - Fix wxSearchCtrl appearance under 10.10 (John Roberts).
 - Fix handling of "Cancel" button in wxSearchCtrl (John Roberts).
 - Generate correct events for WXK_NUMPAD_ENTER (John Roberts).
 - Fix handling of WXK_NUMPAD_ENTER in wxTextCtrl (John Roberts).
 - Don't show wxDatePickerCtrl as being disabled when it isn't (John Roberts).
 - Generate wxEVT_TEXT_ENTER for wxTE_PASSWORD controls too (mj_smoker).
 - Send wxIconizeEvent when a window is iconized/restore (Rob Krakora).
 - Use correct colour for disabled wxStaticText (sbrowne).
 - Fix too large top and left margins inside wxStaticBox (sbrowne).
 - Fix bottom margins sizes for several controls (sbrowne).
 - Fix initial position of controls with layout insets (Tim Kosse).
 - Don't allow pasting rich text in non-wxTE_RICH text controls (Tim Kosse).
 - Fix printing all pages non-interactively (John Roberts).
 - Fix custom paper support (tijsv).
 - Return false from wxSound::Create()/IsOk() if the file doesn't exist.
 - Fix scrolling behaviour of wxSearchCtrl (John Roberts).
 - Add wxTE_{RIGHT,CENTER} support for multiline wxTextCtrl (Andreas Falkenhahn).
 - Fix changing year in wxCalendarCtrl using arrows (Lauri Nurmi).
 3.0.2: (released 2014-10-06)
 ----------------------------
@@ -731,8 +622,6 @@ wxMSW:
 - Fix setting label of submenu items (Artur Wieczorek).
 - Fix using Esc as accelerator in the menus.
 - Fix wrong initial status bar height in some cases (Artur Wieczorek).
 - Correct wxGetOsDescription() for Windows 10 (Tobias Taschner).
 - Fix appearance of checked disabled wxToolBar tools with custom images.
 3.0.1: (released 2014-06-15)
--- a/docs/doxygen/Doxyfile
+++ b/docs/doxygen/Doxyfile
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.8
+# Doxyfile 1.8.2
 #---------------------------------------------------------------------------
 # Project Options
@@ -6,12 +6,11 @@
 DOXYFILE_ENCODING      = UTF-8
 PROJECT_NAME           = wxWidgets
-PROJECT_NUMBER         = 3.0.3
+PROJECT_NUMBER         = 3.0.2
 PROJECT_BRIEF          =
 PROJECT_LOGO           = logo.png
 OUTPUT_DIRECTORY       = out
 CREATE_SUBDIRS         = NO
 ALLOW_UNICODE_NAMES    = NO
 OUTPUT_LANGUAGE        = English
 BRIEF_MEMBER_DESC      = YES
 REPEAT_BRIEF           = YES
@@ -46,6 +45,7 @@ SUBGROUPING            = YES
 INLINE_GROUPED_CLASSES = NO # TODO: Examine this setting.
 INLINE_SIMPLE_STRUCTS  = NO # TODO: Examine this setting.
 TYPEDEF_HIDES_STRUCT   = NO
 SYMBOL_CACHE_SIZE      = 0
 LOOKUP_CACHE_SIZE      = 0
@@ -244,7 +244,6 @@ INTERNAL_DOCS          = NO
 CASE_SENSE_NAMES       = NO # Default: YES
 HIDE_SCOPE_NAMES       = NO
 SHOW_INCLUDE_FILES     = YES
 SHOW_GROUPED_MEMB_INC  = NO # TODO: YES
 FORCE_LOCAL_INCLUDES   = NO
 INLINE_INFO            = YES
 SORT_MEMBER_DOCS       = YES
@@ -257,8 +256,10 @@ GENERATE_TODOLIST      = YES
 GENERATE_TESTLIST      = YES
 GENERATE_BUGLIST       = YES
 GENERATE_DEPRECATEDLIST= YES
-ENABLED_SECTIONS       = WXPERL_MANUAL \
+
-                         WXPYTHON_MANUAL
+# can contain WXPERL_MANUAL, WXPYTHON_MANUAL keywords
 ENABLED_SECTIONS       = WXPERL_MANUAL WXPYTHON_MANUAL
 MAX_INITIALIZER_LINES  = 30
 SHOW_USED_FILES        = NO # Default: YES
 SHOW_FILES             = YES
@@ -285,10 +286,7 @@ WARN_LOGFILE           = doxygen.log
 # Input File Options
 #---------------------------------------------------------------------------
-INPUT                  = mainpages \
+INPUT                  = mainpages groups overviews ../../interface
                         groups \
                         overviews \
                         ../../interface
 INPUT_ENCODING         = UTF-8
 FILE_PATTERNS          = *.h
 RECURSIVE              = YES # Default: NO
@@ -304,7 +302,6 @@ INPUT_FILTER           =
 FILTER_PATTERNS        =
 FILTER_SOURCE_FILES    = NO
 FILTER_SOURCE_PATTERNS =
 USE_MDFILE_AS_MAINPAGE =
 #---------------------------------------------------------------------------
@@ -317,7 +314,6 @@ STRIP_CODE_COMMENTS    = YES
 REFERENCED_BY_RELATION = NO
 REFERENCES_RELATION    = NO
 REFERENCES_LINK_SOURCE = YES
 SOURCE_TOOLTIPS        = YES
 USE_HTAGS              = NO
 VERBATIM_HEADERS       = NO # Default: YES
@@ -349,6 +345,18 @@ HTML_COLORSTYLE_GAMMA  = 100 # Default: 80
 HTML_TIMESTAMP         = YES
 HTML_DYNAMIC_SECTIONS  = YES # Default: NO
 HTML_INDEX_NUM_ENTRIES = 100
 DISABLE_INDEX          = NO
 ENUM_VALUES_PER_LINE   = 1 # Default: 4
 GENERATE_TREEVIEW      = NO
 TREEVIEW_WIDTH         = 250
 EXT_LINKS_IN_WINDOW    = YES # Default: NO
 FORMULA_FONTSIZE       = 10
 FORMULA_TRANSPARENT    = YES
 USE_MATHJAX            = NO
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
 MATHJAX_EXTENSIONS     =
 SEARCHENGINE           = $(SEARCHENGINE)
 SERVER_BASED_SEARCH    = $(SERVER_BASED_SEARCH)
 #---------------------------------------------------------------------------
@@ -359,7 +367,7 @@ GENERATE_DOCSET        = $(GENERATE_DOCSET)
 DOCSET_FEEDNAME        = "wxWidgets 3.0"
 DOCSET_BUNDLE_ID       = org.wxwidgets.doxygen.wx30
 DOCSET_PUBLISHER_ID    = org.wxwidgets.doxygen
-DOCSET_PUBLISHER_NAME  = wxWidgets
+DOCSET_PUBLISHER_NAME  = wxWidgets Team
 #---------------------------------------------------------------------------
@@ -397,31 +405,6 @@ GENERATE_ECLIPSEHELP   = NO
 ECLIPSE_DOC_ID         = org.wxwidgets.doxygen
 #---------------------------------------------------------------------------
 # Other Output Options
 #---------------------------------------------------------------------------
 DISABLE_INDEX          = NO
 GENERATE_TREEVIEW      = NO
 ENUM_VALUES_PER_LINE   = 1 # Default: 4
 TREEVIEW_WIDTH         = 250
 EXT_LINKS_IN_WINDOW    = YES # Default: NO
 FORMULA_FONTSIZE       = 10
 FORMULA_TRANSPARENT    = YES
 USE_MATHJAX            = NO
 MATHJAX_FORMAT         = HTML-CSS
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
 MATHJAX_EXTENSIONS     =
 MATHJAX_CODEFILE       =
 SEARCHENGINE           = $(SEARCHENGINE)
 SERVER_BASED_SEARCH    = $(SERVER_BASED_SEARCH)
 EXTERNAL_SEARCH        = NO
 SEARCHENGINE_URL       =
 SEARCHDATA_FILE        = searchdata.xml
 EXTERNAL_SEARCH_ID     =
 EXTRA_SEARCH_MAPPINGS  =
 #---------------------------------------------------------------------------
 # LaTeX Output Options
 #---------------------------------------------------------------------------
@@ -435,7 +418,6 @@ PAPER_TYPE             = a4wide
 EXTRA_PACKAGES         =
 LATEX_HEADER           = latexdocstart.inc
 LATEX_FOOTER           =
 LATEX_EXTRA_FILES      =
 PDF_HYPERLINKS         = YES
 USE_PDFLATEX           = YES
 LATEX_BATCHMODE        = YES # Default: NO
@@ -463,7 +445,6 @@ RTF_EXTENSIONS_FILE    =
 GENERATE_MAN           = NO
 MAN_OUTPUT             = man
 MAN_EXTENSION          = .3
 MAN_SUBDIR             =
 MAN_LINKS              = NO
@@ -473,18 +454,11 @@ MAN_LINKS              = NO
 GENERATE_XML           = $(GENERATE_XML)
 XML_OUTPUT             = xml
 XML_SCHEMA             =
 XML_DTD                =
 XML_PROGRAMLISTING     = NO # Default: YES
 #---------------------------------------------------------------------------
 # DOCBOOK Output Options
 #---------------------------------------------------------------------------
 GENERATE_DOCBOOK       = NO
 DOCBOOK_OUTPUT         = docbook
 DOCBOOK_PROGRAMLISTING = NO
 #---------------------------------------------------------------------------
 # AutoGen Definitions Output Options
 #---------------------------------------------------------------------------
@@ -512,8 +486,7 @@ EXPAND_ONLY_PREDEF     = NO
 SEARCH_INCLUDES        = YES
 INCLUDE_PATH           =
 INCLUDE_FILE_PATTERNS  =
-PREDEFINED             = wxUSE_BASE \
+PREDEFINED             = wxUSE_BASE wxUSE_GUI
                         wxUSE_GUI
 EXPAND_AS_DEFINED      =
 SKIP_FUNCTION_MACROS   = YES
@@ -526,7 +499,6 @@ TAGFILES               =
 GENERATE_TAGFILE       =
 ALLEXTERNALS           = NO
 EXTERNAL_GROUPS        = YES
 EXTERNAL_PAGES         = YES
 PERL_PATH              = /usr/bin/perl
@@ -536,11 +508,10 @@ PERL_PATH              = /usr/bin/perl
 CLASS_DIAGRAMS         = YES
 MSCGEN_PATH            =
 DIA_PATH               =
 HIDE_UNDOC_RELATIONS   = YES
 HAVE_DOT               = YES # Default: NO
 DOT_NUM_THREADS        = 0
-DOT_FONTNAME           =
+DOT_FONTNAME           = FreeSans # Default: Helvetica
 DOT_FONTSIZE           = 10
 DOT_FONTPATH           =
 CLASS_GRAPH            = YES
@@ -557,14 +528,16 @@ GRAPHICAL_HIERARCHY    = NO # TODO: Default: YES
 DIRECTORY_GRAPH        = NO # Default: YES
 DOT_IMAGE_FORMAT       = png
 INTERACTIVE_SVG        = NO
 DOT_PATH               =
 DOTFILE_DIRS           =
 MSCFILE_DIRS           =
 DIAFILE_DIRS           =
 PLANTUML_JAR_PATH      =
 DOT_GRAPH_MAX_NODES    = 50
 MAX_DOT_GRAPH_DEPTH    = 1000 # Default: 0
 DOT_TRANSPARENT        = NO
 DOT_MULTI_TARGETS      = NO
 GENERATE_LEGEND        = YES
 DOT_CLEANUP            = YES
 # Instead of setting a value for DOT_PATH it's easier and more portable to
 # put your dot utility in the PATH. On Windows you'll need to install GraphViz
 # tools, and then manually add it to the PATH environment variable.
 DOT_PATH               =
--- a/docs/doxygen/extra_stylesheet.css
+++ b/docs/doxygen/extra_stylesheet.css
@@ -23,11 +23,11 @@ div.contents, div.searchresults {
 #projectlogo {
    text-align: left;
    padding: 0.5em;
 }
 #projectnumber {
-    font-size: 120%;
+    font: 120% Tahoma, Arial, sans-serif;
    font-family: Tahoma, Arial, sans-serif;
    text-align: right;
    padding: 0.5em 1em;
 }
@@ -99,14 +99,6 @@ div.logo {
    margin: 20px;
 }
 table.directory {
    line-height: 1.5;
 }
 .icon {
    line-height: 1.25;
 }
 div.appearance {
    margin: 1em 0em;
 }
--- a/docs/doxygen/images/main_wxlogo.pdf
+++ b/docs/doxygen/images/main_wxlogo.pdf
--- a/docs/doxygen/images/main_wxlogo.png
+++ b/docs/doxygen/images/main_wxlogo.png
--- a/docs/doxygen/images/main_wxlogo.svg
+++ b/docs/doxygen/images/main_wxlogo.svg
@@ -1,27 +1,87 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:cc="http://web.resource.org/cc/"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:svg="http://www.w3.org/2000/svg"
   xmlns="http://www.w3.org/2000/svg"
   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="427.61838"
+   width="16in"
-   height="100.55876"
+   height="4in"
   id="svg1336"
   sodipodi:version="0.32"
-   inkscape:version="0.48.5 r10040"
+   inkscape:version="0.43"
   version="1.0"
   sodipodi:docbase="/home/tierra/Desktop"
   sodipodi:docname="title.svg"
-   inkscape:export-filename="/home/bryan/Projects/wxwebsite/downloads/logos/title.png"
+   inkscape:export-filename="/home/tierra/Desktop/title.png"
-   inkscape:export-xdpi="100"
+   inkscape:export-xdpi="36"
-   inkscape:export-ydpi="100">
+   inkscape:export-ydpi="36">
  <defs
     id="defs1338">
    <linearGradient
       y2="571.52942"
       x2="296.72556"
       y1="421.6228"
       x1="221.02206"
       gradientTransform="matrix(1.334164,0,0,1.334164,54.71699,-442.514)"
       gradientUnits="userSpaceOnUse"
       id="linearGradient33675"
       xlink:href="#linearGradient6854"
       inkscape:collect="always" />
    <linearGradient
       y2="520.74225"
       x2="222.73837"
       y1="520.74225"
       x1="139.43103"
       gradientTransform="matrix(0.545558,0,0,0.350255,236.4833,37.6074)"
       gradientUnits="userSpaceOnUse"
       id="linearGradient33671"
       xlink:href="#linearGradient4073"
       inkscape:collect="always" />
    <linearGradient
       y2="421.62283"
       x2="220.84492"
       y1="571.52942"
       x1="296.20334"
       gradientTransform="matrix(1.334164,0,0,1.334164,-90.28301,-537.514)"
       gradientUnits="userSpaceOnUse"
       id="linearGradient33668"
       xlink:href="#linearGradient6848"
       inkscape:collect="always" />
    <linearGradient
       y2="520.74225"
       x2="222.73819"
       y1="520.74225"
       x1="139.62971"
       gradientTransform="matrix(0.545558,0,0,0.350255,91.4834,-57.3926)"
       gradientUnits="userSpaceOnUse"
       id="linearGradient33664"
       xlink:href="#linearGradient4073"
       inkscape:collect="always" />
    <linearGradient
       y2="474.09103"
       x2="119.92342"
       y1="674.0849"
       x1="221.01576"
       gradientTransform="matrix(1.000031,0,0,1.000031,-45.00832,-319.1057)"
       gradientUnits="userSpaceOnUse"
       id="linearGradient33661"
       xlink:href="#linearGradient8721"
       inkscape:collect="always" />
    <linearGradient
       y2="520.74255"
       x2="222.73912"
       y1="520.74255"
       x1="139.43112"
       gradientTransform="matrix(0.545556,0,0,0.350255,-38.51666,72.6073)"
       gradientUnits="userSpaceOnUse"
       id="linearGradient33657"
       xlink:href="#linearGradient4073"
       inkscape:collect="always" />
    <linearGradient
       id="linearGradient8721">
      <stop
@@ -66,6 +126,66 @@
         offset="1"
         style="stop-color:#ffff00;stop-opacity:1;" />
    </linearGradient>
    <linearGradient
       inkscape:collect="always"
       xlink:href="#linearGradient8721"
       id="linearGradient1644"
       gradientUnits="userSpaceOnUse"
       gradientTransform="matrix(1.000031,0,0,1.000031,-45.00832,-319.1057)"
       x1="221.01576"
       y1="674.0849"
       x2="119.92342"
       y2="474.09103" />
    <linearGradient
       inkscape:collect="always"
       xlink:href="#linearGradient4073"
       id="linearGradient1646"
       gradientUnits="userSpaceOnUse"
       gradientTransform="matrix(0.545556,0,0,0.350255,-38.51666,72.6073)"
       x1="139.43112"
       y1="520.74255"
       x2="222.73912"
       y2="520.74255" />
    <linearGradient
       inkscape:collect="always"
       xlink:href="#linearGradient6848"
       id="linearGradient1648"
       gradientUnits="userSpaceOnUse"
       gradientTransform="matrix(1.334164,0,0,1.334164,-90.28301,-537.514)"
       x1="296.20334"
       y1="571.52942"
       x2="220.84492"
       y2="421.62283" />
    <linearGradient
       inkscape:collect="always"
       xlink:href="#linearGradient4073"
       id="linearGradient1650"
       gradientUnits="userSpaceOnUse"
       gradientTransform="matrix(0.545558,0,0,0.350255,91.4834,-57.3926)"
       x1="139.62971"
       y1="520.74225"
       x2="222.73819"
       y2="520.74225" />
    <linearGradient
       inkscape:collect="always"
       xlink:href="#linearGradient6854"
       id="linearGradient1652"
       gradientUnits="userSpaceOnUse"
       gradientTransform="matrix(1.334164,0,0,1.334164,54.71699,-442.514)"
       x1="221.02206"
       y1="421.6228"
       x2="296.72556"
       y2="571.52942" />
    <linearGradient
       inkscape:collect="always"
       xlink:href="#linearGradient4073"
       id="linearGradient1654"
       gradientUnits="userSpaceOnUse"
       gradientTransform="matrix(0.545558,0,0,0.350255,236.4833,37.6074)"
       x1="139.43103"
       y1="520.74225"
       x2="222.73837"
       y2="520.74225" />
    <linearGradient
       inkscape:collect="always"
       xlink:href="#linearGradient8721"
@@ -126,99 +246,25 @@
       y1="520.74225"
       x2="222.73837"
       y2="520.74225" />
    <linearGradient
       inkscape:collect="always"
       xlink:href="#linearGradient8721"
       id="linearGradient3042"
       gradientUnits="userSpaceOnUse"
       gradientTransform="matrix(1.000031,0,0,1.000031,-45.00832,-319.1057)"
       x1="221.01576"
       y1="674.0849"
       x2="119.92342"
       y2="474.09103" />
    <linearGradient
       inkscape:collect="always"
       xlink:href="#linearGradient4073"
       id="linearGradient3044"
       gradientUnits="userSpaceOnUse"
       gradientTransform="matrix(0.545556,0,0,0.350255,-38.51666,72.6073)"
       x1="139.43112"
       y1="520.74255"
       x2="222.73912"
       y2="520.74255" />
    <linearGradient
       inkscape:collect="always"
       xlink:href="#linearGradient6848"
       id="linearGradient3046"
       gradientUnits="userSpaceOnUse"
       gradientTransform="matrix(1.334164,0,0,1.334164,-90.28301,-537.514)"
       x1="296.20334"
       y1="571.52942"
       x2="220.84492"
       y2="421.62283" />
    <linearGradient
       inkscape:collect="always"
       xlink:href="#linearGradient4073"
       id="linearGradient3048"
       gradientUnits="userSpaceOnUse"
       gradientTransform="matrix(0.545558,0,0,0.350255,91.4834,-57.3926)"
       x1="139.62971"
       y1="520.74225"
       x2="222.73819"
       y2="520.74225" />
    <linearGradient
       inkscape:collect="always"
       xlink:href="#linearGradient6854"
       id="linearGradient3050"
       gradientUnits="userSpaceOnUse"
       gradientTransform="matrix(1.334164,0,0,1.334164,54.71699,-442.514)"
       x1="221.02206"
       y1="421.6228"
       x2="296.72556"
       y2="571.52942" />
    <linearGradient
       inkscape:collect="always"
       xlink:href="#linearGradient4073"
       id="linearGradient3052"
       gradientUnits="userSpaceOnUse"
       gradientTransform="matrix(0.545558,0,0,0.350255,236.4833,37.6074)"
       x1="139.43103"
       y1="520.74225"
       x2="222.73837"
       y2="520.74225" />
  </defs>
  <sodipodi:namedview
-     inkscape:document-units="px"
+     inkscape:document-units="in"
     pagecolor="#ffffff"
     bordercolor="#666666"
     borderopacity="1.0"
     inkscape:pageopacity="0.0"
     inkscape:pageshadow="2"
-     inkscape:zoom="2"
+     inkscape:zoom="0.65806102"
-     inkscape:cx="176.65684"
+     inkscape:cx="717.74166"
-     inkscape:cy="29.610281"
+     inkscape:cy="176.20628"
     inkscape:current-layer="layer1"
     id="namedview1340"
     showguides="true"
     inkscape:guide-bbox="true"
-     inkscape:window-width="1920"
+     inkscape:window-width="1102"
-     inkscape:window-height="1014"
+     inkscape:window-height="748"
-     inkscape:window-x="0"
+     inkscape:window-x="32"
-     inkscape:window-y="27"
+     inkscape:window-y="72" />
     showgrid="false"
     units="px"
     guidetolerance="20"
     objecttolerance="20"
     inkscape:snap-global="true"
     inkscape:snap-bbox="false"
     inkscape:snap-page="true"
     inkscape:bbox-paths="true"
     gridtolerance="10"
     fit-margin-top="18"
     fit-margin-left="18"
     fit-margin-right="18"
     fit-margin-bottom="18"
     inkscape:window-maximized="1" />
  <metadata
     id="metadata1342">
    <rdf:RDF>
@@ -227,34 +273,28 @@
        <dc:format>image/svg+xml</dc:format>
        <dc:type
           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
        <dc:title />
        <cc:license
           rdf:resource="https://creativecommons.org/licenses/sa/1.0/" />
      </cc:Work>
    </rdf:RDF>
  </metadata>
  <g
     inkscape:label="Layer 1"
     inkscape:groupmode="layer"
-     id="layer1"
+     id="layer1">
     transform="translate(3.6000067,-258.22724)">
    <g
       id="g1457"
-       transform="matrix(0.16842101,0,0,0.16842101,10.189468,276.50663)">
+       transform="matrix(0.954545,0,0,0.954545,21.13638,-1.363475)">
      <g
         style="display:inline"
         inkscape:label="Red"
         id="layer2">
        <path
           id="rect1393"
-           d="m 69.33962,154.99997 111.32077,0 c 24.56415,0 44.33961,19.77547 44.33961,44.33962 l 0,111.32078 c 0,24.56414 -19.77546,44.33961 -44.33961,44.33961 l -111.32077,0 C 44.775476,354.99998 25,335.22451 25,310.66037 l 0,-111.32078 c 0,-24.56415 19.775476,-44.33962 44.33962,-44.33962 z"
+           d="M 69.33962,154.99997 L 180.66039,154.99997 C 205.22454,154.99997 225,174.77544 225,199.33959 L 225,310.66037 C 225,335.22451 205.22454,354.99998 180.66039,354.99998 L 69.33962,354.99998 C 44.775476,354.99998 25,335.22451 25,310.66037 L 25,199.33959 C 25,174.77544 44.775476,154.99997 69.33962,154.99997 z "
-           style="fill:url(#linearGradient3042);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:38;marker-start:none"
+           style="fill:url(#linearGradient1686);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:38;stroke-linecap:butt;stroke-linejoin:round;marker-start:none;stroke-miterlimit:20;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
           inkscape:connector-curvature="0" />
        <path
           id="path2231"
-           d="m 182.05654,230.00562 c -48.53089,0.52516 -61.79585,56.69111 -104.89889,57.24964 -18.6358,0.23541 -34.530378,-12.5544 -52.157599,-27.69878 l 0,51.65226 c 0,24.24869 19.796853,43.79127 44.361069,43.79124 l 111.31955,0 c 24.56422,0 44.31938,-19.54253 44.31938,-43.79124 l 0,-70.25531 c -12.03236,-6.60668 -25.96585,-11.13587 -42.94351,-10.94781 z"
+           d="M 182.05654,230.00562 C 133.52565,230.53078 120.26069,286.69673 77.15765,287.25526 C 58.52185,287.49067 42.627272,274.70086 25.000051,259.55648 L 25.000051,311.20874 C 25.000051,335.45743 44.796904,355.00001 69.36112,354.99998 L 180.68067,354.99998 C 205.24489,354.99998 225.00005,335.45745 225.00005,311.20874 L 225.00005,240.95343 C 212.96769,234.34675 199.0342,229.81756 182.05654,230.00562 z "
-           style="opacity:0.25;fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none"
+           style="opacity:0.25;fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
           inkscape:connector-curvature="0" />
        <rect
           rx="17.843672"
           ry="17.843672"
@@ -263,13 +303,12 @@
           height="150"
           width="33"
           id="rect3182"
-           style="fill:url(#linearGradient3044);fill-opacity:1;fill-rule:nonzero;stroke:none" />
+           style="fill:url(#linearGradient1688);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:20;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.25098039" />
        <path
           sodipodi:nodetypes="ccccccccc"
           id="path37247"
-           d="m 69.46811,161.34322 111.19211,0 c 21.12816,0 37.9969,16.87873 37.9969,38.00595 l 0,111.32031 c 0,21.13499 -16.86549,37.98752 -37.9969,37.98752 l -111.32032,0 c -21.131502,0 -37.9969,-16.86042 -37.9969,-37.98752 l 0,-111.35844 c 0,-21.13196 16.99051,-37.96782 38.12511,-37.96782 z"
+           d="M 69.46811,161.34322 L 180.66022,161.34322 C 201.78838,161.34322 218.65712,178.22195 218.65712,199.34917 L 218.65712,310.66948 C 218.65712,331.80447 201.79163,348.657 180.66022,348.657 L 69.3399,348.657 C 48.208398,348.657 31.343,331.79658 31.343,310.66948 L 31.343,199.31104 C 31.343,178.17908 48.33351,161.34322 69.46811,161.34322 z "
-           style="fill:none;stroke:#800000;stroke-width:12.68599987;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:20;stroke-opacity:0.50196078;stroke-dasharray:none;stroke-dashoffset:0;marker-start:none"
+           style="opacity:1;fill:none;fill-opacity:0.50196078;fill-rule:nonzero;stroke:#800000;stroke-width:12.68599987;stroke-linecap:butt;stroke-linejoin:round;marker-start:none;stroke-miterlimit:20;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.50196078" />
           inkscape:connector-curvature="0" />
      </g>
      <g
         style="display:inline"
@@ -277,14 +316,12 @@
         id="layer3">
        <path
           id="path5922"
-           d="m 199.33962,24.99998 111.32078,0 c 24.56415,0 44.3396,19.77547 44.3396,44.3396 l 0,111.32079 c 0,24.56414 -19.77545,44.33961 -44.3396,44.33961 l -111.32078,0 C 174.77548,224.99998 155,205.22451 155,180.66037 l 0,-111.32079 c 0,-24.56413 19.77548,-44.3396 44.33962,-44.3396 z"
+           d="M 199.33962,24.99998 L 310.6604,24.99998 C 335.22455,24.99998 355,44.77545 355,69.33958 L 355,180.66037 C 355,205.22451 335.22455,224.99998 310.6604,224.99998 L 199.33962,224.99998 C 174.77548,224.99998 155,205.22451 155,180.66037 L 155,69.33958 C 155,44.77545 174.77548,24.99998 199.33962,24.99998 z "
-           style="fill:url(#linearGradient3046);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:38.28099823;marker-start:none"
+           style="fill:url(#linearGradient1690);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:38.28099823;stroke-linecap:butt;stroke-linejoin:miter;marker-start:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.37647059" />
           inkscape:connector-curvature="0" />
        <path
           id="path5924"
-           d="M 312.05649,100.00562 C 263.5256,100.5308 250.26065,156.69674 207.1576,157.25527 188.52179,157.49067 172.62722,144.70086 155,129.55648 l 0,51.65227 c 0,24.24868 19.79685,43.79126 44.36106,43.79123 l 111.31957,0 c 24.5642,0 44.31937,-19.54253 44.31937,-43.79123 l 0,-70.25531 c -12.03236,-6.60669 -25.96585,-11.13588 -42.94351,-10.94782 z"
+           d="M 312.05649,100.00562 C 263.5256,100.5308 250.26065,156.69674 207.1576,157.25527 C 188.52179,157.49067 172.62722,144.70086 155,129.55648 L 155,181.20875 C 155,205.45743 174.79685,225.00001 199.36106,224.99998 L 310.68063,224.99998 C 335.24483,224.99998 355,205.45745 355,181.20875 L 355,110.95344 C 342.96764,104.34675 329.03415,99.81756 312.05649,100.00562 z "
-           style="opacity:0.25;fill:#0000ff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+           style="opacity:0.25;fill:#0000ff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
           inkscape:connector-curvature="0" />
        <rect
           rx="17.843672"
           ry="17.843672"
@@ -293,27 +330,24 @@
           height="150"
           width="33"
           id="rect5926"
-           style="fill:url(#linearGradient3048);fill-opacity:1;fill-rule:nonzero;stroke:none" />
+           style="fill:url(#linearGradient1692);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:20;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.25098039" />
        <path
-           style="fill:none;stroke:#000080;stroke-width:12.68599987;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:20;stroke-opacity:0.50196078;stroke-dasharray:none;stroke-dashoffset:0;marker-start:none;display:inline"
+           style="opacity:1;fill:none;fill-opacity:0.50196078;fill-rule:nonzero;stroke:#000080;stroke-width:12.68599987;stroke-linecap:butt;stroke-linejoin:round;marker-start:none;stroke-miterlimit:20;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.50196078;display:inline"
-           d="m 199.46811,31.34322 111.19211,0 c 21.12816,0 37.9969,16.87873 37.9969,38.00595 l 0,111.32031 c 0,21.13499 -16.86549,37.98752 -37.9969,37.98752 l -111.32032,0 c -21.1315,0 -37.9969,-16.86042 -37.9969,-37.98752 l 0,-111.35844 c 0,-21.13196 16.99051,-37.96782 38.12511,-37.96782 z"
+           d="M 199.46811,31.34322 L 310.66022,31.34322 C 331.78838,31.34322 348.65712,48.22195 348.65712,69.34917 L 348.65712,180.66948 C 348.65712,201.80447 331.79163,218.657 310.66022,218.657 L 199.3399,218.657 C 178.2084,218.657 161.343,201.79658 161.343,180.66948 L 161.343,69.31104 C 161.343,48.17908 178.33351,31.34322 199.46811,31.34322 z "
           id="path41636"
-           sodipodi:nodetypes="ccccccccc"
+           sodipodi:nodetypes="ccccccccc" />
           inkscape:connector-curvature="0" />
      </g>
      <g
         inkscape:label="Yellow"
         id="layer4">
        <path
           id="path5936"
-           d="m 344.33962,119.99997 111.32077,0 c 24.56415,0 44.33961,19.77547 44.33961,44.33962 l 0,111.32078 c 0,24.56414 -19.77546,44.33961 -44.33961,44.33961 l -111.32077,0 C 319.77547,319.99998 300,300.22451 300,275.66037 l 0,-111.32078 c 0,-24.56415 19.77547,-44.33962 44.33962,-44.33962 z"
+           d="M 344.33962,119.99997 L 455.66039,119.99997 C 480.22454,119.99997 500,139.77544 500,164.33959 L 500,275.66037 C 500,300.22451 480.22454,319.99998 455.66039,319.99998 L 344.33962,319.99998 C 319.77547,319.99998 300,300.22451 300,275.66037 L 300,164.33959 C 300,139.77544 319.77547,119.99997 344.33962,119.99997 z "
-           style="fill:url(#linearGradient3050);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:38.28144073;marker-start:none;display:inline"
+           style="fill:url(#linearGradient1694);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:38.28144073;stroke-linecap:butt;stroke-linejoin:miter;marker-start:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.37647059;display:inline" />
           inkscape:connector-curvature="0" />
        <path
           id="path5938"
-           d="M 457.05649,195.00562 C 408.5256,195.53079 395.26065,251.69673 352.1576,252.25526 333.52179,252.49067 317.62722,239.70086 300,224.55647 l 0,51.65228 c 0,24.24868 19.79685,43.79126 44.36106,43.79123 l 111.31957,0 C 480.24484,319.99998 500,300.45745 500,276.20875 l 0,-70.25532 c -12.03236,-6.60669 -25.96584,-11.13587 -42.94351,-10.94781 z"
+           d="M 457.05649,195.00562 C 408.5256,195.53079 395.26065,251.69673 352.1576,252.25526 C 333.52179,252.49067 317.62722,239.70086 300,224.55647 L 300,276.20875 C 300,300.45743 319.79685,320.00001 344.36106,319.99998 L 455.68063,319.99998 C 480.24484,319.99998 500,300.45745 500,276.20875 L 500,205.95343 C 487.96764,199.34674 474.03416,194.81756 457.05649,195.00562 z "
-           style="opacity:0.25;fill:#c0c000;fill-opacity:1;fill-rule:evenodd;stroke:none;display:inline"
+           style="opacity:0.25;fill:#c0c000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
           inkscape:connector-curvature="0" />
        <rect
           rx="17.843672"
           ry="17.843672"
@@ -322,192 +356,41 @@
           height="150"
           width="33"
           id="rect5940"
-           style="fill:url(#linearGradient3052);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" />
+           style="fill:url(#linearGradient1696);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:20;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.25098039;display:inline" />
        <path
           sodipodi:nodetypes="ccccccccc"
           id="path42512"
-           d="m 344.46811,126.34322 111.19211,0 c 21.12816,0 37.9969,16.87873 37.9969,38.00595 l 0,111.32031 c 0,21.13499 -16.86549,37.98752 -37.9969,37.98752 l -111.32032,0 c -21.1315,0 -37.9969,-16.86042 -37.9969,-37.98752 l 0,-111.35844 c 0,-21.13196 16.99051,-37.96782 38.12511,-37.96782 z"
+           d="M 344.46811,126.34322 L 455.66022,126.34322 C 476.78838,126.34322 493.65712,143.22195 493.65712,164.34917 L 493.65712,275.66948 C 493.65712,296.80447 476.79163,313.657 455.66022,313.657 L 344.3399,313.657 C 323.2084,313.657 306.343,296.79658 306.343,275.66948 L 306.343,164.31104 C 306.343,143.17908 323.33351,126.34322 344.46811,126.34322 z "
-           style="fill:none;stroke:#808000;stroke-width:12.68599987;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:20;stroke-opacity:0.50196078;stroke-dasharray:none;stroke-dashoffset:0;marker-start:none;display:inline"
+           style="opacity:1;fill:none;fill-opacity:0.50196078;fill-rule:nonzero;stroke:#808000;stroke-width:12.68599987;stroke-linecap:butt;stroke-linejoin:round;marker-start:none;stroke-miterlimit:20;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.50196078;display:inline" />
           inkscape:connector-curvature="0" />
      </g>
    </g>
    <g
-       id="g3057"
+       id="g1680"
-       transform="matrix(0.9222683,0,0,0.9222683,-0.2043768,23.980744)"
+       transform="translate(18.00002,0)">
-       style="fill:#333333">
+      <text
-      <g
+         sodipodi:linespacing="100%"
         id="text1576"
-         style="font-size:3.08242559px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#333333;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans">
+         y="178.164"
-        <path
+         x="953.44312"
-           id="path3041"
+         style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-           style="font-size:47.44670868px;line-height:100%;fill:#333333;font-family:Sansita One;-inkscape-font-specification:Sansita One"
+         xml:space="preserve"><tspan
-           d="m 161.22384,300.21913 c -2.08769,2.87844 -4.14371,5.0768 -6.16807,6.59509 -1.99279,1.5183 -4.033,2.27744 -6.12063,2.27744 -2.05604,0 -3.44781,-0.2056 -4.17531,-0.6168 l 0,-10.43828 c -1.80299,4.80794 -4.31766,8.14502 -7.54402,10.01126 -1.17037,0.69588 -2.30909,1.04382 -3.41617,1.04382 -2.11929,0 -3.63758,-0.2056 -4.55488,-0.6168 -0.22142,-7.24353 -0.42702,-11.86167 -0.61681,-13.85444 -0.18979,-2.02438 -0.36376,-3.65338 -0.52191,-4.88701 -0.31631,-2.46721 -1.0122,-4.20692 -2.08766,-5.21914 1.36014,-1.01217 2.98914,-1.51827 4.88702,-1.51829 3.6692,2e-5 5.75685,2.27746 6.26296,6.83232 0.12651,1.07548 0.18978,2.18257 0.18979,3.32127 -1e-5,1.7081 -0.1898,5.53546 -0.56936,11.4821 0.75913,-0.34793 1.53409,-1.13871 2.32489,-2.37233 0.82239,-1.26524 1.56572,-2.7519 2.22999,-4.45999 1.48665,-3.95388 2.22998,-7.6389 2.23,-11.05508 -2e-5,-0.53771 -0.0791,-1.09126 -0.23724,-1.66064 -0.12654,-0.56934 -0.26888,-0.93309 -0.42702,-1.09127 1.10707,-0.66423 2.49884,-0.99636 4.17531,-0.99638 1.70806,2e-5 2.95749,0.5852 3.74829,1.75552 0.82239,1.13875 1.3443,2.76775 1.56574,4.88701 0.25303,2.68867 0.37955,4.83958 0.37958,6.45276 -3e-5,2.24582 -0.11074,5.02935 -0.33213,8.35062 1.58153,-1.13872 3.02074,-3.57431 4.31765,-7.3068 1.29684,-3.73246 1.94528,-6.9272 1.94532,-9.58423 -4e-5,-1.17033 -0.0949,-2.10345 -0.28468,-2.79936 1.04379,-1.17032 2.46719,-1.7555 4.2702,-1.75552 1.10705,2e-5 2.05598,0.30052 2.8468,0.90148 0.82237,0.60102 1.23358,1.47087 1.23362,2.60957 -4e-5,1.10711 -0.17402,2.26165 -0.52192,3.46361 -0.31635,1.202 -0.74337,2.4198 -1.28106,3.6534 -1.04386,2.46724 -2.29329,4.6656 -3.74829,6.59509"
+           style="font-size:144px;font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;font-family:URW Bookman L"
-           inkscape:connector-curvature="0" />
+           y="178.164"
-        <path
+           x="953.44312"
-           id="path3043"
+           id="tspan1578"
-           style="font-size:47.44670868px;line-height:100%;fill:#333333;font-family:Sansita One;-inkscape-font-specification:Sansita One"
+           sodipodi:role="line">wxWidgets</tspan></text>
-           d="m 174.39623,308.28507 c -1.0122,0.53773 -2.21418,0.80659 -3.60595,0.80659 -1.39177,0 -2.46723,-0.34794 -3.22637,-1.04382 -0.75915,-0.72752 -1.13872,-1.77134 -1.13872,-3.13149 0,-1.39176 0.47446,-2.7519 1.4234,-4.08041 0.98056,-1.36013 2.18254,-2.41977 3.60595,-3.17893 1.45503,-0.75914 2.68864,-1.36013 3.70084,-1.80298 l -2.98914,-6.87977 c -0.53773,-1.17033 -1.3127,-1.75551 -2.32489,-1.75553 l -0.37957,0.0475 -0.14234,0 c 0.18978,-1.10707 0.93311,-2.08763 2.22999,-2.9417 1.29687,-0.88564 2.68864,-1.32848 4.17531,-1.3285 2.40396,2e-5 4.15948,1.202 5.26659,3.60594 l 0.37957,0.75915 2.04021,5.02935 c 0.85402,-0.37955 1.45501,-0.91728 1.80297,-1.61318 0.37956,-0.7275 0.56935,-1.78714 0.56936,-3.17893 -1e-5,-1.42338 -0.37959,-2.57792 -1.13872,-3.46361 1.20197,-0.75913 2.59374,-1.1387 4.17531,-1.13872 2.84678,2e-5 4.27018,1.37597 4.27021,4.12786 -3e-5,3.00497 -1.88208,5.37731 -5.64616,7.11701 l -2.8468,1.3285 2.56212,6.5951 c 0.50608,1.32851 1.21778,2.27744 2.1351,2.8468 0.37955,0.25305 0.79076,0.39539 1.23362,0.42702 -0.94896,1.54993 -2.45144,2.67283 -4.50744,3.36871 -0.63264,0.18979 -1.37597,0.28468 -2.23,0.28468 -0.85405,0 -1.77136,-0.30049 -2.75191,-0.90148 -0.98057,-0.56936 -1.64483,-1.31269 -1.99276,-2.23 l -2.60957,-6.78488 c -1.77135,0.79079 -2.65702,2.62539 -2.65701,5.50382 -1e-5,1.32851 0.20559,2.53049 0.6168,3.60595"
+      <text
-           inkscape:connector-curvature="0" />
+         sodipodi:linespacing="100%"
        <path
           id="path3045"
           style="font-size:47.44670868px;line-height:100%;fill:#333333;font-family:Sansita One;-inkscape-font-specification:Sansita One"
           d="m 195.12674,278.72577 c 0.44284,-0.88564 1.13872,-1.56571 2.08766,-2.04021 0.98056,-0.50606 2.13509,-0.75911 3.46361,-0.75914 2.08764,3e-5 3.74828,0.75917 4.9819,2.27744 1.26523,1.48669 1.89785,3.87484 1.89787,7.16445 l 0,16.93848 10.8653,-25.43144 5.59871,0 1.28106,24.00803 -0.14234,1.37596 11.29231,-25.38399 6.5002,0 -15.18294,31.26738 -10.10615,0 -0.94894,-14.4238 -6.26296,14.4238 -11.43466,0 -1.4234,-22.77442 c -0.0949,-1.70806 -0.37958,-3.11564 -0.85404,-4.22276 -0.44284,-1.13869 -0.98057,-1.94528 -1.61319,-2.41978"
           inkscape:connector-curvature="0" />
        <path
           id="path3047"
           style="font-size:47.44670868px;line-height:100%;fill:#333333;font-family:Sansita One;-inkscape-font-specification:Sansita One"
           d="m 252.31114,305.53316 c -0.98057,2.37234 -3.03659,3.5585 -6.16807,3.5585 -1.61319,0 -2.92588,-0.55354 -3.93807,-1.66063 -0.85405,-0.98056 -1.28107,-1.96113 -1.28107,-2.9417 0,-2.56211 0.58518,-6.34203 1.75553,-11.33976 l 1.75553,-9.20466 9.63168,-0.94893 -2.89425,14.99316 c -0.53774,2.34071 -0.8066,3.92226 -0.80659,4.74467 -10e-6,1.80297 0.64843,2.73609 1.94531,2.79935 m -7.02211,-28.18334 c 0,-1.23359 0.50609,-2.18252 1.5183,-2.84681 1.04382,-0.66422 2.30906,-0.99634 3.79573,-0.99638 1.48665,4e-5 2.67282,0.33216 3.55851,0.99638 0.91728,0.66429 1.37593,1.61322 1.37595,2.84681 -2e-5,1.23364 -0.50611,2.16676 -1.51829,2.79935 -0.98058,0.63265 -2.2142,0.94896 -3.70085,0.94894 -1.48667,2e-5 -2.70447,-0.31629 -3.65339,-0.94894 -0.91731,-0.63259 -1.37596,-1.56571 -1.37596,-2.79935"
           inkscape:connector-curvature="0" />
        <path
           id="path3049"
           style="font-size:47.44670868px;line-height:100%;fill:#333333;font-family:Sansita One;-inkscape-font-specification:Sansita One"
           d="m 271.25277,282.99598 c 1.1387,2e-5 2.15089,0.12654 3.03658,0.37957 0.0316,-0.1265 0.0791,-0.36373 0.14234,-0.7117 l 0.23724,-1.47085 c 0.1265,-0.6326 0.28466,-1.47082 0.47447,-2.51468 l 0.75914,-3.74829 9.4419,-0.94893 -5.26659,27.51909 c -0.0317,0.18979 -0.0475,0.44284 -0.0474,0.75915 l 0,0.75915 c -3e-5,0.69589 0.17394,1.31269 0.52191,1.85042 0.34792,0.5061 0.80657,0.75915 1.37595,0.75915 -0.63264,1.48666 -1.9137,2.5463 -3.84318,3.17892 -0.66427,0.18979 -1.47087,0.28468 -2.41978,0.28468 -0.91732,0 -1.80299,-0.25304 -2.65702,-0.75914 -0.85405,-0.47447 -1.4076,-1.12291 -1.66063,-1.94532 -0.50612,0.82241 -1.26526,1.47085 -2.27744,1.94532 -1.01221,0.5061 -2.26164,0.75914 -3.74829,0.75914 -1.45504,0 -2.79937,-0.18978 -4.03297,-0.56936 -1.20199,-0.37957 -2.18256,-0.98056 -2.9417,-1.80297 -1.39177,-1.61319 -2.08766,-4.25438 -2.08765,-7.9236 -1e-5,-4.74466 1.39176,-8.55621 4.17531,-11.43466 2.78353,-2.91004 6.38947,-4.36507 10.81785,-4.36509 m -0.33213,2.8468 c -1.17037,2e-5 -2.07185,0.63264 -2.70446,1.89787 -0.63264,1.26526 -1.28108,3.46362 -1.94532,6.59509 -0.63263,3.13149 -0.94894,6.10482 -0.94893,8.91998 -1e-5,1.9295 0.56935,2.89425 1.70808,2.89425 1.01218,0 1.86622,-0.5061 2.56212,-1.5183 0.7275,-1.01219 1.2336,-2.35651 1.51829,-4.03297 l 2.56213,-13.90188 c -0.66427,-0.56934 -1.58158,-0.85402 -2.75191,-0.85404"
           inkscape:connector-curvature="0" />
        <path
           id="path3051"
           style="font-size:47.44670868px;line-height:100%;fill:#333333;font-family:Sansita One;-inkscape-font-specification:Sansita One"
           d="m 289.32996,288.31001 c 1.07545,-1.51828 2.41977,-2.78352 4.03297,-3.79574 1.64481,-1.01217 3.4636,-1.51827 5.45637,-1.51829 1.99275,2e-5 3.46359,0.31633 4.41254,0.94893 l 9.29956,-0.94893 -3.22638,18.21953 c -1.10711,6.19971 -2.83101,10.51735 -5.17169,12.95295 -2.24583,2.30907 -5.55128,3.4636 -9.91636,3.46361 -3.32128,-10e-6 -5.93084,-0.52192 -7.82871,-1.56574 -1.89787,-1.04383 -2.8468,-2.4356 -2.8468,-4.17531 0,-1.29688 0.49028,-2.32489 1.47085,-3.08404 0.98056,-0.72751 2.22999,-1.09127 3.74829,-1.09127 1.3285,0 2.49885,0.3005 3.51105,0.90149 0.60099,0.31631 1.04382,0.69588 1.32851,1.13872 -0.72752,0.63262 -1.09128,1.47084 -1.09127,2.51467 -1e-5,1.36014 0.63261,2.04021 1.89787,2.04021 2.11927,0 3.7799,-2.49886 4.9819,-7.49658 0.34793,-1.36013 0.66424,-2.72027 0.94893,-4.08041 -1.42341,1.73971 -3.7483,2.60957 -6.97466,2.60956 -2.24582,1e-5 -4.01716,-0.53772 -5.31403,-1.61318 -1.29688,-1.07546 -1.94532,-2.87843 -1.94532,-5.40893 0,-1.58154 0.26887,-3.25799 0.8066,-5.02935 0.53772,-1.80296 1.34432,-3.46359 2.41978,-4.9819 m 6.16807,10.15359 c -1e-5,2.15093 0.55353,3.22638 1.66064,3.22638 0.75913,0 1.50246,-0.4112 2.22999,-1.23362 0.56935,-0.66424 0.96473,-1.48665 1.18617,-2.46722 l 2.41978,-12.19381 c -0.15817,-0.0316 -0.31633,-0.079 -0.47447,-0.14234 -0.31633,-0.1265 -0.68008,-0.18976 -1.09127,-0.18979 -1.92951,3e-5 -3.46362,1.58158 -4.60233,4.74467 -0.88568,2.46725 -1.32852,5.21916 -1.32851,8.25573"
           inkscape:connector-curvature="0" />
        <path
           id="path3053"
           style="font-size:47.44670868px;line-height:100%;fill:#333333;font-family:Sansita One;-inkscape-font-specification:Sansita One"
           d="m 333.62665,300.12424 c 0.79076,0.53773 1.18615,1.40759 1.18617,2.60957 -2e-5,1.17035 -0.30052,2.1351 -0.90149,2.89425 -0.60101,0.75914 -1.39179,1.39177 -2.37233,1.89786 -2.02441,1.04383 -4.12788,1.56574 -6.31042,1.56574 -2.18255,0 -3.92226,-0.23723 -5.21913,-0.7117 -1.26525,-0.47446 -2.3249,-1.15453 -3.17893,-2.0402 -1.67645,-1.67645 -2.51468,-4.04878 -2.51468,-7.11701 0,-4.77629 1.29688,-8.61947 3.89063,-11.52955 2.78353,-3.13146 6.59508,-4.6972 11.43466,-4.69722 3.00494,2e-5 5.25075,0.63264 6.73743,1.89786 1.10707,0.94896 1.66061,2.19839 1.66064,3.74829 -3e-5,5.5671 -4.80796,8.35064 -14.4238,8.35062 -0.12654,0.82242 -0.1898,1.58157 -0.18979,2.27745 -1e-5,1.45504 0.3163,2.46723 0.94893,3.03659 0.66425,0.53773 1.59736,0.80659 2.79936,0.80659 1.20197,0 2.43558,-0.26886 3.70084,-0.80659 1.29686,-0.56936 2.21416,-1.29687 2.75191,-2.18255 m -9.67913,-5.17169 c 2.2458,1e-5 4.01714,-0.69588 5.31404,-2.08766 1.29685,-1.32849 1.94529,-3.05239 1.94531,-5.17169 -2e-5,-0.7275 -0.14236,-1.28104 -0.42702,-1.66064 -0.25307,-0.41118 -0.64846,-0.61678 -1.18617,-0.6168 -0.53774,2e-5 -1.04384,0.11073 -1.51829,0.33212 -0.44285,0.18981 -0.9015,0.63265 -1.37596,1.32851 -1.17036,1.58158 -2.08766,4.20696 -2.75191,7.87616"
           inkscape:connector-curvature="0" />
        <path
           id="path3055"
           style="font-size:47.44670868px;line-height:100%;fill:#333333;font-family:Sansita One;-inkscape-font-specification:Sansita One"
           d="m 340.37594,303.39806 c 0,-0.85404 0.22141,-2.35651 0.66425,-4.50744 l 2.51468,-12.81061 -2.79936,0 0.18979,-1.4234 c 3.79573,-1.1387 7.5282,-3.09983 11.19742,-5.88339 l 2.27744,0 -1.13872,5.17169 3.70085,0 -0.42703,2.1351 -3.65339,0 -2.41978,12.81061 c -0.41122,1.96114 -0.61682,3.27383 -0.61681,3.93808 -10e-6,1.5183 0.66424,2.4356 1.99276,2.75191 -0.31632,1.07546 -1.04384,1.9295 -2.18255,2.56212 -1.13873,0.63262 -2.51468,0.94893 -4.12786,0.94893 -1.61319,0 -2.87844,-0.50609 -3.79574,-1.51829 -0.9173,-1.01219 -1.37595,-2.40396 -1.37595,-4.17531"
           inkscape:connector-curvature="0" />
        <path
           id="path3057"
           style="font-size:47.44670868px;line-height:100%;fill:#333333;font-family:Sansita One;-inkscape-font-specification:Sansita One"
           d="m 370.94719,291.48894 c 0.44282,-1.17034 0.66423,-2.26161 0.66425,-3.27383 -2e-5,-1.86621 -0.75916,-2.79933 -2.27744,-2.79935 -0.79079,2e-5 -1.51831,0.36378 -2.18255,1.09127 -0.63263,0.69591 -0.94895,1.48669 -0.94894,2.37234 -1e-5,0.63264 0.25304,1.202 0.75915,1.70808 0.72751,0.6959 2.02438,1.6132 3.89063,2.75191 1.86622,1.13873 3.14728,2.18256 3.84319,3.13148 0.72749,0.91731 1.09125,2.0244 1.09127,3.32127 -2e-5,1.26525 -0.31633,2.48305 -0.94893,3.6534 -0.60101,1.17035 -1.45505,2.16673 -2.56213,2.98914 -2.37235,1.77134 -5.45638,2.65701 -9.25211,2.65701 -2.05602,0 -3.87481,-0.53772 -5.45637,-1.61318 -1.58155,-1.04383 -2.37233,-2.18255 -2.37233,-3.41617 0,-1.23361 0.44283,-2.21417 1.32851,-2.94169 0.9173,-0.72751 2.0402,-1.09127 3.36871,-1.09128 1.3285,1e-5 2.40396,0.25306 3.22638,0.75915 -0.41121,1.04383 -0.61682,1.91369 -0.61681,2.60957 -10e-6,2.08766 0.88567,3.13148 2.65702,3.13148 0.75913,0 1.39176,-0.23723 1.89787,-0.7117 0.50608,-0.47446 0.75913,-1.1229 0.75914,-1.94531 -10e-6,-1.61319 -1.36015,-3.27382 -4.08041,-4.98191 -2.21419,-1.45502 -3.57433,-2.46721 -4.08042,-3.03659 -0.85405,-1.01218 -1.28107,-2.1509 -1.28106,-3.41616 -10e-6,-1.26523 0.30049,-2.49884 0.90148,-3.70084 0.60099,-1.20197 1.45503,-2.22998 2.56213,-3.08404 2.30906,-1.77132 5.47217,-2.65699 9.48934,-2.65701 2.05601,2e-5 3.68501,0.41122 4.88701,1.23361 1.23359,0.82243 1.8504,1.92952 1.85042,3.32127 -2e-5,1.39179 -0.42704,2.48306 -1.28106,3.27382 -0.82243,0.7908 -1.99278,1.18619 -3.51106,1.18617 -1.04384,2e-5 -1.8188,-0.17396 -2.32488,-0.52191"
           inkscape:connector-curvature="0" />
      </g>
      <g
         id="text1580"
-         style="font-size:3.08242559px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#333333;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans">
+         y="264.95999"
-        <path
+         x="955.58154"
-           id="path3060"
+         style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-           style="font-size:23.72335434px;line-height:100%;fill:#333333;font-family:Sansita One;-inkscape-font-specification:Sansita One"
+         xml:space="preserve"><tspan
-           d="m 138.18608,333.82749 c 0.41119,0.3005 0.61679,0.77496 0.61681,1.4234 -2e-5,0.63262 -0.14236,1.17826 -0.42702,1.63691 -0.26888,0.44284 -0.67218,0.83822 -1.20989,1.18617 -1.15455,0.74333 -2.74401,1.11499 -4.7684,1.11499 -2.00858,0 -3.56641,-0.52191 -4.6735,-1.56574 -1.09127,-1.05964 -1.63691,-2.52258 -1.63691,-4.38882 0,-2.64119 0.68798,-4.96608 2.06393,-6.97466 1.04383,-1.48665 2.49886,-2.5463 4.3651,-3.17893 0.96474,-0.3163 1.92158,-0.47445 2.87052,-0.47447 0.94893,2e-5 1.71598,0.0633 2.30117,0.18979 0.58516,0.12654 1.09917,0.31632 1.54202,0.56936 0.96473,0.55356 1.44711,1.27316 1.44712,2.15882 -1e-5,0.80661 -0.37959,1.5104 -1.13872,2.11138 -0.6959,0.53774 -1.32852,0.8066 -1.89787,0.80659 -0.56937,1e-5 -0.97267,-0.0395 -1.20989,-0.11861 0.0632,-0.56935 0.0949,-1.03591 0.0949,-1.39968 -2e-5,-0.37956 -0.008,-0.70378 -0.0237,-0.97266 -0.0158,-0.26885 -0.0633,-0.52981 -0.14234,-0.78287 -0.15816,-0.58516 -0.48238,-0.87775 -0.97266,-0.87776 -0.47447,10e-6 -0.95685,0.22934 -1.44712,0.68797 -0.47447,0.44285 -0.91731,1.04385 -1.32851,1.80298 -0.93312,1.72391 -1.39968,3.60596 -1.39968,5.64616 0,0.98057 0.27677,1.75553 0.83032,2.32489 0.55354,0.55355 1.4234,0.83032 2.60957,0.83031 0.88566,10e-6 1.74761,-0.29258 2.58585,-0.87776 0.36374,-0.25304 0.68005,-0.54563 0.94893,-0.87776"
+           style="font-size:60px;font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;font-family:URW Bookman L"
-           inkscape:connector-curvature="0" />
+           y="264.95999"
-        <path
+           x="955.58154"
-           id="path3062"
+           id="tspan1582"
-           style="font-size:23.72335434px;line-height:100%;fill:#333333;font-family:Sansita One;-inkscape-font-specification:Sansita One"
+           sodipodi:role="line">Cross-Platform GUI Toolkit</tspan></text>
           d="m 148.194,332.07196 c 0.56935,-1.01219 0.85403,-2.03229 0.85404,-3.06032 -10e-6,-0.68005 -0.24515,-1.02009 -0.73542,-1.0201 -0.37958,1e-5 -0.76707,0.32423 -1.16245,0.97266 -0.41121,0.64845 -0.68007,1.39178 -0.80659,2.22999 l -1.23362,7.54403 -4.91073,0.47447 2.41978,-12.57338 3.91436,-0.47447 -0.42702,2.39606 c 0.77495,-1.59736 2.03229,-2.39605 3.77201,-2.39606 0.91729,10e-6 1.62108,0.23725 2.11138,0.7117 0.50608,0.47448 0.75913,1.202 0.75914,2.18255 -1e-5,0.96476 -0.32423,1.75554 -0.97265,2.37234 -0.63264,0.61681 -1.49458,0.92521 -2.58585,0.92521 -0.47447,0 -0.8066,-0.0949 -0.99638,-0.28468"
           inkscape:connector-curvature="0" />
        <path
           id="path3064"
           style="font-size:23.72335434px;line-height:100%;fill:#333333;font-family:Sansita One;-inkscape-font-specification:Sansita One"
           d="m 158.31164,339.21269 c -3.47943,0 -5.21914,-1.63691 -5.21914,-4.91074 0,-2.32488 0.64053,-4.23856 1.92159,-5.74105 1.36014,-1.59736 3.21847,-2.39605 5.57499,-2.39606 1.70807,10e-6 2.99704,0.3954 3.86691,1.18617 0.86984,0.79079 1.30477,2.01649 1.30478,3.67712 -1e-5,2.5305 -0.68008,4.53116 -2.0402,6.00201 -1.32852,1.45503 -3.1315,2.18255 -5.40893,2.18255 m 0.61681,-10.31966 c -0.18979,0.42703 -0.36377,0.96476 -0.52192,1.61319 -0.14234,0.63263 -0.3084,1.45504 -0.49819,2.46723 -0.18979,1.0122 -0.28468,2.14301 -0.28468,3.39243 0,0.41121 0.0633,0.75125 0.18979,1.02011 0.14234,0.26886 0.39538,0.4033 0.75915,0.4033 0.36375,0 0.65634,-0.087 0.87776,-0.26096 0.23723,-0.17397 0.44283,-0.46656 0.61681,-0.87776 0.3163,-0.72752 0.60098,-1.76344 0.85404,-3.10776 0.25304,-1.36014 0.38747,-2.33279 0.4033,-2.91798 0.0316,-0.58516 0.0474,-1.09126 0.0474,-1.51829 -1e-5,-0.44283 -0.0633,-0.80659 -0.18978,-1.09128 -0.12654,-0.28467 -0.37168,-0.42701 -0.73543,-0.42702 -0.34795,1e-5 -0.64054,0.11072 -0.87776,0.33213 -0.23724,0.22143 -0.45075,0.54565 -0.64053,0.97266"
           inkscape:connector-curvature="0" />
        <path
           id="path3066"
           style="font-size:23.72335434px;line-height:100%;fill:#333333;font-family:Sansita One;-inkscape-font-specification:Sansita One"
           d="m 174.27264,330.41132 c 0.22141,-0.58516 0.33212,-1.1308 0.33213,-1.63691 -1e-5,-0.93311 -0.37959,-1.39967 -1.13873,-1.39968 -0.39539,10e-6 -0.75915,0.18189 -1.09127,0.54564 -0.31632,0.34795 -0.47447,0.74334 -0.47447,1.18617 0,0.31632 0.12652,0.601 0.37958,0.85404 0.36375,0.34795 1.01219,0.8066 1.94531,1.37595 0.93311,0.56937 1.57364,1.09128 1.92159,1.56575 0.36375,0.45865 0.54563,1.0122 0.54564,1.66063 -1e-5,0.63263 -0.15817,1.24152 -0.47447,1.8267 -0.3005,0.58518 -0.72752,1.08337 -1.28106,1.49457 -1.18617,0.88567 -2.72819,1.32851 -4.62605,1.32851 -1.02802,0 -1.93741,-0.26887 -2.72819,-0.8066 -0.79078,-0.52191 -1.18617,-1.09127 -1.18617,-1.70808 0,-0.6168 0.22142,-1.10708 0.66426,-1.47085 0.45865,-0.36375 1.0201,-0.54563 1.68436,-0.54563 0.66425,0 1.20198,0.12653 1.61318,0.37957 -0.2056,0.52192 -0.3084,0.95684 -0.3084,1.30478 0,1.04383 0.44283,1.56575 1.32851,1.56575 0.37957,0 0.69588,-0.11862 0.94893,-0.35585 0.25305,-0.23724 0.37957,-0.56146 0.37958,-0.97266 -1e-5,-0.80659 -0.68008,-1.63691 -2.04021,-2.49095 -1.10709,-0.72751 -1.78716,-1.23361 -2.04021,-1.5183 -0.42702,-0.50609 -0.64053,-1.07545 -0.64053,-1.70808 0,-0.63261 0.15025,-1.24942 0.45074,-1.85042 0.3005,-0.60098 0.72752,-1.11499 1.28106,-1.54202 1.15454,-0.88566 2.73609,-1.3285 4.74468,-1.32851 1.028,10e-6 1.8425,0.20562 2.4435,0.61681 0.6168,0.41122 0.9252,0.96476 0.92521,1.66063 -1e-5,0.6959 -0.21352,1.24154 -0.64053,1.63692 -0.41121,0.39539 -0.99639,0.59309 -1.75553,0.59308 -0.52192,10e-6 -0.9094,-0.087 -1.16244,-0.26096"
           inkscape:connector-curvature="0" />
        <path
           id="path3068"
           style="font-size:23.72335434px;line-height:100%;fill:#333333;font-family:Sansita One;-inkscape-font-specification:Sansita One"
           d="m 185.80997,330.41132 c 0.22141,-0.58516 0.33212,-1.1308 0.33213,-1.63691 -1e-5,-0.93311 -0.37958,-1.39967 -1.13872,-1.39968 -0.3954,10e-6 -0.75915,0.18189 -1.09128,0.54564 -0.31631,0.34795 -0.47447,0.74334 -0.47446,1.18617 -10e-6,0.31632 0.12652,0.601 0.37957,0.85404 0.36375,0.34795 1.01219,0.8066 1.94532,1.37595 0.93311,0.56937 1.57364,1.09128 1.92159,1.56575 0.36375,0.45865 0.54562,1.0122 0.54563,1.66063 -1e-5,0.63263 -0.15816,1.24152 -0.47446,1.8267 -0.30051,0.58518 -0.72753,1.08337 -1.28106,1.49457 -1.18618,0.88567 -2.72819,1.32851 -4.62606,1.32851 -1.02801,0 -1.93741,-0.26887 -2.72818,-0.8066 -0.79078,-0.52191 -1.18617,-1.09127 -1.18617,-1.70808 0,-0.6168 0.22142,-1.10708 0.66425,-1.47085 0.45865,-0.36375 1.02011,-0.54563 1.68436,-0.54563 0.66425,0 1.20198,0.12653 1.61319,0.37957 -0.20561,0.52192 -0.30841,0.95684 -0.3084,1.30478 -1e-5,1.04383 0.44283,1.56575 1.3285,1.56575 0.37957,0 0.69588,-0.11862 0.94894,-0.35585 0.25304,-0.23724 0.37957,-0.56146 0.37957,-0.97266 0,-0.80659 -0.68007,-1.63691 -2.04021,-2.49095 -1.10709,-0.72751 -1.78716,-1.23361 -2.04021,-1.5183 -0.42702,-0.50609 -0.64053,-1.07545 -0.64053,-1.70808 0,-0.63261 0.15025,-1.24942 0.45075,-1.85042 0.30049,-0.60098 0.72751,-1.11499 1.28106,-1.54202 1.15453,-0.88566 2.73609,-1.3285 4.74467,-1.32851 1.028,10e-6 1.8425,0.20562 2.4435,0.61681 0.6168,0.41122 0.9252,0.96476 0.92522,1.66063 -2e-5,0.6959 -0.21353,1.24154 -0.64053,1.63692 -0.41122,0.39539 -0.9964,0.59309 -1.75553,0.59308 -0.52192,10e-6 -0.90941,-0.087 -1.16245,-0.26096"
           inkscape:connector-curvature="0" />
        <path
           id="path3070"
           style="font-size:23.72335434px;line-height:100%;fill:#333333;font-family:Sansita One;-inkscape-font-specification:Sansita One"
           d="m 191.13179,334.89504 c -0.5061,-0.36376 -0.75915,-0.89358 -0.75915,-1.58947 0,-0.37957 0.0949,-0.7196 0.28468,-1.0201 0.18979,-0.31631 0.47447,-0.49819 0.85405,-0.54564 l 4.6735,0 c 0.5219,1e-5 0.86194,-0.15815 1.0201,-0.47447 0.25304,0.14235 0.43492,0.36377 0.54564,0.66426 0.1107,0.3005 0.16605,0.6089 0.16606,0.92521 -1e-5,0.31632 -0.12653,0.63263 -0.37957,0.94893 -0.23724,0.3005 -0.53774,0.46657 -0.90149,0.49819 l -4.34137,0 c -0.33213,1e-5 -0.57727,0.0554 -0.73543,0.16607 -0.15815,0.0949 -0.30049,0.23723 -0.42702,0.42702"
           inkscape:connector-curvature="0" />
        <path
           id="path3072"
           style="font-size:23.72335434px;line-height:100%;fill:#333333;font-family:Sansita One;-inkscape-font-specification:Sansita One"
           d="m 208.84312,322.91474 c 3.8748,2e-5 5.81221,1.36806 5.81222,4.10414 -1e-5,1.50249 -0.48239,2.70447 -1.44712,3.60595 -0.94895,0.9015 -2.25373,1.35224 -3.91435,1.35223 -0.77498,1e-5 -1.46295,-0.22141 -2.06394,-0.66425 -0.28468,-0.18978 -0.52192,-0.4112 -0.7117,-0.66425 1.15453,0 2.03229,-0.34794 2.6333,-1.04383 0.61679,-0.71169 0.9252,-1.75552 0.92521,-3.13148 -1e-5,-1.37594 -0.68008,-2.06392 -2.04021,-2.06394 l -0.56936,0 c -0.0949,2e-5 -0.18189,0.008 -0.26096,0.0237 l -2.72818,14.30518 -5.14797,0 2.91797,-15.5388 c 1.69226,-0.15814 3.02868,-0.24512 4.00925,-0.26095 0.98055,-0.0158 1.8425,-0.0237 2.58584,-0.0237"
           inkscape:connector-curvature="0" />
        <path
           id="path3074"
           style="font-size:23.72335434px;line-height:100%;fill:#333333;font-family:Sansita One;-inkscape-font-specification:Sansita One"
           d="m 220.43495,337.43344 c -0.49029,1.18616 -1.5183,1.77925 -3.08404,1.77925 -0.79078,0 -1.43922,-0.27678 -1.94531,-0.83032 -0.41121,-0.45865 -0.61681,-0.94893 -0.61681,-1.47085 0,-1.18616 0.27677,-3.07612 0.83032,-5.66988 l 1.7318,-9.10977 4.81584,-0.47446 -2.30116,12.00401 c -0.26887,1.17036 -0.4033,1.96114 -0.4033,2.37234 0,0.90149 0.32422,1.36805 0.97266,1.39968"
           inkscape:connector-curvature="0" />
        <path
           id="path3076"
           style="font-size:23.72335434px;line-height:100%;fill:#333333;font-family:Sansita One;-inkscape-font-specification:Sansita One"
           d="m 223.47673,338.02652 c -0.36376,-0.4112 -0.63262,-0.94103 -0.80659,-1.58947 -0.15816,-0.64843 -0.23724,-1.50247 -0.23724,-2.56212 0,-1.05963 0.18188,-2.07183 0.54564,-3.03659 0.36376,-0.96474 0.87776,-1.79505 1.54202,-2.49095 1.36013,-1.45502 3.16311,-2.18254 5.40892,-2.18255 0.80659,10e-6 1.50247,0.13445 2.08766,0.4033 l 4.05669,-0.4033 -1.75553,9.25211 c -0.0475,0.18979 -0.0712,0.45865 -0.0712,0.80659 -1e-5,0.34795 0.10279,0.63263 0.30841,0.85405 0.2214,0.22141 0.49027,0.34794 0.80659,0.37957 -0.15817,0.53773 -0.52983,0.96475 -1.115,1.28106 -0.56937,0.31631 -1.17827,0.47447 -1.82669,0.47447 -0.64845,0 -1.19409,-0.12653 -1.63692,-0.37958 -0.42702,-0.23723 -0.7038,-0.56145 -0.83031,-0.97265 -0.25306,0.39539 -0.64845,0.7196 -1.18617,0.97265 -0.53774,0.25305 -1.17036,0.37958 -1.89787,0.37958 -0.7117,0 -1.36014,-0.0949 -1.94531,-0.28468 -0.58518,-0.18979 -1.06756,-0.49029 -1.44713,-0.90149 m 5.00563,-9.63168 c -0.17398,0.28469 -0.34004,0.67217 -0.49819,1.16244 -0.15816,0.47448 -0.37167,1.36015 -0.64053,2.65702 -0.25306,1.28106 -0.37958,2.38025 -0.37958,3.29754 0,0.91731 0.0712,1.51039 0.21351,1.77926 0.14234,0.26886 0.34003,0.40329 0.59309,0.40329 0.50609,0 0.94102,-0.23723 1.30478,-0.7117 0.37957,-0.49028 0.64053,-1.16244 0.78287,-2.01648 l 1.25734,-6.95095 c -0.33213,-0.28467 -0.69589,-0.42701 -1.09127,-0.42702 -0.37958,1e-5 -0.68799,0.0633 -0.92521,0.18979 -0.22143,0.12654 -0.42703,0.33214 -0.61681,0.61681"
           inkscape:connector-curvature="0" />
        <path
           id="path3078"
           style="font-size:23.72335434px;line-height:100%;fill:#333333;font-family:Sansita One;-inkscape-font-specification:Sansita One"
           d="m 237.75596,336.36588 c 0,-0.42701 0.11071,-1.17825 0.33213,-2.25371 l 1.25734,-6.40531 -1.39968,0 0.0949,-0.7117 c 1.89787,-0.56935 3.7641,-1.54991 5.59871,-2.9417 l 1.13872,0 -0.56936,2.58585 1.85043,0 -0.21351,1.06755 -1.8267,0 -1.20989,6.40531 c -0.20561,0.98057 -0.30841,1.63691 -0.30841,1.96903 0,0.75915 0.33212,1.2178 0.99638,1.37596 -0.15816,0.53773 -0.52192,0.96475 -1.09127,1.28106 -0.56937,0.31631 -1.25734,0.47447 -2.06393,0.47447 -0.8066,0 -1.43922,-0.25305 -1.89787,-0.75915 -0.45865,-0.5061 -0.68798,-1.20198 -0.68798,-2.08766"
           inkscape:connector-curvature="0" />
        <path
           id="path3080"
           style="font-size:23.72335434px;line-height:100%;fill:#333333;font-family:Sansita One;-inkscape-font-specification:Sansita One"
           d="m 255.20041,324.97867 c 0.22141,-0.37955 0.33212,-0.77494 0.33213,-1.18616 -1e-5,-0.7275 -0.22143,-1.09126 -0.66426,-1.09128 -0.68007,2e-5 -1.16245,0.6959 -1.44712,2.08766 l -0.35585,1.85042 2.15882,0 -0.14234,1.06755 -2.22999,0 -2.1351,11.03136 -4.79212,0.47447 2.27744,-11.50583 -1.68436,0 0.21351,-1.06755 1.66064,0 0.49819,-1.87415 c 0.28468,-1.15452 1.03591,-2.00065 2.25372,-2.53839 0.88566,-0.37956 2.07183,-0.56935 3.5585,-0.56936 1.48665,10e-6 2.56211,0.1898 3.22638,0.56936 0.66424,0.37959 0.99636,0.82242 0.99638,1.3285 -2e-5,0.50612 -0.19771,0.91732 -0.59309,1.23362 -0.3954,0.31632 -0.81451,0.47448 -1.25733,0.47446 -0.86987,2e-5 -1.49459,-0.0949 -1.87415,-0.28468"
           inkscape:connector-curvature="0" />
        <path
           id="path3082"
           style="font-size:23.72335434px;line-height:100%;fill:#333333;font-family:Sansita One;-inkscape-font-specification:Sansita One"
           d="m 260.01625,339.21269 c -3.47943,0 -5.21914,-1.63691 -5.21914,-4.91074 0,-2.32488 0.64053,-4.23856 1.92159,-5.74105 1.36014,-1.59736 3.21847,-2.39605 5.57499,-2.39606 1.70807,10e-6 2.99704,0.3954 3.86691,1.18617 0.86984,0.79079 1.30477,2.01649 1.30478,3.67712 -10e-6,2.5305 -0.68008,4.53116 -2.04021,6.00201 -1.32851,1.45503 -3.13149,2.18255 -5.40892,2.18255 m 0.61681,-10.31966 c -0.1898,0.42703 -0.36377,0.96476 -0.52192,1.61319 -0.14234,0.63263 -0.30841,1.45504 -0.49819,2.46723 -0.18979,1.0122 -0.28468,2.14301 -0.28468,3.39243 0,0.41121 0.0633,0.75125 0.18979,1.02011 0.14233,0.26886 0.39538,0.4033 0.75915,0.4033 0.36375,0 0.65634,-0.087 0.87776,-0.26096 0.23723,-0.17397 0.44283,-0.46656 0.61681,-0.87776 0.3163,-0.72752 0.60098,-1.76344 0.85404,-3.10776 0.25304,-1.36014 0.38747,-2.33279 0.4033,-2.91798 0.0316,-0.58516 0.0474,-1.09126 0.0474,-1.51829 -1e-5,-0.44283 -0.0633,-0.80659 -0.18978,-1.09128 -0.12654,-0.28467 -0.37168,-0.42701 -0.73543,-0.42702 -0.34795,1e-5 -0.64054,0.11072 -0.87776,0.33213 -0.23724,0.22143 -0.45075,0.54565 -0.64053,0.97266"
           inkscape:connector-curvature="0" />
        <path
           id="path3084"
           style="font-size:23.72335434px;line-height:100%;fill:#333333;font-family:Sansita One;-inkscape-font-specification:Sansita One"
           d="m 276.30938,332.07196 c 0.56935,-1.01219 0.85403,-2.03229 0.85404,-3.06032 -10e-6,-0.68005 -0.24515,-1.02009 -0.73542,-1.0201 -0.37958,1e-5 -0.76706,0.32423 -1.16245,0.97266 -0.41121,0.64845 -0.68007,1.39178 -0.80659,2.22999 l -1.23361,7.54403 -4.91074,0.47447 2.41978,-12.57338 3.91436,-0.47447 -0.42702,2.39606 c 0.77495,-1.59736 2.03229,-2.39605 3.77201,-2.39606 0.91729,10e-6 1.62108,0.23725 2.11138,0.7117 0.50608,0.47448 0.75913,1.202 0.75915,2.18255 -2e-5,0.96476 -0.32424,1.75554 -0.97266,2.37234 -0.63264,0.61681 -1.49458,0.92521 -2.58585,0.92521 -0.47447,0 -0.8066,-0.0949 -0.99638,-0.28468"
           inkscape:connector-curvature="0" />
        <path
           id="path3086"
           style="font-size:23.72335434px;line-height:100%;fill:#333333;font-family:Sansita One;-inkscape-font-specification:Sansita One"
           d="m 298.33614,339.21269 c -1.9137,0 -2.87054,-0.74333 -2.87053,-2.23 -1e-5,-0.64843 0.13442,-1.59737 0.4033,-2.8468 0.28467,-1.26524 0.47445,-2.15091 0.56936,-2.65702 0.2214,-1.15452 0.33211,-1.91367 0.33213,-2.27744 -2e-5,-0.80658 -0.30051,-1.20988 -0.90149,-1.20989 -0.3954,1e-5 -0.78288,0.27678 -1.16244,0.83032 -0.37959,0.53774 -0.65636,1.35224 -0.83032,2.4435 l -1.47085,7.47286 -4.62605,0.47447 1.28106,-6.45276 c 0.14233,-0.71169 0.27676,-1.47084 0.4033,-2.27744 0.12651,-0.80658 0.18977,-1.27314 0.18978,-1.39968 -10e-6,-0.7275 -0.26887,-1.09126 -0.80659,-1.09127 -0.36377,1e-5 -0.74334,0.26888 -1.13872,0.80659 -0.3954,0.53774 -0.7038,1.36015 -0.92521,2.46723 l -1.44713,7.47286 -4.6735,0.47447 2.49095,-12.57338 3.86691,-0.47447 -0.4033,2.39606 c 0.4112,-0.85403 0.99638,-1.46293 1.75553,-1.8267 0.75914,-0.37956 1.7318,-0.56935 2.91797,-0.56936 0.68006,10e-6 1.24151,0.16608 1.68436,0.49819 0.44283,0.33214 0.73541,0.76707 0.87777,1.30479 0.26885,-0.55354 0.74331,-0.98846 1.4234,-1.30479 0.69587,-0.33211 1.46292,-0.49818 2.30116,-0.49819 0.85403,10e-6 1.48665,0.0949 1.89787,0.28468 0.427,0.17399 0.76704,0.41122 1.02011,0.7117 0.427,0.55356 0.64051,1.33643 0.64053,2.34862 -2e-5,0.99638 -0.21353,2.53049 -0.64053,4.60233 -0.22144,1.0122 -0.33215,1.70808 -0.33213,2.08765 -2e-5,0.36376 0.10278,0.65635 0.3084,0.87777 0.2214,0.22141 0.49026,0.34794 0.8066,0.37957 -0.15818,0.53773 -0.51403,0.96475 -1.06755,1.28106 -0.53775,0.31631 -1.16247,0.47447 -1.87415,0.47447"
           inkscape:connector-curvature="0" />
        <path
           id="path3088"
           style="font-size:23.72335434px;line-height:100%;fill:#333333;font-family:Sansita One;-inkscape-font-specification:Sansita One"
           d="m 322.39051,330.67228 c -1.13874,2.49887 -1.7081,5.19542 -1.70808,8.08966 -0.42704,0.3005 -0.95686,0.45075 -1.58947,0.45075 -0.61682,0 -1.12291,-0.15025 -1.51829,-0.45075 -0.3954,-0.28468 -0.63263,-0.57726 -0.7117,-0.87776 -0.3954,0.4112 -0.91731,0.73542 -1.56574,0.97266 -0.63263,0.23723 -1.28898,0.35585 -1.96904,0.35585 -0.68008,0 -1.32061,-0.11071 -1.92159,-0.33213 -0.58518,-0.22142 -1.1071,-0.57727 -1.56575,-1.06755 -1.01219,-1.07546 -1.51829,-2.63329 -1.51829,-4.6735 0,-3.16311 0.84613,-5.6936 2.5384,-7.59147 1.73971,-1.96112 4.15158,-2.94168 7.23562,-2.9417 2.13509,2e-5 3.58221,0.55356 4.34138,1.66063 0.23721,0.34796 0.35583,0.73544 0.35585,1.16245 -2e-5,0.41122 -0.0949,0.7987 -0.28468,1.16244 -0.17399,0.34796 -0.40332,0.66427 -0.68798,0.94894 -0.68009,0.63263 -1.43923,0.94894 -2.27744,0.94893 -0.33214,10e-6 -0.65636,-0.0553 -0.97266,-0.16606 0.0632,-0.47446 0.0949,-0.98846 0.0949,-1.54202 -1e-5,-0.55353 -0.0237,-0.95683 -0.0712,-1.20989 -0.0316,-0.25304 -0.0949,-0.48236 -0.18979,-0.68798 -0.20561,-0.427 -0.53773,-0.64051 -0.99638,-0.64053 -0.44284,2e-5 -0.91731,0.24516 -1.4234,0.73542 -0.49029,0.47449 -0.93312,1.10711 -1.32851,1.89787 -0.86986,1.77136 -1.30479,3.72458 -1.30478,5.85967 -1e-5,0.98057 0.18978,1.8188 0.56936,2.51468 0.4112,0.75915 0.98056,1.13872 1.70808,1.13872 0.25304,0 0.49028,-0.0633 0.7117,-0.18979 0.23723,-0.12652 0.40329,-0.23723 0.49819,-0.33213 l 0.75915,-4.76839 4.79212,-0.42702"
           inkscape:connector-curvature="0" />
        <path
           id="path3090"
           style="font-size:23.72335434px;line-height:100%;fill:#333333;font-family:Sansita One;-inkscape-font-specification:Sansita One"
           d="m 324.00963,335.22716 c 0,-0.6168 0.0791,-1.32059 0.23723,-2.11137 l 1.92159,-10.03498 5.24286,0 -1.89786,10.10615 c -0.14235,0.74333 -0.21352,1.39177 -0.21351,1.94531 -10e-6,0.53773 0.1107,0.94894 0.33212,1.23361 0.23723,0.28469 0.56936,0.42703 0.99638,0.42703 0.42702,0 0.77496,-0.0554 1.04383,-0.16607 0.26886,-0.11071 0.514,-0.30049 0.73542,-0.56936 0.42702,-0.53772 0.77496,-1.49457 1.04383,-2.87052 l 1.92159,-10.10615 3.58223,0 -1.89787,10.08242 c -0.44285,2.24582 -1.27316,3.81946 -2.49095,4.72095 -1.18618,0.88567 -2.94961,1.32851 -5.29031,1.32851 -1.75553,0 -3.09985,-0.37958 -4.03297,-1.13872 -0.82241,-0.66426 -1.23361,-1.61319 -1.23361,-2.84681"
           inkscape:connector-curvature="0" />
        <path
           id="path3092"
           style="font-size:23.72335434px;line-height:100%;fill:#333333;font-family:Sansita One;-inkscape-font-specification:Sansita One"
           d="m 339.19072,338.73822 3.01286,-15.65741 5.21914,0 -3.06031,15.65741 -5.17169,0"
           inkscape:connector-curvature="0" />
        <path
           id="path3094"
           style="font-size:23.72335434px;line-height:100%;fill:#333333;font-family:Sansita One;-inkscape-font-specification:Sansita One"
           d="m 362.71243,335.08482 c 0.30048,0.37958 0.45073,0.94103 0.45074,1.68436 -10e-6,0.72752 -0.28469,1.3206 -0.85404,1.77925 -0.55355,0.44284 -1.32061,0.66426 -2.30116,0.66426 -0.56937,0 -1.29689,-0.0633 -2.18255,-0.18979 -1.73972,-0.26886 -2.86262,-0.4033 -3.36872,-0.4033 -0.49028,0 -0.83823,0.0158 -1.04383,0.0475 -0.2056,0.0158 -0.47446,0.0395 -0.80659,0.0712 l 2.87052,-15.65741 5.19542,0 -2.37234,13.04784 c 0.2056,0.0316 0.40329,0.0475 0.59309,0.0475 l 0.59308,0 c 1.3285,0 2.40396,-0.36376 3.22638,-1.09128"
           inkscape:connector-curvature="0" />
        <path
           id="path3096"
           style="font-size:23.72335434px;line-height:100%;fill:#333333;font-family:Sansita One;-inkscape-font-specification:Sansita One"
           d="m 370.44402,337.43344 c -0.49029,1.18616 -1.5183,1.77925 -3.08404,1.77925 -0.8066,0 -1.46294,-0.27678 -1.96904,-0.83032 -0.42702,-0.49028 -0.64053,-0.98056 -0.64053,-1.47085 0,-1.28106 0.29259,-3.17101 0.87777,-5.66988 l 0.87776,-4.60233 4.81584,-0.47447 -1.44712,7.49658 c -0.26887,1.17036 -0.40331,1.96114 -0.4033,2.37234 -1e-5,0.90149 0.32421,1.36805 0.97266,1.39968 m -3.51106,-14.09168 c 0,-0.61679 0.25305,-1.09125 0.75915,-1.4234 0.52191,-0.33211 1.15453,-0.49817 1.89787,-0.49819 0.74332,2e-5 1.3364,0.16608 1.77925,0.49819 0.45864,0.33215 0.68797,0.80661 0.68797,1.4234 0,0.61683 -0.25305,1.08338 -0.75914,1.39968 -0.49029,0.31633 -1.1071,0.47448 -1.85042,0.47447 -0.74334,10e-6 -1.35224,-0.15814 -1.8267,-0.47447 -0.45866,-0.3163 -0.68798,-0.78285 -0.68798,-1.39968"
           inkscape:connector-curvature="0" />
        <path
           id="path3098"
           style="font-size:23.72335434px;line-height:100%;fill:#333333;font-family:Sansita One;-inkscape-font-specification:Sansita One"
           d="m 372.13357,337.5995 2.94169,-15.46763 4.81584,-0.47446 -0.73542,3.62967 c -0.17398,0.74334 -0.37167,1.37596 -0.59308,1.89787 0.34793,-0.44283 0.90148,-0.75123 1.66063,-0.92521 0.22141,-0.0633 0.46655,-0.0949 0.73542,-0.0949 1.47084,10e-6 2.60956,0.45076 3.41617,1.35223 0.80658,0.88569 1.20988,2.19047 1.20989,3.91436 -10e-6,2.24581 -0.64054,4.07251 -1.92159,5.48009 -1.37597,1.53411 -3.31337,2.30117 -5.81222,2.30117 -1.72391,0 -3.23429,-0.28468 -4.53117,-0.85404 -0.45865,-0.20561 -0.85404,-0.45865 -1.18616,-0.75915 m 4.76839,-0.21351 c 0.33212,0.28468 0.70379,0.42702 1.115,0.42702 0.4112,0 0.73542,-0.0791 0.97266,-0.23723 0.23722,-0.15816 0.44282,-0.39539 0.6168,-0.7117 0.47446,-0.85404 0.90148,-2.58585 1.28106,-5.19542 0.1107,-0.74332 0.16606,-1.48665 0.16607,-2.22999 -10e-6,-0.74333 -0.087,-1.23361 -0.26096,-1.47085 -0.15816,-0.23723 -0.3954,-0.35584 -0.7117,-0.35585 -0.96476,1e-5 -1.60529,0.94103 -1.92159,2.82308 l -1.25734,6.95094"
           inkscape:connector-curvature="0" />
        <path
           id="path3100"
           style="font-size:23.72335434px;line-height:100%;fill:#333333;font-family:Sansita One;-inkscape-font-specification:Sansita One"
           d="m 394.41647,332.07196 c 0.56935,-1.01219 0.85403,-2.03229 0.85404,-3.06032 -10e-6,-0.68005 -0.24515,-1.02009 -0.73543,-1.0201 -0.37958,1e-5 -0.76706,0.32423 -1.16244,0.97266 -0.41121,0.64845 -0.68008,1.39178 -0.80659,2.22999 l -1.23362,7.54403 -4.91073,0.47447 2.41978,-12.57338 3.91435,-0.47447 -0.42702,2.39606 c 0.77496,-1.59736 2.0323,-2.39605 3.77202,-2.39606 0.91729,10e-6 1.62108,0.23725 2.11137,0.7117 0.50609,0.47448 0.75914,1.202 0.75915,2.18255 -10e-6,0.96476 -0.32423,1.75554 -0.97266,2.37234 -0.63263,0.61681 -1.49458,0.92521 -2.58584,0.92521 -0.47448,0 -0.8066,-0.0949 -0.99638,-0.28468"
           inkscape:connector-curvature="0" />
        <path
           id="path3102"
           style="font-size:23.72335434px;line-height:100%;fill:#333333;font-family:Sansita One;-inkscape-font-specification:Sansita One"
           d="m 400.38253,338.02652 c -0.36376,-0.4112 -0.63262,-0.94103 -0.80659,-1.58947 -0.15816,-0.64843 -0.23724,-1.50247 -0.23724,-2.56212 0,-1.05963 0.18188,-2.07183 0.54564,-3.03659 0.36376,-0.96474 0.87776,-1.79505 1.54202,-2.49095 1.36013,-1.45502 3.16311,-2.18254 5.40892,-2.18255 0.80659,10e-6 1.50247,0.13445 2.08766,0.4033 l 4.05669,-0.4033 -1.75553,9.25211 c -0.0475,0.18979 -0.0712,0.45865 -0.0712,0.80659 -10e-6,0.34795 0.10279,0.63263 0.30841,0.85405 0.2214,0.22141 0.49027,0.34794 0.80659,0.37957 -0.15817,0.53773 -0.52983,0.96475 -1.115,1.28106 -0.56937,0.31631 -1.17827,0.47447 -1.82669,0.47447 -0.64845,0 -1.19409,-0.12653 -1.63692,-0.37958 -0.42702,-0.23723 -0.7038,-0.56145 -0.83031,-0.97265 -0.25306,0.39539 -0.64845,0.7196 -1.18617,0.97265 -0.53774,0.25305 -1.17036,0.37958 -1.89787,0.37958 -0.7117,0 -1.36014,-0.0949 -1.94531,-0.28468 -0.58518,-0.18979 -1.06756,-0.49029 -1.44713,-0.90149 m 5.00563,-9.63168 c -0.17398,0.28469 -0.34004,0.67217 -0.49819,1.16244 -0.15816,0.47448 -0.37167,1.36015 -0.64053,2.65702 -0.25306,1.28106 -0.37958,2.38025 -0.37958,3.29754 0,0.91731 0.0712,1.51039 0.21351,1.77926 0.14234,0.26886 0.34003,0.40329 0.59309,0.40329 0.50609,0 0.94102,-0.23723 1.30478,-0.7117 0.37957,-0.49028 0.64053,-1.16244 0.78287,-2.01648 l 1.25734,-6.95095 c -0.33213,-0.28467 -0.69589,-0.42701 -1.09127,-0.42702 -0.37958,1e-5 -0.68799,0.0633 -0.92521,0.18979 -0.22143,0.12654 -0.42703,0.33214 -0.61681,0.61681"
           inkscape:connector-curvature="0" />
        <path
           id="path3104"
           style="font-size:23.72335434px;line-height:100%;fill:#333333;font-family:Sansita One;-inkscape-font-specification:Sansita One"
           d="m 421.70761,332.07196 c 0.56935,-1.01219 0.85403,-2.03229 0.85404,-3.06032 -10e-6,-0.68005 -0.24515,-1.02009 -0.73543,-1.0201 -0.37958,1e-5 -0.76706,0.32423 -1.16244,0.97266 -0.41121,0.64845 -0.68008,1.39178 -0.8066,2.22999 l -1.23361,7.54403 -4.91073,0.47447 2.41978,-12.57338 3.91435,-0.47447 -0.42702,2.39606 c 0.77496,-1.59736 2.03229,-2.39605 3.77201,-2.39606 0.9173,10e-6 1.62109,0.23725 2.11138,0.7117 0.50609,0.47448 0.75914,1.202 0.75915,2.18255 -1e-5,0.96476 -0.32423,1.75554 -0.97266,2.37234 -0.63263,0.61681 -1.49458,0.92521 -2.58584,0.92521 -0.47448,0 -0.80661,-0.0949 -0.99638,-0.28468"
           inkscape:connector-curvature="0" />
        <path
           id="path3106"
           style="font-size:23.72335434px;line-height:100%;fill:#333333;font-family:Sansita One;-inkscape-font-specification:Sansita One"
           d="m 434.19756,336.05748 c -0.82242,0.85404 -1.98486,1.28106 -3.48733,1.28106 -1.88206,0 -3.02078,-0.68797 -3.41617,-2.06393 -0.12652,-0.4112 -0.18978,-0.84613 -0.18978,-1.30478 0,-0.45865 0.0474,-0.92521 0.14234,-1.39968 l 1.115,-5.93084 4.81584,-0.47447 -1.30479,6.9035 c -0.0316,0.20561 -0.0712,0.41912 -0.11862,0.64053 -0.0475,0.22142 -0.0712,0.45075 -0.0712,0.68798 0,0.22142 0.0395,0.41121 0.11862,0.56936 0.0791,0.14234 0.17397,0.26096 0.28468,0.35585 0.18978,0.12653 0.45074,0.18979 0.78287,0.18978 0.34794,10e-6 0.66425,-0.20559 0.94894,-0.6168 0.30048,-0.4112 0.5219,-0.97266 0.66425,-1.68436 l 1.30478,-6.57137 4.67351,-0.47447 -1.77926,9.32328 c -0.58518,3.03659 -1.47876,5.15587 -2.68073,6.35786 -0.61682,0.6168 -1.32852,1.04382 -2.13511,1.28106 -0.79078,0.25305 -1.70018,0.37957 -2.72818,0.37957 -1.66064,0 -2.96542,-0.26096 -3.91436,-0.78287 -0.94893,-0.52191 -1.4234,-1.2178 -1.4234,-2.08765 0,-0.64844 0.24514,-1.16245 0.73543,-1.54202 0.49028,-0.36376 1.11499,-0.54564 1.87414,-0.54564 0.66425,0 1.24943,0.14234 1.75553,0.42702 0.30049,0.17397 0.52191,0.37167 0.66425,0.59309 -0.36376,0.31631 -0.54564,0.73542 -0.54563,1.25734 -1e-5,0.69588 0.3163,1.04382 0.94893,1.04382 1.04382,0 1.86623,-1.20198 2.46723,-3.60595 0.17396,-0.7117 0.34003,-1.44712 0.49819,-2.20627"
           inkscape:connector-curvature="0" />
      </g>
    </g>
  </g>
 </svg>
--- a/docs/doxygen/latexdocstart.inc
+++ b/docs/doxygen/latexdocstart.inc
@@ -49,7 +49,7 @@
 \end{center}
 \end{figure}
 \vspace*{2cm}
-{\large Version 3.0.3 }\\
+{\large Version 3.0.2 }\\
 \vspace*{1cm}
 {Generated on \today}\\
 \end{center}
--- a/docs/doxygen/logo.png
+++ b/docs/doxygen/logo.png
--- a/docs/doxygen/mainpages/introduction.h
+++ b/docs/doxygen/mainpages/introduction.h
@@ -78,9 +78,9 @@ paragraphs, but here are some of the benefits:
 wxWidgets first-tier "ports", ie implementations of wxWidgets API, are:
@li wxMSW: This is the native port for Microsoft Windows systems (from Windows
-95 up to Windows 10 with at least Windows XP being recommended), either 32 or
+95 up to Windows 8.1 with at least Windows XP being recommended), either 32 or
 64 bits. The primarily supported compilers are Microsoft Visual C++ (versions 6
-up to 2015 are supported, at least 2005 is recommended) and GNU g++ (either
+up to 2013 are supported, at least 2005 is recommended) and GNU g++ (either
 from the traditional MinGW, TDM-GCC or MinGW-w64 distributions).
@li wxGTK: wxGTK2 and wxGTK3 are the ports using GTK+ library version 2.x and
--- a/docs/doxygen/mainpages/manual.h
+++ b/docs/doxygen/mainpages/manual.h
@@ -14,7 +14,7 @@
@author Julian Smart, Vadim Zeitlin, Robin Dunn, Stefan Csomor,
        Bryan Petty, Francesco Montorsi, Robert Roebling et al
-@date May 2, 2017
+@date October 6, 2014
@n
--- a/docs/doxygen/overviews/app.h
+++ b/docs/doxygen/overviews/app.h
@@ -41,7 +41,7 @@ public:
    virtual bool OnInit();
 };
-wxIMPLEMENT_APP(DerivedApp);
+IMPLEMENT_APP(DerivedApp)
 bool DerivedApp::OnInit()
 {
@@ -53,14 +53,14 @@ bool DerivedApp::OnInit()
 }
@endcode
-Note the use of wxIMPLEMENT_APP(appClass), which allows wxWidgets to dynamically
+Note the use of IMPLEMENT_APP(appClass), which allows wxWidgets to dynamically
 create an instance of the application object at the appropriate point in
 wxWidgets initialization. Previous versions of wxWidgets used to rely on the
 creation of a global application object, but this is no longer recommended,
 because required global initialization may not have been performed at
 application object construction time.
-You can also use wxDECLARE_APP(appClass) in a header file to declare the wxGetApp
+You can also use DECLARE_APP(appClass) in a header file to declare the wxGetApp
 function which returns a reference to the application object. Otherwise you can
 only use the global @c wxTheApp pointer which is of type @c wxApp*.
--- a/docs/doxygen/overviews/customwidgets.h
+++ b/docs/doxygen/overviews/customwidgets.h
@@ -108,8 +108,8 @@ protected:
    }
 private:
-    wxDECLARE_DYNAMIC_CLASS(MySpecialWidget);
+    DECLARE_DYNAMIC_CLASS(MySpecialWidget)
-    wxDECLARE_EVENT_TABLE();
+    DECLARE_EVENT_TABLE()
 };
@endcode
--- a/docs/doxygen/overviews/datetime.h
+++ b/docs/doxygen/overviews/datetime.h
@@ -175,8 +175,8 @@ I.e. you would just write
@code
 wxDateTime dt(...whatever...);
-wxPrintf("The time is %s in local time zone", dt.FormatTime());
+printf("The time is %s in local time zone", dt.FormatTime().c_str());
-wxPrintf("The time is %s in GMT", dt.FormatTime(wxDateTime::GMT));
+printf("The time is %s in GMT", dt.FormatTime(wxDateTime::GMT).c_str());
@endcode
--- a/docs/doxygen/overviews/debugging.h
+++ b/docs/doxygen/overviews/debugging.h
@@ -38,7 +38,7 @@ be running on are unusually constrained (notice that when asserts are disabled
 their condition is not even evaluated so the only run-time cost is a single
 condition check and the extra space taken by the asserts in the code).
-This automatic deactivation of debugging code is done by wxIMPLEMENT_APP() macro
+This automatic deactivation of debugging code is done by IMPLEMENT_APP() macro
 so if you don't use you may need to explicitly call wxDISABLE_DEBUG_SUPPORT()
 yourself.
--- a/docs/doxygen/overviews/docview.h
+++ b/docs/doxygen/overviews/docview.h
@@ -114,7 +114,7 @@ wxDocument class, you need to derive a new class and override at least the
 member functions SaveObject and LoadObject. SaveObject and LoadObject will be
 called by the framework when the document needs to be saved or loaded.
-Use the macros wxDECLARE_DYNAMIC_CLASS and wxIMPLEMENT_DYNAMIC_CLASS in order to
+Use the macros DECLARE_DYNAMIC_CLASS and IMPLEMENT_DYNAMIC_CLASS in order to
 allow the framework to create document objects on demand. When you create a
 wxDocTemplate object on application initialization, you should pass
 CLASSINFO(YourDocumentClass) to the wxDocTemplate constructor so that it knows
@@ -139,7 +139,7 @@ To use the abstract wxView class, you need to derive a new class and override
 at least the member functions OnCreate, OnDraw, OnUpdate and OnClose. You will
 probably want to respond to menu commands from the frame containing the view.
-Use the macros wxDECLARE_DYNAMIC_CLASS and wxIMPLEMENT_DYNAMIC_CLASS in order to
+Use the macros DECLARE_DYNAMIC_CLASS and IMPLEMENT_DYNAMIC_CLASS in order to
 allow the framework to create view objects on demand. When you create a
 wxDocTemplate object on application initialization, you should pass
 CLASSINFO(YourViewClass) to the wxDocTemplate constructor so that it knows how
@@ -295,10 +295,10 @@ In order to respond to a file load command from one of these identifiers, you
 need to handle them using an event handler, for example:
@code
-wxBEGIN_EVENT_TABLE(wxDocParentFrame, wxFrame)
+BEGIN_EVENT_TABLE(wxDocParentFrame, wxFrame)
    EVT_MENU(wxID_EXIT, wxDocParentFrame::OnExit)
    EVT_MENU_RANGE(wxID_FILE1, wxID_FILE9, wxDocParentFrame::OnMRUFile)
-wxEND_EVENT_TABLE()
+END_EVENT_TABLE()
 void wxDocParentFrame::OnExit(wxCommandEvent& WXUNUSED(event))
 {
--- a/docs/doxygen/overviews/internationalization.h
+++ b/docs/doxygen/overviews/internationalization.h
@@ -25,13 +25,12 @@ inclusion into future versions of the library!
 The wxWidgets approach to i18n closely follows the GNU gettext package.
 wxWidgets uses the message catalogs which are binary compatible with gettext
 catalogs and this allows to use all of the programs in this package to work
-with them as well as using any of the tools working with message catalogs in
+with them. But note that no additional libraries are needed during run-time,
-this format such as <a href="http://poedit.net/">Poedit</a>.
+however, so you have only the message catalogs to distribute and nothing else.
-Because of this, you will need to use the gettext package to work with the
+During program development you will need the gettext package for working with
-translations during the program development. However no additional libraries
+message catalogs. @b Warning: gettext versions @< 0.10 are known to be buggy,
-are needed during run-time, so you have only the message catalogs to distribute
+so you should find a later version of it!
 and nothing else.
 There are two kinds of message catalogs: source catalogs which are text files
 with extension .po and binary catalogs which are created from the source ones
@@ -54,7 +53,7 @@ Translating your application involves several steps:
    language(s). It involves editing the .po file.
@li Compiling the .po file into .mo file to be used by the program.
@li Installing the .mo files with your application in the appropriate location
-    for the target system (see @ref overview_i18n_mofiles).
+    for the target system (@see overview_i18n_mofiles).
@li Setting the appropriate locale in your program to use the strings for the
    given language: see wxLocale.
--- a/docs/doxygen/overviews/log.h
+++ b/docs/doxygen/overviews/log.h
@@ -52,7 +52,7 @@ of arguments or a variable argument list pointer. Here are all of them:
    defined) and expands to nothing in release mode (otherwise).
    Note that under Windows, you must either run the program under debugger or
    use a 3rd party program such as DebugView
-    (http://technet.microsoft.com/en-us/sysinternals/bb896647.aspx)
+    (http://www.microsoft.com/technet/sysinternals/Miscellaneous/DebugView.mspx)
    to actually see the debug output.
@li wxLogTrace() as wxLogDebug() only does something in debug build. The reason for
    making it a separate function from it is that usually there are a lot of
--- a/docs/doxygen/overviews/printing.h
+++ b/docs/doxygen/overviews/printing.h
@@ -174,7 +174,7 @@ user.
 Class wxPageSetupDialog puts up the standard page setup dialog, which allows
 you to specify the orientation, paper size, and related settings. You provide
-it with a wxPageSetupDialogData object at initialization, which is used to
+it with a wxPageSetupDialogData object at intialization, which is used to
 populate the dialog; when the dialog is dismissed, this object contains the
 settings chosen by the user, including orientation and/or page margins.
--- a/docs/doxygen/overviews/refcount.h
+++ b/docs/doxygen/overviews/refcount.h
@@ -79,6 +79,7 @@ operators and copy constructors since they are reference-counted:
@li wxPalette
@li wxPen
@li wxRegion
@li wxString
@li wxVariant
@li wxVariantData
--- a/docs/doxygen/overviews/roughguide.h
+++ b/docs/doxygen/overviews/roughguide.h
@@ -40,8 +40,8 @@ same code to draw to several different devices. You can draw using the member
 functions of wxDC, such as wxDC::DrawLine and wxDC::DrawText. Control colour on
 a window (wxColour) with brushes (wxBrush) and pens (wxPen).
-To intercept events, you add a wxDECLARE_EVENT_TABLE macro to the window class
+To intercept events, you add a DECLARE_EVENT_TABLE macro to the window class
-declaration, and put a wxBEGIN_EVENT_TABLE ... wxEND_EVENT_TABLE block in the
+declaration, and put a BEGIN_EVENT_TABLE ... END_EVENT_TABLE block in the
 implementation file. Between these macros, you add event macros which map the
 event (such as a mouse click) to a member function. These might override
 predefined event handlers such as for wxKeyEvent and wxMouseEvent.
--- a/docs/doxygen/overviews/runtimeclass.h
+++ b/docs/doxygen/overviews/runtimeclass.h
@@ -30,8 +30,8 @@ all the others. This macro is limited to wxWidgets classes only and only works
 with pointers (unlike the real dynamic_cast which also accepts references).
 Each class that you wish to be known to the type system should have a macro
-such as wxDECLARE_DYNAMIC_CLASS just inside the class declaration. The macro
+such as DECLARE_DYNAMIC_CLASS just inside the class declaration. The macro
-wxIMPLEMENT_DYNAMIC_CLASS should be in the implementation file. Note that these
+IMPLEMENT_DYNAMIC_CLASS should be in the implementation file. Note that these
 are entirely optional; use them if you wish to check object types, or create
 instances of classes using the class name. However, it is good to get into the
 habit of adding these macros for all classes.
@@ -39,13 +39,13 @@ habit of adding these macros for all classes.
 Variations on these macros are used for multiple inheritance, and abstract
 classes that cannot be instantiated dynamically or otherwise.
-wxDECLARE_DYNAMIC_CLASS inserts a static wxClassInfo declaration into the class,
+DECLARE_DYNAMIC_CLASS inserts a static wxClassInfo declaration into the class,
-initialized by wxIMPLEMENT_DYNAMIC_CLASS. When initialized, the wxClassInfo
+initialized by IMPLEMENT_DYNAMIC_CLASS. When initialized, the wxClassInfo
 object inserts itself into a linked list (accessed through wxClassInfo::first
 and wxClassInfo::next pointers). The linked list is fully created by the time
 all global initialisation is done.
-wxIMPLEMENT_DYNAMIC_CLASS is a macro that not only initialises the static
+IMPLEMENT_DYNAMIC_CLASS is a macro that not only initialises the static
 wxClassInfo member, but defines a global function capable of creating a dynamic
 object of the class in question. A pointer to this function is stored in
 wxClassInfo, and is used when an object should be created dynamically.
@@ -64,7 +64,7 @@ wxClassInfo object instead, then you can simply call wxClassInfo::CreateObject.
@section overview_rtti_classinfo wxClassInfo
 This class stores meta-information about classes. An application may use macros
-such as wxDECLARE_DYNAMIC_CLASS and wxIMPLEMENT_DYNAMIC_CLASS to record runtime
+such as DECLARE_DYNAMIC_CLASS and IMPLEMENT_DYNAMIC_CLASS to record runtime
 information about a class, including:
@li Its position in the inheritance hierarchy.
@@ -72,8 +72,8 @@ information about a class, including:
@li A string representation of the class name.
@li A function that can be called to construct an instance of this class.
-The wxDECLARE_... macros declare a static wxClassInfo variable in a class, which
+The DECLARE_... macros declare a static wxClassInfo variable in a class, which
-is initialized by macros of the form wxIMPLEMENT_... in the implementation C++
+is initialized by macros of the form IMPLEMENT_... in the implementation C++
 file. Classes whose instances may be constructed dynamically are given a global
 constructor function which returns a new object.
@@ -89,7 +89,7 @@ In a header file frame.h:
@code
 class wxFrame : public wxWindow
 {
-    wxDECLARE_DYNAMIC_CLASS(wxFrame);
+    DECLARE_DYNAMIC_CLASS(wxFrame)
 private:
    wxString m_title;
@@ -102,7 +102,7 @@ public:
 In a C++ file frame.cpp:
@code
-wxIMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow);
+IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)
 wxFrame::wxFrame()
 {
--- a/docs/doxygen/overviews/xrc.h
+++ b/docs/doxygen/overviews/xrc.h
@@ -402,12 +402,12 @@ public:
    {
        Close();
    }
-    wxDECLARE_EVENT_TABLE();
+    DECLARE_EVENT_TABLE();
 };
-wxBEGIN_EVENT_TABLE(TestWnd,TestWnd_Base)
+BEGIN_EVENT_TABLE(TestWnd,TestWnd_Base)
    EVT_BUTTON(XRCID("B"), TestWnd::OnBPressed)
-wxEND_EVENT_TABLE()
+END_EVENT_TABLE()
@endcode
 It is also possible to access the wxSizerItem of a sizer that is part of a
@@ -452,7 +452,7 @@ public:
    virtual bool CanHandle(wxXmlNode *node);
    // Register with wxWidgets' dynamic class subsystem.
-    wxDECLARE_DYNAMIC_CLASS(MyControlXmlHandler);
+    DECLARE_DYNAMIC_CLASS(MyControlXmlHandler)
 };
@endcode
@@ -460,7 +460,7 @@ The implementation of your custom XML handler will typically look as:
@code
 // Register with wxWidgets' dynamic class subsystem.
-wxIMPLEMENT_DYNAMIC_CLASS(MyControlXmlHandler, wxXmlResourceHandler);
+IMPLEMENT_DYNAMIC_CLASS(MyControlXmlHandler, wxXmlResourceHandler)
 MyControlXmlHandler::MyControlXmlHandler()
 {
--- a/docs/doxygen/overviews/xrc_format.h
+++ b/docs/doxygen/overviews/xrc_format.h
@@ -2523,7 +2523,7 @@ The subclass must satisfy a number of requirements:
 -# It must be derived from the class specified in @c class attribute.
 -# It must be visible in wxWidget's pseudo-RTTI mechanism, i.e. there must be
-    a wxDECLARE_DYNAMIC_CLASS() entry for it.
+    a DECLARE_DYNAMIC_CLASS() entry for it.
 -# It must support two-phase creation. In particular, this means that it has
    to have default constructor.
 -# It cannot provide custom Create() method and must be constructible using
--- a/docs/doxygen/regen.sh
+++ b/docs/doxygen/regen.sh
@@ -38,10 +38,11 @@ fi
 # Check that doxygen has the correct version as different versions of it are
 # unfortunately not always (in fact, practically never) compatible.
 #
-# Still allow using incompatible version if explicitly requested.
+# Still allow using incompatible version for some quick local testing if really
 # needed and 1.8.2 can't be installed for whatever reason.
 if [[ -z $WX_SKIP_DOXYGEN_VERSION_CHECK ]]; then
    doxygen_version=`$DOXYGEN --version`
-    doxygen_version_required=1.8.8
+    doxygen_version_required=1.8.2
    if [[ $doxygen_version != $doxygen_version_required ]]; then
        echo "Doxygen version $doxygen_version is not supported."
        echo "Please use Doxygen $doxygen_version_required or export WX_SKIP_DOXYGEN_VERSION_CHECK."
--- a/docs/msw/install.txt
+++ b/docs/msw/install.txt
@@ -2,7 +2,7 @@
                   --------------------------------
 This is wxWidgets for Microsoft Windows 9x/ME, Windows NT
-and later (2000, XP, Vista, 7, 8, 10, etc) including both 32 bit and 64
+and later (2000, XP, Vista, 7, 8, etc) including both 32 bit and 64
 bit versions.
@@ -19,11 +19,11 @@ Installation
 If you are using one of the supported compilers, you can download the
 pre-built in binaries from
-    https://sourceforge.net/projects/wxwindows/files/3.0.3/binaries/
+    https://sourceforge.net/projects/wxwindows/files/3.0.0/binaries/
 or
-             ftp://ftp.wxwidgets.org/pub/3.0.3/binaries/
+             ftp://ftp.wxwidgets.org/pub/3.0.0/binaries/
 In this case, just uncompress the binaries archive under any directory
 and skip to "Building Applications Using wxWidgets" part.
@@ -98,8 +98,8 @@ Microsoft Visual C++ Compilation
 Ready to use project files are provided for VC++ versions 6, 7, 8, 9
 and 10 (also known as MSVS 6, 2003, 2005, 2008 and 2010 respectively).
-For VC++ 11, 12 and 14 (2012, 2013 and 2015 respectively), you need to
+For VC++ 11 (2012, respectively), you need to import the existing VC10
-import the existing VC10 project files into VC11, VC12 or VC14 IDE first.
+project files into VC11 IDE first.
 Simply open wx_vcN.sln (for N=7, 8, 9 or 10) or wx.dsw (for VC6) file,
 select the appropriate configuration (Debug or Release, static or DLL)
--- a/docs/publicity/announce.txt
+++ b/docs/publicity/announce.txt
@@ -1,11 +1,15 @@
-May 2, 2017 -- The wxWidgets team is pleased to announce a
+October 6, 2014 -- The wxWidgets team is pleased to announce a
 major new release of our open source framework for the development
 of native cross-platform applications in C++.
-wxWidgets 3.0.3 is a stable bug fix release in 3.0 branch and is
+wxWidgets 3.0.2 is a stable bug fix release in 3.0 branch and is
 available at
-	https://github.com/wxWidgets/wxWidgets/releases/tag/v3.0.3/
+        https://sourceforge.net/downloads/wxwindows/3.0.2/
 and at our FTP mirror at
        ftp://ftp.wxwidgets.org/pub/3.0.2/
 Please choose the archive format suitable for your platform, i.e. 7z
 or ZIP for Windows platforms and tar.bz2 for the Unix systems
@@ -16,53 +20,62 @@ the Windows installer (.exe file) you still need to build wxWidgets
 as only sources, not binaries, are installed.
 We also provide the pre-built versions of wxMSW libraries for the
-selected compilers.
+selected compilers at
        https://sourceforge.net/downloads/wxwindows/3.0.2/binaries/
 Please see the README file there for the descriptions of the
 individual files.
 This is a bug fix release with no significant new features compared to
 the previous 3.0.x releases and compatible with them at both the API
 and the ABI level (i.e. all applications linked against earlier 3.0.x
-DLLs or shared libraries will continue to work when using 3.0.3
+DLLs or shared libraries will continue to work when using 3.0.2
 libraries).
-The full list of changes in this release is available at
+Some of the changes:
 https://raw.githubusercontent.com/wxWidgets/wxWidgets/v3.0.3/docs/changes.txt
 (starting from the line 583, or search for "3.0.3" in this file), here are
 some selected ones:
 * In all ports:
 - Support requestion modern (3.x+) OpenGL version in wxGLCanvas.
 - Fix using wxHTTP and wxFTP from worker thread.
 * In wxGTK:
- - Support for Gstreamer 1.0 in wxMediaCtrl, in addition to obsolete 0.x.
+ - Fix wxSearchCtrl layout.
- - Several fatal bug fixes for GTK+ 3.
+ - Fix mouse handling in wxListCtrl and wxTreeCtrl inside wxNotebook.
 - Avoid some GTK+ warnings.
 * In wxMSW:
- - Build fixes for MinGW 4.9.
+ - Cygwin 1.7 and MinGW 4.8 build fixes.
- - Improve wxSearchCtrl appearance.
+ - Fix parallel build in MSVS 2010+ solutions.
- - Fix creating or modifying file associations under recent Windows versions.
+ - Add x64 configurations to MSVS 2005/2008 projects too.
 - Fix using Esc as accelerator in the menus.
 - Fix wxRadioBox, wxSlider, wxToggleButton with non-default colours.
 - RTL support fixes for wxDC and wxGrid.
 * In wxOSX:
- - Build fixes for wxWebView and wxMediaCtrl when using 10.10 or later SDK.
+ - Avoid compilation warnings when using 10.10 SDK.
- - Implement wxTE_{RIGHT,CENTER} support in multiline wxTextCtrl.
+ - Enhancements to retina support.
 - Generate wxEVT_TEXT_ENTER for wxTE_PASSWORD controls.
 - Fix handling of WXK_NUMPAD_ENTER.
 - Fix length of text in wxTextDataObject.
 - Fix wxDatePickerCtrl appearance.
 Despite of the focus on bug fixes, a few new features have
 nevertheless made it into this release as well:
-If you are upgrading from wxWidgets 2.8 or earlier, please read the
+ - Add support for "%V", "%G" and "%g" to wxDateTime::Format().
-"INCOMPATIBLE CHANGES" section in the beginning of this file and the
+ - Added an XRC handler for wxSimplebook.
-corresponding part of the manual at
+ - Allow to specify the "variant" window property in XRC.
 - Add wxGenericListCtrl::EndEditLabel().
-    http://docs.wxwidgets.org/3.0.3/overview_changes_since28.html
+Other changes in this release are described in the file
 docs/changes.txt available online at
    https://sourceforge.net/projects/wxwindows/files/3.0.2/changes.txt
 This file also contains information about the changes in 3.0 compared
 to earlier versions of wxWidgets, please read it, and especially its
 "INCOMPATIBLE CHANGES" section, if you are upgrading from wxWidgets
 2.8 or earlier. And for even more details, please see
    http://docs.wxwidgets.org/3.0.0/overview_changes_since28.html
-We recommend that you upgrade to wxWidgets 3.0.3 if you already use an
+We recommend that you upgrade to wxWidgets 3.0.2 if you already use an
 earlier wxWidgets 3.0.x release, the upgrade is completely transparent
 and doesn't require any changes in the existing code. If you are still
 using wxWidgets 2.8 or earlier, please consider updating to wxWidgets
--- a/docs/readme.txt
+++ b/docs/readme.txt
@@ -1,4 +1,4 @@
-                wxWidgets 3.0.3 Release Notes
+                wxWidgets 3.0.2 Release Notes
                =============================
 Welcome to the latest stable release of wxWidgets, a free and open
@@ -18,13 +18,20 @@ You can learn more about wxWidgets at
 and read its documentation online at
-        http://docs.wxwidgets.org/3.0.3/
+        http://docs.wxwidgets.org/3.0.2/
 wxWidgets sources and binaries for the selected platforms are
 available for download from
-	https://github.com/wxWidgets/wxWidgets/releases/tag/v3.0.3/
+        https://sourceforge.net/projects/wxwindows/files/3.0.2/
 or
        ftp://ftp.wxwidgets.org/pub/3.0.2/
 Please see the "Files" section below for the description of various
 files available at these locations.
@@ -34,51 +41,55 @@ Changes in this release
 This is a bug fix release with no significant new features compared to
 the previous 3.0.x releases and compatible with them at both the API
 and the ABI level (i.e. all applications linked against earlier 3.0.x
-DLLs or shared libraries will continue to work when using 3.0.3
+DLLs or shared libraries will continue to work when using 3.0.2
 libraries).
-The full list of changes in this release is available at
+Some of the changes:
 https://raw.githubusercontent.com/wxWidgets/wxWidgets/v3.0.3/docs/changes.txt
 (starting from the line 583, or search for "3.0.3" in this file), here are
 some selected ones:
 * In all ports:
 - Support requestion modern (3.x+) OpenGL version in wxGLCanvas.
 - Fix using wxHTTP and wxFTP from worker thread.
 * In wxGTK:
- - Support for Gstreamer 1.0 in wxMediaCtrl, in addition to obsolete 0.x.
+ - Fix wxSearchCtrl layout.
- - Several fatal bug fixes for GTK+ 3.
+ - Fix mouse handling in wxListCtrl and wxTreeCtrl inside wxNotebook.
 - Avoid some GTK+ warnings.
 * In wxMSW:
- - Build fixes for MinGW 4.9.
+ - Cygwin 1.7 and MinGW 4.8 build fixes.
- - Improve wxSearchCtrl appearance.
+ - Fix parallel build in MSVS 2010+ solutions.
- - Fix creating or modifying file associations under recent Windows versions.
+ - Add x64 configurations to MSVS 2005/2008 projects too.
 - Fix using Esc as accelerator in the menus.
 - Fix wxRadioBox, wxSlider, wxToggleButton with non-default colours.
 - RTL support fixes for wxDC and wxGrid.
 * In wxOSX:
- - Build fixes for wxWebView and wxMediaCtrl when using 10.10 or later SDK.
+ - Avoid compilation warnings when using 10.10 SDK.
- - Implement wxTE_{RIGHT,CENTER} support in multiline wxTextCtrl.
+ - Enhancements to retina support.
 - Generate wxEVT_TEXT_ENTER for wxTE_PASSWORD controls.
 - Fix handling of WXK_NUMPAD_ENTER.
 - Fix length of text in wxTextDataObject.
 - Fix wxDatePickerCtrl appearance.
 Despite of the focus on bug fixes, a few new features have
 nevertheless made it into this release as well:
-If you are upgrading from wxWidgets 2.8 or earlier, please read the
+ - Add support for "%V", "%G" and "%g" to wxDateTime::Format().
-"INCOMPATIBLE CHANGES" section in the beginning of this file and the
+ - Added an XRC handler for wxSimplebook.
-corresponding part of the manual at
+ - Allow to specify the "variant" window property in XRC.
 - Add wxGenericListCtrl::EndEditLabel().
-    http://docs.wxwidgets.org/3.0.3/overview_changes_since28.html
+Other changes in this release are described in the file
 docs/changes.txt available online at
    https://sourceforge.net/projects/wxwindows/files/3.0.2/changes.txt
 This file also contains information about the changes in 3.0 compared
 to earlier versions of wxWidgets, please read it, and especially its
 "INCOMPATIBLE CHANGES" section, if you are upgrading from wxWidgets
 2.8 or earlier. And for even more details, please see
    http://docs.wxwidgets.org/3.0.0/overview_changes_since28.html
 Platforms supported
 -------------------
-wxWidgets 3.0.x supports the following primary platforms:
+wxWidgets currently supports the following primary platforms:
- Windows 95/98/ME, NT, 2000, XP, Vista, 7, 8, 10 (32/64 bits).
+- Windows 95/98/ME, NT, 2000, XP, Vista, 7 (32/64 bits).
 - Most Unix variants using the GTK+ toolkit (version 2.6 or newer)
 - Mac OS X (10.5 or newer) using Cocoa (32/64 bits) or Carbon (32 only)
@@ -204,4 +215,4 @@ If you are looking for support, you can get it from
 Have fun!
-The wxWidgets Team, April 2017
+The wxWidgets Team, October 2014
--- a/docs/release_binaries.mdwn
+++ b/docs/release_binaries.mdwn
@@ -1,7 +1,7 @@
-wxWidgets 3.0.2 Binaries
+wxWidgets 3.0.1 Binaries
 ========================
-This directory contains binary files for wxWidgets 3.0.2 release.
+This directory contains binary files for wxWidgets 3.0.1 release.
 * Microsoft Visual C++ compiler versions 9.0, 10.0, 11.0 and 12.0
  corresponding to marketing product names of Microsoft Visual Studio
@@ -14,9 +14,9 @@ For Developers
 --------------
 For developing applications with wxWidgets you need to download the
-compiler-independent wxWidgets-3.0.2_Headers.7z file (found in the
+compiler-independent wxWidgets-3.0.1_Headers.7z file (found in the
-parent directory) and one of wxMSW-3.0.2-vcXXX_Dev.7z or
+parent directory) and one of wxMSW-3.0.1-vcXXX_Dev.7z or
-wxMSW-3.0.2_gccXXX_Dev.7z files depending on your compiler, its
+wxMSW-3.0.1_gccXXX_Dev.7z files depending on your compiler, its
 version and the target architecture (x86 if not specified or x64).
 Unpack both files into the same directory so that "include" and "lib"
@@ -30,15 +30,15 @@ symbols.
 For End Users
 -------------
-End users may download one of wxMSW-3.0.2_vcXXX_ReleaseDLL.7z or
+End users may download one of wxMSW-3.0.1_vcXXX_ReleaseDLL.7z or
-wxMSW-3.0.2_gccXXX_ReleaseDLL.7z files to get just the DLLs
+wxMSW-3.0.1_gccXXX_ReleaseDLL.7z files to get just the DLLs
 required for running the applications using wxWidgets.
 For Debugging
 -------------
-* Microsoft Visual C++ users: Files wxMSW-3.0.2_vcXXX_ReleasePDB.7z
+* Microsoft Visual C++ users: Files wxMSW-3.0.1_vcXXX_ReleasePDB.7z
  contain the debug symbols for the release build of the DLLs. Download
  them if you want to debug your own applications in release build or
  if you want to get meaningful information from mini-dumps retrieved
@@ -51,8 +51,10 @@ For Debugging
 Feedback
 --------
-Please let us know if these files are useful to you and how could they be made
+This is our first attempt to provide binaries for a major wxWidgets
-more so and, of course, if you run into any problems with them. Looking
+release and we are very interested in your feedback. Please let us
 know if these files are useful to you and how could they be made more
 so and, of course, if you run into any problems with them. Looking
 forward to hearing from you on [wx-users mailing list](http://groups.google.com/group/wx-users).
@@ -61,46 +63,46 @@ Check Sums
 To verify your download please use the following sha1sums:
-    d4de907d5cbbc6feabec3ae06b7cb875f2f552f6  wxMSW-3.0.2_gcc471TDM_Dev.7z
+    18ece8798f037c86d3330b2e909a4022a0321100 wxMSW-3.0.1_gcc471TDM_Dev.7z
-    55ff0cd21df57ad6d25895964c13e421f86c0781  wxMSW-3.0.2_gcc471TDM_ReleaseDLL.7z
+    167bf2bfcc072165318e42a7c84ae58099c2d4a8 wxMSW-3.0.1_gcc471TDM_ReleaseDLL.7z
-    5856429ba46f29689e95a86b97a741ed42ebad98  wxMSW-3.0.2_gcc471TDM_x64_Dev.7z
+    26dce50acdd349d60088e60d2bad3e283c4ddaa7 wxMSW-3.0.1_gcc471TDM_x64_Dev.7z
-    6c4289652aa06b1ff2e28e72250c3ecd61b36acd  wxMSW-3.0.2_gcc471TDM_x64_ReleaseDLL.7z
+    04dbd607b0ab17c34c61975270f768b43dd65977 wxMSW-3.0.1_gcc471TDM_x64_ReleaseDLL.7z
-    e9e09cfe9c64c528a4e5b825f1d4eb93d41da490  wxMSW-3.0.2_gcc481TDM_Dev.7z
+    bfc8ac6e01e977a93281029d376e9bc998d2ccf2 wxMSW-3.0.1_gcc481TDM_Dev.7z
-    1f5e03d3e07812270fdd15f7ea47ccd43cb41f01  wxMSW-3.0.2_gcc481TDM_ReleaseDLL.7z
+    504e0897553706cb3934745ba89da2d153cfa945 wxMSW-3.0.1_gcc481TDM_ReleaseDLL.7z
-    ff2a74d4298f58f7a1f9412ee632c8c695ca7efe  wxMSW-3.0.2_gcc481TDM_x64_Dev.7z
+    f0801e9433e707290cd31f2e9476df0d4279a45d wxMSW-3.0.1_gcc481TDM_x64_Dev.7z
-    713860af5d001e3affdfae4003c3479fcceae72d  wxMSW-3.0.2_gcc481TDM_x64_ReleaseDLL.7z
+    c81090181a0863aca6af91bba602db1f4304f7dd wxMSW-3.0.1_gcc481TDM_x64_ReleaseDLL.7z
-    c675da612bc702c66cc985ac02262a0529df34b0  wxMSW-3.0.2_vc90_Dev.7z
+    0811a37e86311888dc7b2328e9f834e2587816e1 wxMSW-3.0.1_vc90_Dev.7z
-    2ee0d4c15bf4453ad5f3c3656a5a76bb489ed267  wxMSW-3.0.2_vc90_ReleaseDLL.7z
+    04f0239e0b2f6fcde12235b539c80638d567a168 wxMSW-3.0.1_vc90_ReleaseDLL.7z
-    1006789fdff272058803c28ec77aff328dab2de2  wxMSW-3.0.2_vc90_ReleasePDB.7z
+    5ae62332d01ddd99874f7dc76085c84f1558f676 wxMSW-3.0.1_vc90_ReleasePDB.7z
-    1c815bafd9e8506549800354e44b22af60631941  wxMSW-3.0.2_vc90_x64_Dev.7z
+    42285a7da0a250fa475d36a579cf7bff56c5d153 wxMSW-3.0.1_vc90_x64_Dev.7z
-    2830484c43193e72f994adc3601438fde354fb4c  wxMSW-3.0.2_vc90_x64_ReleaseDLL.7z
+    74738de7729236027e836bd71e05c5a2c0c8604f wxMSW-3.0.1_vc90_x64_ReleaseDLL.7z
-    9a1e87141345c818f58e523766c5e42ab9ecfb02  wxMSW-3.0.2_vc90_x64_ReleaseDLL.msi
+    38cc78dff12ac1deb0f524cf49fca3f4b9c8f538 wxMSW-3.0.1_vc90_x64_ReleaseDLL.msi
-    1c9094ab4fa93875477ceb99d72db2a904c48136  wxMSW-3.0.2_vc90_x64_ReleasePDB.7z
+    e737f2542294f4952c398b23c543675610a02deb wxMSW-3.0.1_vc90_x64_ReleasePDB.7z
-    5d1c2ad76c85bba32cc6329446bc70632af245ae  wxMSW-3.0.2_vc90_x86_ReleaseDLL.msi
+    e184bd3f92164bff1f82ea2b1eda152c5df74656 wxMSW-3.0.1_vc90_x86_ReleaseDLL.msi
-    d51026d681916f86cd34885cccc4408e8b0b3962  wxMSW-3.0.2_vc100_Dev.7z
+    7060348454cc48284b1d5abeeda6c31b45d85eda wxMSW-3.0.1_vc100_Dev.7z
-    f1fd09ab3ced110afd0ecaa191117533981928ed  wxMSW-3.0.2_vc100_ReleaseDLL.7z
+    c91fdf9499ffbc49cb5bd7241aac30f42c1f1399 wxMSW-3.0.1_vc100_ReleaseDLL.7z
-    da515bdf35a2aa8972614865ab4687da4727fae7  wxMSW-3.0.2_vc100_ReleasePDB.7z
+    74e8a2eb81cca4eb189130206a6d91aa2759f0a9 wxMSW-3.0.1_vc100_ReleasePDB.7z
-    deec659658076e46e794d73b2b4f4cf812a27278  wxMSW-3.0.2_vc100_x64_Dev.7z
+    4773be9e2b8deb007c06289bc0ac4969d2dec386 wxMSW-3.0.1_vc100_x64_Dev.7z
-    7c9c0a710112f993655a0b51a9dc63206897d553  wxMSW-3.0.2_vc100_x64_ReleaseDLL.7z
+    76dc2d55698669f5de19bc149675961ab1115886 wxMSW-3.0.1_vc100_x64_ReleaseDLL.7z
-    ea22edf6983a282513571ee2901ed18035aadf80  wxMSW-3.0.2_vc100_x64_ReleaseDLL.msi
+    efa6846cd9ad76109c20077d623d602e18a04997 wxMSW-3.0.1_vc100_x64_ReleaseDLL.msi
-    1f2eeecdf2355f89c70fa94c364afd3267b1f51f  wxMSW-3.0.2_vc100_x64_ReleasePDB.7z
+    77d886d0ef36cd32a4308abb75748ca567dd9251 wxMSW-3.0.1_vc100_x64_ReleasePDB.7z
-    00b47fc629868d3634e13eefc4adc08d6e822853  wxMSW-3.0.2_vc100_x86_ReleaseDLL.msi
+    cacd6023817935d1c47c3ffc3fd7e1f758c85279 wxMSW-3.0.1_vc100_x86_ReleaseDLL.msi
-    33e9e9216b1c0fafc44fd681520a746465eb30d6  wxMSW-3.0.2_vc110_Dev.7z
+    ea82f65254080a7a5680a0f9283e300a675ea68d wxMSW-3.0.1_vc110_Dev.7z
-    e38f4f7c00ba58bf90afa53474ca0fdafa8ea791  wxMSW-3.0.2_vc110_ReleaseDLL.7z
+    9e2dcd558fc2bd64b90c7f4c76744ea3255b3c60 wxMSW-3.0.1_vc110_ReleaseDLL.7z
-    d5ce2cf60829b4fda83439975ff4f7d857dda92d  wxMSW-3.0.2_vc110_ReleasePDB.7z
+    1cff890303e9663f7243fe145d12a8fed60c5495 wxMSW-3.0.1_vc110_ReleasePDB.7z
-    46e5a66a65db34107a089d1aef326c25cafbe7af  wxMSW-3.0.2_vc110_x64_Dev.7z
+    3c0c53350310d9fec37dbbd3cd35bdfb81d2a2dc wxMSW-3.0.1_vc110_x64_Dev.7z
-    fff956c21826e5268b1533fc0b4fad6016963be0  wxMSW-3.0.2_vc110_x64_ReleaseDLL.7z
+    de7d2f7580d080088e3f64c66d26cba931a6f4e9 wxMSW-3.0.1_vc110_x64_ReleaseDLL.7z
-    2c3b6f6e63a40027bca9601d7668999dec596013  wxMSW-3.0.2_vc110_x64_ReleaseDLL.msi
+    4d7a49e3d67f6559ac8bfbbbecaba16653eee163 wxMSW-3.0.1_vc110_x64_ReleaseDLL.msi
-    8a0c6e9bd844e204e26955573049fb17ce704d60  wxMSW-3.0.2_vc110_x64_ReleasePDB.7z
+    3670ac5cf20ea76e93fa6de8a91af5a6fe7a8de5 wxMSW-3.0.1_vc110_x64_ReleasePDB.7z
-    98ac8e4163d972610267fa8e070adb9b5b4e1f13  wxMSW-3.0.2_vc110_x86_ReleaseDLL.msi
+    2613d7c676ef35b4e08e32c6bf34f13083ac6e5b wxMSW-3.0.1_vc110_x86_ReleaseDLL.msi
-    87bee27e5b15852cb81862bb5245c751a70ee9ac  wxMSW-3.0.2_vc120_Dev.7z
+    7ecd00f81661ef0d3cf19958afe14f3b3dec0618 wxMSW-3.0.1_vc120_Dev.7z
-    f1cc74b0a558af80ceac350a5777a4a54d226315  wxMSW-3.0.2_vc120_ReleaseDLL.7z
+    888c2c1eabfda5d248e14d8b56165468825558d5 wxMSW-3.0.1_vc120_ReleaseDLL.7z
-    cb4e92c6bbd4a25b7d92f8490dd85482e1d32c7d  wxMSW-3.0.2_vc120_ReleasePDB.7z
+    760567170bf5373da42b239f9774b91920ffec95 wxMSW-3.0.1_vc120_ReleasePDB.7z
-    f7c8dad92deed936faecc8b59e13a6ac1c4fd4e4  wxMSW-3.0.2_vc120_x64_Dev.7z
+    97968a620d203d4f1b4f521b91ea9ec7ad3ca50f wxMSW-3.0.1_vc120_x64_Dev.7z
-    77f2ac56edf5739ed7af261698069776cfef86d5  wxMSW-3.0.2_vc120_x64_ReleaseDLL.7z
+    0ba6d750feee3e4e3fbe79414b501aea6766ff60 wxMSW-3.0.1_vc120_x64_ReleaseDLL.7z
-    4a33022c59f484d4da6979581e0ba409c804764f  wxMSW-3.0.2_vc120_x64_ReleaseDLL.msi
+    693974bbec1d1b41c020332e17e60527eed76f7f wxMSW-3.0.1_vc120_x64_ReleaseDLL.msi
-    51e047f1576a61d5b5e019b6579b12ab4bdfb941  wxMSW-3.0.2_vc120_x64_ReleasePDB.7z
+    ad095523e1f0a13a354ec1d1512308c5b56d55b8 wxMSW-3.0.1_vc120_x64_ReleasePDB.7z
-    a31f3af0de6dd331dd0984ebaeef643f3f856aba  wxMSW-3.0.2_vc120_x86_ReleaseDLL.msi
+    5aaee8c78fb03c13dcd05656f7c46f4ec02ab625 wxMSW-3.0.1_vc120_x86_ReleaseDLL.msi
 Credit
--- a/docs/release_files.mdwn
+++ b/docs/release_files.mdwn
@@ -1,15 +1,15 @@
-wxWidgets 3.0.2
+wxWidgets 3.0.1
 ===============
 This directory contains the files containing the sources and documentation of
-wxWidgets 3.0.2 release. Please see the binaries subdirectory for the binaries
+wxWidgets 3.0.1 release. Please see the binaries subdirectory for the binaries
 for the selected platforms/compilers.
 Please notice that since the 2.9 series only a single source distribution is
 provided instead of the multiple distributions containing only the files for
-each port as was done before. So you only need to download wxWidgets-3.0.2.zip
+each port as was done before. So you only need to download wxWidgets-3.0.1.zip
 (or .7z for much smaller archive size) for Microsoft Windows systems or
-wxWidgets-3.0.2.tar.bz2 for Unix ones, including Mac OS X. The only difference
+wxWidgets-3.0.1.tar.bz2 for Unix ones, including Mac OS X. The only difference
 between these files is that the ZIP (and 7z) archives contain files with DOS
 line endings while the tar balls contain files with Unix line endings.
@@ -30,11 +30,11 @@ Check Sums
 To verify your download please use the following sha1sums:
-    8cc75cc76aca18cdfbf66283015af620b5457014  wxWidgets-3.0.2.7z
+    e0ad42932fc8e9462d0a852086a1ecc97fae3a48  wxWidgets-3.0.1.7z
-    6461eab4428c0a8b9e41781b8787510484dea800  wxWidgets-3.0.2.tar.bz2
+    73e58521d6871c9f4d1e7974c6e3a81629fddcf8  wxWidgets-3.0.1.tar.bz2
-    e9e5aeb0cabd998db737ffb0af165e7a8e02d68f  wxWidgets-3.0.2.zip
+    e88ad739f3be41ae13ff5ef6b73b5d3a2bb5ee7f  wxWidgets-3.0.1.zip
-    9db3068925a7c928062e3db59ab1aca5b0e654a9  wxWidgets-3.0.2-docs-html.tar.bz2
+    b070994dceff8e2db4263d8b0eab5b149e68e959  wxWidgets-3.0.1-docs-html.tar.bz2
-    a58c1625679d78ec20cea4542dc1382b6a7a01e8  wxWidgets-3.0.2-docs-html.zip
+    2933c60e5ceca650cc9168066bf69e96b648ee96  wxWidgets-3.0.1-docs-html.zip
-    591e706da0d2358ff392adaff706c9df2bd42a10  wxWidgets-3.0.2-docs-chm.zip
+    b13c987892392d2c204750f935efe0d1e28b8e0b  wxWidgets-3.0.1-docs-chm.zip
-    7670804d478a5b7008f5d7a82c30f0c6bfd358bf  wxWidgets-3.0.2_headers.7z
+    f6beb163df207fbfba5caa1a485a8ed5d55978ea  wxWidgets-3.0.1_headers.7z
-    ceac35caeab6a0d3bdc6715b23dde82812ed8f7f  wxMSW-3.0.2-Setup.exe
+    5bb83e64eac8a77a1e3a5157a0ff8a7ff4db4583  wxMSW-3.0.1-Setup.exe
--- a/docs/tech/tn0022.txt
+++ b/docs/tech/tn0022.txt
@@ -1,56 +1,101 @@
-Making a New wxWidgets Release
+                        Making a new wxWidgets release
-==============================
+                        ==============================
-Creating a new release requires a few things before getting started:
+Before making the release
 -------------------------
-* Linux or OSX.
+Change the version in include/wx/version.h.
 * Windows 7+ with HTML Help Workshop, and Inno Setup installed.
 * 7-Zip, Doxygen 1.8.8, and GraphViz installed on both machines.
-Unless mentioned otherwise, all steps should be run on Linux or OSX so that the
+Update docs/readme.txt. Please review its contents in addition to just
-repository export used for the release is primarily using LF line endings. Files
+changing the version number.
 that require CRLF line endings will be converted appropriately.
-*Important:* Ensure that 7-Zip, HTML Help Workshop, Doxygen, GraphViz and Inno
+Put a date on the release line in docs/changes.txt.
 Setup have all been added to your Path in Windows. You can confirm this by
 running `7z`, `hhc`, `iscc`, `doxygen -v`, and `dot -V` in a command prompt.
 Add the missing installed folder locations of any executables to your Path.
-Pre-Release Steps
+Update the date in the manual (docs/doxygen/mainpages/manual.h).
 -----------------
-* Change the version in `include/wx/version.h`.
+Update the release announcement post in docs/publicity/announce.txt.
 * Update `docs/readme.txt`. Please review its contents in addition to just
  changing the version number.
 * Put a date on the release line in `docs/changes.txt`.
 * Update the date in the manual (`docs/doxygen/mainpages/manual.h`).
 * Update the release announcement post in `docs/publicity/announce.txt`.
-Creating Release Files
+
 Creating release files
 ----------------------
-The release scripts can be run from any working directory, and they will
+The currently used release scripts need to be used from git-svn checkout and
-generate all release package files under `distrib/release/x.y.z`. The scripts
+rely on Git to avoid problems with using non-clean trees and such. If you don't
-build the release packages based on the current HEAD commit, so always
+use Git you may use the alternative archive creation scripts in the next
-ensure you have the appropriate tag or commit checked out.
+section.
-1. Run `./build/tools/release.sh x.y.z` to create source archives
+Follow these steps assuming the current working directory is the root of git
-   `wxWidgets-x.y.z.{7z,tar.bz2,zip}`, `wxWidgets-x.y.z-headers.7z`, and
+working copy and you want to prepare distribution for the version x.y.z:
   `wxWidgets-x.y.z-docs-html.{tar.bz2,zip}` packages.
-2. Copy just the `wxWidgets-x.y.z.zip` package into the same
+1. Run "./build/tools/svn-find-native-eols.pl > ../eol-native" (if you have
-   `distrib\release\x.y.z` folder on Windows.
+   an existing svn checkout, pass it to the script to make it run much faster,
   but take care to have up to date sources in the working tree).
-3. Run `build/tools/release.bat x.y.z` in a Windows command prompt.
+2. Run "./build/tools/git-make-release x.y.z" to create source archives
   ../wxWidgets-x.y.z.{7z,tar.bz2,zip} and wxWidgets_x.y.z_Headers.zip.
 3. Run "./build/tools/make-html-docs x.y.z" to create HTML documentation
   archives ../wxWidgets-x.y.z.{tar.bz2,zip}
 4. This step must be done under Windows as it relies on having hhc.exe, the
   Html Help compiler, in PATH: run the following commands
    cd docs\doxygen
    regen.bat chm
    cd out
    zip ..\..\..\wxWidgets-x.y.z-docs-chm.zip wx.chm
 5. This step also must be done under Windows as it uses Inno Setup to produce
   the .exe file and it also requires the CHM file built above:
    md x.y.z-sources
    cd x.y.z-sources
    7z x ..\wxWidgets-x.y.z.7z
    md docs\htmlhelp
    cp ..\docs\doxygen\out\wx.chm docs\htmlhelp
    set WXW_VER=x.y.z
    iscc build\tools\wxwidgets.iss
 Instructions for the previous version of release scripts
 --------------------------------------------------------
 NB: These scripts haven't been used since 2.8 series and may not work any longer!
 Currently our release system uses a Python 2.x script to generate releases.
 The script requires Unix utilities such as tar, zip and unix2dos and thus must
 be run either on Unix or using Cygwin on Windows. To generate a release, simply
 run the following command:
 build/tools/create-archive.py --compression=all /path/to/output/dir
 This will produce zip, gzip and bzip archives of the tree (without
 "compression" argument only .gz is made). Note that this commands produces huge
 amounts of output so redirecting it to a file is recommended.
 To add a prefix to the release, such as RC1, the SVN revision, or a date, just
 pass --postfix="postfix" to the script. More info on the options and their
 possible values can be found by calling `create-archive.py --help`.
 IMPORTANT NOTE: You *must* run this script from a clean source tree, that is,
          with no junk files in it or modifications. This is because the
          release should be a pristine copy of the tree as of the time of
          release. If you have legitimate modifications in the tree that need
          to be in the release, commit them first.
 To generate the windows installer (.exe) and the documentation files (chm and htb formats)
 run:
 build\tools\bld_chm_exe.bat
 which depends on the wxwidgets.iss file, and generates output in the %DAILY% directory. It 
 assumes a clean copy of the wxWidgets source tree in %INNO%. Temporary files will be generated 
 in the tree from which the batch file is run. It depends on doxygen, a number of gnu
 win32 tools and Microsofts htmlhelp compiler. The wxwidgets.iss file should not need 
 editing, but you will want to check that the bld_chm_exe.bat has the correct version number.
 4. Copy these Windows packages back to your Linux or OSX `distrib/release/x.y.z`
   directory so you can continue with the upload step with all packages
   available:
   ```
   wxMSW-x.y.z-Setup.exe
   wxWidgets-x.y.z.chm
   ```
 Uploading
 ---------
@@ -99,27 +144,21 @@ Create http://docs.wxwidgets.org/x.y.z/ (ask Bryan to do it if not done yet).
 Announcement
 ------------
-Update https://www.wxwidgets.org, usually a news item is enough but something
+Post docs/publicity/announce.txt at least to wx-announce@googlegroups.com.
 more can be called for for major releases.
-Post `docs/publicity/announce.txt` at least to wx-announce@googlegroups.com and
+Submit a link to http://www.reddit.com/r/programming
 to wx-users for the important releases.
-Submit a link to https://www.reddit.com/r/programming
+For major releases, submit the announcement to http://slashdot.org/submission
-Submit to https://isocpp.org/blog/suggest
+Update www.wxwidgets.org, usually a news item is enough but something more can
 be called for for major releases.
-For major releases, submit the announcement to https://slashdot.org/submission
+Also update downloads/index.html to mention the new latest release.
 Modify the links at downloads/index.html to point to the new release. Also
 update the release date on this page.
 Also update docs/index.html for the minor or major (i.e. not micro) releases.
 Post to wxBlog if necessary.
-Create a new post on our official Google+ page here:
+Announce on Google+/Twitter/whatever the person doing the release prefers (we
-https://plus.google.com/+wxwidgets/ (contact Bryan for access)
+don't have "official" wxWidgets account, should we?).
 Version updates
--- a/include/msvc/wx/setup.h
+++ b/include/msvc/wx/setup.h
@@ -63,8 +63,6 @@
        #define wxCOMPILER_PREFIX vc110
    #elif _MSC_VER == 1800
        #define wxCOMPILER_PREFIX vc120
    #elif _MSC_VER == 1900
        #define wxCOMPILER_PREFIX vc140
    #else
        #error "Unknown MSVC compiler version, please report to wx-dev."
    #endif
--- a/include/wx/any.h
+++ b/include/wx/any.h
@@ -164,17 +164,13 @@ private:
 public: \
    static bool IsSameClass(const wxAnyValueType* otherType) \
    { \
-        return AreSameClasses(*sm_instance.get(), *otherType); \
+        return wxTypeId(*sm_instance.get()) == wxTypeId(*otherType); \
    } \
    virtual bool IsSameType(const wxAnyValueType* otherType) const \
    { \
        return IsSameClass(otherType); \
    } \
 private: \
    static bool AreSameClasses(const wxAnyValueType& a, const wxAnyValueType& b) \
    { \
        return wxTypeId(a) == wxTypeId(b); \
    } \
    static wxAnyValueTypeScopedPtr sm_instance; \
 public: \
    static wxAnyValueType* GetInstance() \
--- a/include/wx/cmdargs.h
+++ b/include/wx/cmdargs.h
@@ -51,11 +51,9 @@ public:
        if ( !m_argsA )
        {
            const size_t count = m_args.size();
-            m_argsA = new char *[count + 1];
+            m_argsA = new char *[count];
            for ( size_t n = 0; n < count; n++ )
                m_argsA[n] = wxStrdup(m_args[n].ToAscii());
            m_argsA[count] = NULL;
        }
        return m_argsA;
@@ -66,11 +64,9 @@ public:
        if ( !m_argsW )
        {
            const size_t count = m_args.size();
-            m_argsW = new wchar_t *[count + 1];
+            m_argsW = new wchar_t *[count];
            for ( size_t n = 0; n < count; n++ )
                m_argsW[n] = wxStrdup(m_args[n].wc_str());
            m_argsW[count] = NULL;
        }
        return m_argsW;
--- a/include/wx/compiler.h
+++ b/include/wx/compiler.h
@@ -53,14 +53,7 @@
 #   define __VISUALC11__
 #elif __VISUALC__ < 1900
 #   define __VISUALC12__
 #elif __VISUALC__ < 2000
    /* There is no __VISUALC13__! */
 #   define __VISUALC14__
 #else
    /*
        Don't forget to update include/msvc/wx/setup.h as well when adding
        support for a newer MSVC version here.
     */
 #   pragma message("Please update wx/compiler.h to recognize this VC++ version")
 #endif
@@ -109,13 +102,7 @@
 #   define wxVISUALC_VERSION(major) 0
 #   define wxCHECK_VISUALC_VERSION(major) 0
 #else
-    /*
+#   define wxVISUALC_VERSION(major) ( (6 + major) * 100 )
        Things used to be simple with the _MSC_VER value and the version number
        increasing in lock step, but _MSC_VER value of 1900 is VC14 and not the
        non existing (presumably for the superstitious reasons) VC13, so we now
        need to account for this with an extra offset.
     */
 #   define wxVISUALC_VERSION(major) ( (6 + (major >= 14 ? 1 : 0) + major) * 100 )
 #   define wxCHECK_VISUALC_VERSION(major) ( __VISUALC__ >= wxVISUALC_VERSION(major) )
 #endif
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -276,19 +276,6 @@ typedef short int WXTYPE;
    #define wxEXPLICIT
 #endif /*  HAVE_EXPLICIT/!HAVE_EXPLICIT */
 /* wxFALLTHROUGH is used to notate explicit fallthroughs in switch statements */
 #ifdef __cplusplus
 #if __cplusplus >= 201103L && defined(__has_warning)
    #if WX_HAS_CLANG_FEATURE(cxx_attributes)
        #define wxFALLTHROUGH [[clang::fallthrough]]
    #endif
 #endif
 #endif /* __cplusplus */
 #ifndef wxFALLTHROUGH
    #define wxFALLTHROUGH ((void)0)
 #endif
 /* these macros are obsolete, use the standard C++ casts directly now */
 #define wx_static_cast(t, x) static_cast<t>(x)
 #define wx_const_cast(t, x) const_cast<t>(x)
@@ -370,21 +357,7 @@ typedef short int WXTYPE;
    #endif
 #endif
-/*
+#if defined(__has_include)
    Check for C++11 compilers, it is important to do it before the
    __has_include() checks because of g++ 4.9.2+ complications below.
 */
 #if (defined(__cplusplus) && __cplusplus >= 201103L) || wxCHECK_VISUALC_VERSION(10)
    #ifndef HAVE_TYPE_TRAITS
        #define HAVE_TYPE_TRAITS
    #endif
    #ifndef HAVE_STD_UNORDERED_MAP
        #define HAVE_STD_UNORDERED_MAP
    #endif
    #ifndef HAVE_STD_UNORDERED_SET
        #define HAVE_STD_UNORDERED_SET
    #endif
 #elif defined(__has_include)
    /*
        Notice that we trust our configure tests more than __has_include(),
        notably the latter can return true even if the header exists but isn't
@@ -392,20 +365,8 @@ typedef short int WXTYPE;
        So if configure already detected at least one working alternative,
        just use it.
     */
    /*
        Since 4.9.2, g++ provides __has_include() but, unlike clang, refuses to
        compile the C++11 headers in C++98 mode (and we are sure we use the
        latter because we explicitly checked for C++11 above).
     */
    #if defined(__GNUC__) && !defined(__clang__)
        #define wx_has_cpp11_include(h) 0
    #else
        #define wx_has_cpp11_include(h) __has_include(h)
    #endif
    #if !defined(HAVE_TYPE_TRAITS) && !defined(HAVE_TR1_TYPE_TRAITS)
-        #if wx_has_cpp11_include(<type_traits>)
+        #if __has_include(<type_traits>)
            #define HAVE_TYPE_TRAITS
        #elif __has_include(<tr1/type_traits>)
            #define HAVE_TR1_TYPE_TRAITS
@@ -413,7 +374,7 @@ typedef short int WXTYPE;
    #endif
    #if !defined(HAVE_STD_UNORDERED_MAP) && !defined(HAVE_TR1_UNORDERED_MAP)
-        #if wx_has_cpp11_include(<unordered_map>)
+        #if __has_include(<unordered_map>)
            #define HAVE_STD_UNORDERED_MAP
        #elif __has_include(<tr1/unordered_map>)
            #define HAVE_TR1_UNORDERED_MAP
@@ -421,7 +382,7 @@ typedef short int WXTYPE;
    #endif
    #if !defined(HAVE_STD_UNORDERED_SET) && !defined(HAVE_TR1_UNORDERED_SET)
-        #if wx_has_cpp11_include(<unordered_set>)
+        #if __has_include(<unordered_set>)
            #define HAVE_STD_UNORDERED_SET
        #elif __has_include(<tr1/unordered_set>)
            #define HAVE_TR1_UNORDERED_SET
@@ -1826,12 +1787,7 @@ enum wxBorder
 /*
 * Window (Frame/dialog/subwindow/panel item) style flags
 */
-
+#define wxVSCROLL               0x80000000
 /* The cast is needed to avoid g++ -Wnarrowing warnings when initializing
 * values of int type with wxVSCROLL on 32 bit platforms, where its value is
 * greater than INT_MAX.
 */
 #define wxVSCROLL               ((int)0x80000000)
 #define wxHSCROLL               0x40000000
 #define wxCAPTION               0x20000000
@@ -3213,22 +3169,14 @@ DECLARE_WXCOCOA_OBJC_CLASS(UIImage);
 DECLARE_WXCOCOA_OBJC_CLASS(UIEvent);
 DECLARE_WXCOCOA_OBJC_CLASS(NSSet);
 DECLARE_WXCOCOA_OBJC_CLASS(EAGLContext);
 DECLARE_WXCOCOA_OBJC_CLASS(UIWebView);
 typedef WX_UIWindow WXWindow;
 typedef WX_UIView WXWidget;
 typedef WX_EAGLContext WXGLContext;
 typedef WX_NSString* WXGLPixelFormat;
 typedef WX_UIWebView OSXWebViewPtr;
 #endif
 #if wxOSX_USE_COCOA_OR_CARBON
 DECLARE_WXCOCOA_OBJC_CLASS(WebView);
 typedef WX_WebView OSXWebViewPtr;
 #endif
 #endif /* __WXMAC__ */
 /* ABX: check __WIN32__ instead of __WXMSW__ for the same MSWBase in any Win32 port */
--- a/include/wx/dirdlg.h
+++ b/include/wx/dirdlg.h
@@ -11,8 +11,6 @@
 #ifndef _WX_DIRDLG_H_BASE_
 #define _WX_DIRDLG_H_BASE_
 #include "wx/defs.h"
 #if wxUSE_DIRDLG
 #include "wx/dialog.h"
--- a/include/wx/filefn.h
+++ b/include/wx/filefn.h
@@ -216,23 +216,9 @@ enum wxPosixPermissions
        #define wxFtell _ftelli64
    #elif wxCHECK_MINGW32_VERSION(3, 5) // mingw-runtime version (not gcc)
        #define wxHAS_HUGE_STDIO_FILES
        wxDECL_FOR_STRICT_MINGW32(int, fseeko64, (FILE*, long long, int));
        #define wxFseek fseeko64
        #ifdef wxNEEDS_STRICT_ANSI_WORKAROUNDS
            // Unfortunately ftello64() is not defined in the library for
            // whatever reason but as an inline function, so define wxFtell()
            // here similarly.
            inline long long wxFtell(FILE* fp)
            {
                fpos_t pos;
                return fgetpos(fp, &pos) == 0 ? pos : -1LL;
            }
        #else
        #define wxFtell ftello64
    #endif
    #endif
    // other Windows compilers (DMC, Watcom, and Borland) don't have huge file
    // support (or at least not all functions needed for it by wx) currently
@@ -390,7 +376,7 @@ enum wxPosixPermissions
    // finally the default char-type versions
    #if wxUSE_UNICODE
-        #if wxUSE_UNICODE_MSLU
+        #if wxUSE_UNICODE_MSLU || defined(__WX_STRICT_ANSI_GCC__)
            // implement the missing file functions in Win9x ourselves
            WXDLLIMPEXP_BASE int wxMSLU__wopen(const wxChar *name,
                                               int flags, int mode);
@@ -418,9 +404,6 @@ enum wxPosixPermissions
            #define wxCRT_MkDir     wxCRT_MkDirW
            #define wxCRT_RmDir     wxCRT_RmDirW
            #define wxCRT_Stat      wxCRT_StatW
            wxDECL_FOR_STRICT_MINGW32(int, _wmkdir, (const wchar_t*))
            wxDECL_FOR_STRICT_MINGW32(int, _wrmdir, (const wchar_t*))
        #endif // wxUSE_UNICODE_MSLU/!wxUSE_UNICODE_MSLU
    #else // !wxUSE_UNICODE
        #define wxCRT_Open      wxCRT_OpenA
--- a/include/wx/fontutil.h
+++ b/include/wx/fontutil.h
@@ -227,9 +227,6 @@ public:
    // init with the parameters of the given font
    void InitFromFont(const wxFont& font)
    {
 #if wxUSE_PANGO
        Init(*font.GetNativeFontInfo());
 #else
        // translate all font parameters
        SetStyle((wxFontStyle)font.GetStyle());
        SetWeight((wxFontWeight)font.GetWeight());
@@ -255,7 +252,6 @@ public:
        // deal with encoding now (it may override the font family and facename
        // so do it after setting them)
        SetEncoding(font.GetEncoding());
 #endif // !wxUSE_PANGO
    }
    // accessors and modifiers for the font elements
--- a/include/wx/generic/calctrlg.h
+++ b/include/wx/generic/calctrlg.h
@@ -179,7 +179,6 @@ private:
    void OnPaint(wxPaintEvent& event);
    void OnClick(wxMouseEvent& event);
    void OnDClick(wxMouseEvent& event);
    void OnWheel(wxMouseEvent& event);
    void OnChar(wxKeyEvent& event);
    void OnMonthChange(wxCommandEvent& event);
--- a/include/wx/generic/private/listctrl.h
+++ b/include/wx/generic/private/listctrl.h
@@ -863,7 +863,6 @@ private:
    DECLARE_EVENT_TABLE()
    friend class wxGenericListCtrl;
    friend class wxListCtrlMaxWidthCalculator;
 };
 #endif // wxUSE_LISTCTRL
--- a/include/wx/generic/private/widthcalc.h
+++ b/include/wx/generic/private/widthcalc.h
@@ -1,123 +0,0 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/generic/private/widthcalc.h
 // Purpose:     wxMaxWidthCalculatorBase helper class.
 // Author:      Václav Slavík, Kinaou Hervé
 // Copyright:   (c) 2015 wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 #ifndef _WX_GENERIC_PRIVATE_WIDTHCALC_H_
 #define _WX_GENERIC_PRIVATE_WIDTHCALC_H_
 #include "wx/defs.h"
 #if wxUSE_DATAVIEWCTRL || wxUSE_LISTCTRL
 #include "wx/log.h"
 #include "wx/timer.h"
 // ----------------------------------------------------------------------------
 // wxMaxWidthCalculatorBase: base class for calculating max column width
 // ----------------------------------------------------------------------------
 class wxMaxWidthCalculatorBase
 {
 public:
    // column of which calculate the width
    explicit wxMaxWidthCalculatorBase(size_t column)
        : m_column(column),
          m_width(0)
    {
    }
    void UpdateWithWidth(int width)
    {
        m_width = wxMax(m_width, width);
    }
    // Update the max with for the expected row
    virtual void UpdateWithRow(int row) = 0;
    int GetMaxWidth() const { return m_width; }
    size_t GetColumn() const { return m_column; }
    void
    ComputeBestColumnWidth(size_t count,
                           size_t first_visible,
                           size_t last_visible)
    {
        // The code below deserves some explanation. For very large controls, we
        // simply can't afford to calculate sizes for all items, it takes too
        // long. So the best we can do is to check the first and the last N/2
        // items in the control for some sufficiently large N and calculate best
        // sizes from that. That can result in the calculated best width being too
        // small for some outliers, but it's better to get slightly imperfect
        // result than to wait several seconds after every update. To avoid highly
        // visible miscalculations, we also include all currently visible items
        // no matter what.  Finally, the value of N is determined dynamically by
        // measuring how much time we spent on the determining item widths so far.
 #if wxUSE_STOPWATCH
        size_t top_part_end = count;
        static const long CALC_TIMEOUT = 20/*ms*/;
        // don't call wxStopWatch::Time() too often
        static const unsigned CALC_CHECK_FREQ = 100;
        wxStopWatch timer;
 #else
        // use some hard-coded limit, that's the best we can do without timer
        size_t top_part_end = wxMin(500, count);
 #endif // wxUSE_STOPWATCH/!wxUSE_STOPWATCH
        size_t row = 0;
        for ( row = 0; row < top_part_end; row++ )
        {
 #if wxUSE_STOPWATCH
            if ( row % CALC_CHECK_FREQ == CALC_CHECK_FREQ-1 &&
                 timer.Time() > CALC_TIMEOUT )
                break;
 #endif // wxUSE_STOPWATCH
            UpdateWithRow(row);
        }
        // row is the first unmeasured item now; that's our value of N/2
        if ( row < count )
        {
            top_part_end = row;
            // add bottom N/2 items now:
            const size_t bottom_part_start = wxMax(row, count - row);
            for ( row = bottom_part_start; row < count; row++ )
            {
                UpdateWithRow(row);
            }
            // finally, include currently visible items in the calculation:
            first_visible = wxMax(first_visible, top_part_end);
            last_visible = wxMin(bottom_part_start, last_visible);
            for ( row = first_visible; row < last_visible; row++ )
            {
                UpdateWithRow(row);
            }
            wxLogTrace("items container",
                       "determined best size from %zu top, %zu bottom "
                       "plus %zu more visible items out of %zu total",
                       top_part_end,
                       count - bottom_part_start,
                       wxMax(0, last_visible - first_visible),
                       count);
        }
    }
 private:
    const size_t m_column;
    int m_width;
    wxDECLARE_NO_COPY_CLASS(wxMaxWidthCalculatorBase);
 };
 #endif // wxUSE_DATAVIEWCTRL || wxUSE_LISTCTRL
 #endif // _WX_GENERIC_PRIVATE_WIDTHCALC_H_
--- a/include/wx/generic/propdlg.h
+++ b/include/wx/generic/propdlg.h
@@ -109,7 +109,7 @@ public:
    virtual wxWindow* GetContentWindow() const;
    // Set and get the inner sizer
-    void SetInnerSizer(wxSizer* sizer) { m_innerSizer = sizer; }
+    void SetInnerSize(wxSizer* sizer) { m_innerSizer = sizer; }
    wxSizer* GetInnerSizer() const { return m_innerSizer ; }
    // Set and get the book style
--- a/include/wx/glcanvas.h
+++ b/include/wx/glcanvas.h
@@ -48,10 +48,7 @@ enum
    WX_GL_MIN_ACCUM_BLUE,  // use blue buffer with most bits (> MIN_ACCUM_BLUE bits)
    WX_GL_MIN_ACCUM_ALPHA, // use alpha buffer with most bits (> MIN_ACCUM_ALPHA bits)
    WX_GL_SAMPLE_BUFFERS,  // 1 for multisampling support (antialiasing)
-    WX_GL_SAMPLES,         // 4 for 2x2 antialiasing supersampling on most graphics cards
+    WX_GL_SAMPLES          // 4 for 2x2 antialiasing supersampling on most graphics cards
    WX_GL_CORE_PROFILE,    // use an OpenGL core profile
    WX_GL_MAJOR_VERSION,   // major OpenGL version of the core profile
    WX_GL_MINOR_VERSION    // minor OpenGL version of the core profile
 };
 #define wxGLCanvasName wxT("GLCanvas")
--- a/include/wx/gtk/app.h
+++ b/include/wx/gtk/app.h
@@ -27,7 +27,7 @@ public:
    wxApp();
    virtual ~wxApp();
-    /* override for altering the way wxGTK initializes the GUI
+    /* override for altering the way wxGTK intializes the GUI
     * (palette/visual/colorcube). under wxMSW, OnInitGui() does nothing by
     * default. when overriding this method, the code in it is likely to be
     * platform dependent, otherwise use OnInit(). */
--- a/include/wx/gtk/dvrenderer.h
+++ b/include/wx/gtk/dvrenderer.h
@@ -34,10 +34,6 @@ public:
    virtual void EnableEllipsize(wxEllipsizeMode mode = wxELLIPSIZE_MIDDLE);
    virtual wxEllipsizeMode GetEllipsizeMode() const;
 #if wxABI_VERSION >= 30003
    virtual bool FinishEditing();
 #endif
    // GTK-specific implementation
    // ---------------------------
--- a/include/wx/gtk/fontpicker.h
+++ b/include/wx/gtk/fontpicker.h
@@ -52,7 +52,7 @@ protected:
 public:     // used by the GTK callback only
    void SetNativeFontInfo(const char *gtkdescription)
-        { m_selectedFont.SetNativeFontInfo(wxString::FromUTF8(gtkdescription)); }
+        { m_selectedFont.SetNativeFontInfo(wxString::FromAscii(gtkdescription)); }
 private:
    DECLARE_DYNAMIC_CLASS(wxFontButton)
--- a/include/wx/gtk/hyperlink.h
+++ b/include/wx/gtk/hyperlink.h
@@ -19,7 +19,6 @@
 class WXDLLIMPEXP_ADV wxHyperlinkCtrl : public wxGenericHyperlinkCtrl
 {
    typedef wxGenericHyperlinkCtrl base_type;
 public:
    // Default constructor (for two-step construction).
    wxHyperlinkCtrl() { }
@@ -36,8 +35,6 @@ public:
        (void)Create(parent, id, label, url, pos, size, style, name);
    }
    ~wxHyperlinkCtrl();
    // Creation function (for two-step construction).
    bool Create(wxWindow *parent,
                wxWindowID id,
@@ -61,9 +58,6 @@ public:
    virtual wxString GetURL() const;
    virtual void SetURL(const wxString &url);
    virtual void SetVisited(bool visited = true);
    virtual bool GetVisited() const;
    virtual void SetLabel(const wxString &label);
 protected:
--- a/include/wx/gtk/print.h
+++ b/include/wx/gtk/print.h
@@ -194,7 +194,7 @@ public:
    void SetPrintConfig( GtkPrintSettings * config );
    GtkPrintOperation* GetPrintJob() { return m_job; }
-    void SetPrintJob(GtkPrintOperation *job);
+    void SetPrintJob(GtkPrintOperation *job) { m_job = job; }
    GtkPrintContext *GetPrintContext() { return m_context; }
    void SetPrintContext(GtkPrintContext *context) {m_context = context; }
--- a/include/wx/gtk/private/gtk2-compat.h
+++ b/include/wx/gtk/private/gtk2-compat.h
@@ -193,13 +193,6 @@ static inline void wx_gtk_cell_renderer_get_padding(GtkCellRenderer* cell, gint*
 }
 #define gtk_cell_renderer_get_padding wx_gtk_cell_renderer_get_padding
 static inline void wx_gtk_cell_renderer_set_padding(GtkCellRenderer* cell, gint xpad, gint ypad)
 {
    cell->xpad = xpad;
    cell->ypad = ypad;
 }
 #define gtk_cell_renderer_set_padding wx_gtk_cell_renderer_set_padding
 static inline void wx_gtk_widget_get_allocation(GtkWidget* widget, GtkAllocation* allocation)
 {
    *allocation = widget->allocation;
@@ -524,9 +517,5 @@ static inline void wx_gtk_widget_get_preferred_size(GtkWidget* widget, GtkRequis
 }
 #define gtk_widget_get_preferred_size wx_gtk_widget_get_preferred_size
 // There is no equivalent in GTK+ 2, but it's not needed there anyhow as the
 // backend is determined at compile time in that version.
 #define GDK_IS_X11_DISPLAY(dpy) true
 #endif // !__WXGTK3__
 #endif // _WX_GTK_PRIVATE_COMPAT_H_
--- a/include/wx/gtk/private/gtk3-compat.h
+++ b/include/wx/gtk/private/gtk3-compat.h
@@ -1,35 +0,0 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        wx/gtk/private/gtk3-compat.h
 // Purpose:     Compatibility code for older GTK+ 3 versions
 // Author:      Paul Cornett
 // Created:     2015-10-10
 // Copyright:   (c) 2015 Paul Cornett
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 #ifndef _WX_GTK_PRIVATE_COMPAT3_H_
 #define _WX_GTK_PRIVATE_COMPAT3_H_
 #if defined(__WXGTK3__)
 wxGCC_WARNING_SUPPRESS(deprecated-declarations)
 // ----------------------------------------------------------------------------
 // the following were introduced in GTK+ 3.12
 static inline void wx_gtk_widget_set_margin_start(GtkWidget* widget, gint margin)
 {
    gtk_widget_set_margin_left(widget, margin);
 }
 #define gtk_widget_set_margin_start wx_gtk_widget_set_margin_start
 static inline void wx_gtk_widget_set_margin_end(GtkWidget* widget, gint margin)
 {
    gtk_widget_set_margin_right(widget, margin);
 }
 #define gtk_widget_set_margin_end wx_gtk_widget_set_margin_end
 wxGCC_WARNING_RESTORE()
 #endif // __WXGTK3__
 #endif // _WX_GTK_PRIVATE_COMPAT3_H_
--- a/include/wx/gtk/window.h
+++ b/include/wx/gtk/window.h
@@ -62,7 +62,6 @@ public:
    virtual void Lower();
    virtual bool Show( bool show = true );
    virtual bool IsShown() const;
    virtual bool IsRetained() const;
@@ -186,7 +185,6 @@ public:
    // This is called when capture is taken from the window. It will
    // fire off capture lost events.
    void GTKReleaseMouseAndNotify();
    static void GTKHandleCaptureLost();
    GdkWindow* GTKGetDrawingWindow() const;
@@ -376,7 +374,6 @@ protected:
    virtual void DoFreeze();
    virtual void DoThaw();
    void GTKConnectFreezeWidget(GtkWidget* widget);
    void GTKFreezeWidget(GtkWidget *w);
    void GTKThawWidget(GtkWidget *w);
    void GTKDisconnect(void* instance);
--- a/include/wx/gtk1/app.h
+++ b/include/wx/gtk1/app.h
@@ -32,7 +32,7 @@ public:
    wxApp();
    virtual ~wxApp();
-    /* override for altering the way wxGTK initializes the GUI
+    /* override for altering the way wxGTK intializes the GUI
     * (palette/visual/colorcube). under wxMSW, OnInitGui() does nothing by
     * default. when overriding this method, the code in it is likely to be
     * platform dependent, otherwise use OnInit(). */
--- a/include/wx/html/webkit.h
+++ b/include/wx/html/webkit.h
@@ -18,6 +18,7 @@
 #endif
 #include "wx/control.h"
 DECLARE_WXCOCOA_OBJC_CLASS(WebView); 
 // ----------------------------------------------------------------------------
 // Web Kit Control
@@ -106,7 +107,7 @@ private:
    wxString m_currentURL;
    wxString m_pageTitle;
-    OSXWebViewPtr m_webView;
+    WX_WebView m_webView;
    // we may use this later to setup our own mouse events,
    // so leave it in for now.
--- a/include/wx/listbase.h
+++ b/include/wx/listbase.h
@@ -514,17 +514,9 @@ public:
    long GetMask() const { return m_item.m_mask; }
    const wxListItem& GetItem() const { return m_item; }
    void SetKeyCode(int code) { m_code = code; }
    void SetIndex(long index) { m_itemIndex = index; }
    void SetColumn(int col) { m_col = col; }
    void SetPoint(const wxPoint& point) { m_pointDrag = point; }
    void SetItem(const wxListItem& item) { m_item = item; }
    // for wxEVT_LIST_CACHE_HINT only
    long GetCacheFrom() const { return m_oldItemIndex; }
    long GetCacheTo() const { return m_itemIndex; }
    void SetCacheFrom(long cacheFrom) { m_oldItemIndex = cacheFrom; }
    void SetCacheTo(long cacheTo) { m_itemIndex = cacheTo; }
    // was label editing canceled? (for wxEVT_LIST_END_LABEL_EDIT only)
    bool IsEditCancelled() const { return m_editCancelled; }
--- a/include/wx/log.h
+++ b/include/wx/log.h
@@ -1487,7 +1487,7 @@ WXDLLIMPEXP_BASE const wxChar* wxSysErrorMsg(unsigned long nErrCode = 0);
 #define wxDEFINE_EMPTY_LOG_FUNCTION2(level, argclass)                       \
    WX_DEFINE_VARARG_FUNC_NOP(wxLog##level, 2, (argclass, const wxFormatString&)) \
-    WX_WATCOM_ONLY_CODE(                                                    \
+    WX_WATCOM_OR_MINGW_ONLY_CODE(                                           \
        WX_DEFINE_VARARG_FUNC_NOP(wxLog##level, 2, (argclass, const char*)) \
        WX_DEFINE_VARARG_FUNC_NOP(wxLog##level, 2, (argclass, const wchar_t*)) \
        WX_DEFINE_VARARG_FUNC_NOP(wxLog##level, 2, (argclass, const wxCStrData&)) \
--- a/Show More
+++ b/Show More