diff --git a/Makefile.in b/Makefile.in index 7775fca6a6..9e5db5553d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -84,8 +84,8 @@ wxCFLAGS_C99 = @wxCFLAGS_C99@ DESTDIR = WX_RELEASE = 3.3 WX_RELEASE_NODOT = 33 -WX_VERSION = $(WX_RELEASE).3 -WX_VERSION_NODOT = $(WX_RELEASE_NODOT)3 +WX_VERSION = $(WX_RELEASE).4 +WX_VERSION_NODOT = $(WX_RELEASE_NODOT)4 LIBDIRNAME = $(wx_top_builddir)/lib WXREGEX_CFLAGS = -I$(wx_top_builddir)/3rdparty/pcre/src -D__WX__ \ -DHAVE_CONFIG_H -DPCRE2_CODE_UNIT_WIDTH=$(wxPCRE2_CODE_UNIT_WIDTH) \ @@ -12857,17 +12857,17 @@ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1___htmldll_library_link_LIBR_0 \ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_65 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p_65 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p_65 = --define wxNO_THREADS -@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@dll___targetsuf2 = .$(SO_SUFFIX).3 -@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@dll___targetsuf2 = .3.$(SO_SUFFIX) +@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@dll___targetsuf2 = .$(SO_SUFFIX).4 +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@dll___targetsuf2 = .4.$(SO_SUFFIX) @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).3.0.0 +@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).4.0.0 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@dll___targetsuf3 \ -@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .3.0.0.$(SO_SUFFIX) -@COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@dll___targetsuf3 = -3.$(SO_SUFFIX) +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .4.0.0.$(SO_SUFFIX) +@COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@dll___targetsuf3 = -4.$(SO_SUFFIX) @COND_USE_SOVERSION_0@dll___targetsuf3 = .$(SO_SUFFIX) -@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).3 +@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).4 @COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \ diff --git a/autoconf_inc.m4 b/autoconf_inc.m4 index 6af530025f..7c3543d798 100644 --- a/autoconf_inc.m4 +++ b/autoconf_inc.m4 @@ -626,12 +626,6 @@ dnl ### begin block 20_COND_SHARED_1[../../demos/bombs/bombs.bkl,../../demos/for COND_SHARED_1="" fi AC_SUBST(COND_SHARED_1) -dnl ### begin block 20_COND_SHARED_1_USE_GUI_1[../../tests/test.bkl] ### - COND_SHARED_1_USE_GUI_1="#" - if test "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" ; then - COND_SHARED_1_USE_GUI_1="" - fi - AC_SUBST(COND_SHARED_1_USE_GUI_1) dnl ### begin block 20_COND_SHARED_1_USE_GUI_1_USE_OPENGL_1[wx.bkl] ### COND_SHARED_1_USE_GUI_1_USE_OPENGL_1="#" if test "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" -a "x$USE_OPENGL" = "x1" ; then diff --git a/build/bakefiles/version.bkl b/build/bakefiles/version.bkl index 87384325c7..2466a4c463 100644 --- a/build/bakefiles/version.bkl +++ b/build/bakefiles/version.bkl @@ -22,7 +22,7 @@ 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 --> - 3 + 4 0 0 diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc index dabdd4f3de..b0acbf7df9 100644 --- a/build/msw/makefile.gcc +++ b/build/msw/makefile.gcc @@ -33,7 +33,7 @@ MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \ RUNTIME_LIBS="$(RUNTIME_LIBS)" WINDRES="$(WINDRES)" CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 33 -WX_VERSION_NODOT = $(WX_RELEASE_NODOT)3 +WX_VERSION_NODOT = $(WX_RELEASE_NODOT)4 COMPILER_PREFIX = gcc OBJS = \ $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) @@ -6302,7 +6302,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=3 >>$(BUILD_CFG_FILE) - @echo WXVER_RELEASE=3 >>$(BUILD_CFG_FILE) + @echo WXVER_RELEASE=4 >>$(BUILD_CFG_FILE) @echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE) @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE) @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE) diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc index 456f8eec59..43843a8fee 100644 --- a/build/msw/makefile.vc +++ b/build/msw/makefile.vc @@ -32,7 +32,7 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \ WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \ RUNTIME_LIBS="$(RUNTIME_LIBS)" WX_RELEASE_NODOT = 33 -WX_VERSION_NODOT = $(WX_RELEASE_NODOT)3 +WX_VERSION_NODOT = $(WX_RELEASE_NODOT)4 COMPILER_PREFIX = vc OBJS = \ $(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) @@ -6816,7 +6816,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=3 >>$(BUILD_CFG_FILE) - @echo WXVER_RELEASE=3 >>$(BUILD_CFG_FILE) + @echo WXVER_RELEASE=4 >>$(BUILD_CFG_FILE) @echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE) @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE) @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE) diff --git a/build/msw/wx_setup.props b/build/msw/wx_setup.props index 009bf9802d..fb4760bb54 100644 --- a/build/msw/wx_setup.props +++ b/build/msw/wx_setup.props @@ -5,7 +5,7 @@ - 333 + 334 33 msw vc diff --git a/build/osx/wxvers.xcconfig b/build/osx/wxvers.xcconfig index 7175be981e..a727a1c05d 100644 --- 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.3 -DYLIB_CURRENT_VERSION = 3.3.3 +DYLIB_CURRENT_VERSION = 3.3.4 diff --git a/build/tools/msvs/getversion.bat b/build/tools/msvs/getversion.bat index 2f93240fef..9585390a9e 100644 --- a/build/tools/msvs/getversion.bat +++ b/build/tools/msvs/getversion.bat @@ -1,3 +1,3 @@ set wxMAJOR_VERSION=3 set wxMINOR_VERSION=3 -set wxRELEASE_NUMBER=3 +set wxRELEASE_NUMBER=4 diff --git a/configure b/configure index af2e47fae8..9abf7e6137 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for wxWidgets 3.3.3. +# Generated by GNU Autoconf 2.69 for wxWidgets 3.3.4. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='wxWidgets' PACKAGE_TARNAME='wxwidgets' -PACKAGE_VERSION='3.3.3' -PACKAGE_STRING='wxWidgets 3.3.3' +PACKAGE_VERSION='3.3.4' +PACKAGE_STRING='wxWidgets 3.3.4' PACKAGE_BUGREPORT='wx-dev@googlegroups.com' PACKAGE_URL='' @@ -738,7 +738,6 @@ COND_TOOLKIT_DFB_USE_GUI_1 COND_TOOLKIT_DFB COND_TOOLKIT_COCOA COND_SHARED_1_USE_GUI_1_USE_OPENGL_1 -COND_SHARED_1_USE_GUI_1 COND_SHARED_1 COND_SHARED_0_wxUSE_ZLIB_builtin COND_SHARED_0_wxUSE_REGEX_builtin @@ -2022,7 +2021,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures wxWidgets 3.3.3 to adapt to many kinds of systems. +\`configure' configures wxWidgets 3.3.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -2092,7 +2091,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of wxWidgets 3.3.3:";; + short | recursive ) echo "Configuration of wxWidgets 3.3.4:";; esac cat <<\_ACEOF @@ -2608,7 +2607,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -wxWidgets configure 3.3.3 +wxWidgets configure 3.3.4 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -3371,7 +3370,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by wxWidgets $as_me 3.3.3, which was +It was created by wxWidgets $as_me 3.3.4, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3834,7 +3833,7 @@ fi wx_major_version_number=3 wx_minor_version_number=3 -wx_release_number=3 +wx_release_number=4 wx_subrelease_number=0 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number @@ -43483,11 +43482,6 @@ EOF COND_SHARED_1="" fi - COND_SHARED_1_USE_GUI_1="#" - if test "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" ; then - COND_SHARED_1_USE_GUI_1="" - fi - COND_SHARED_1_USE_GUI_1_USE_OPENGL_1="#" if test "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" -a "x$USE_OPENGL" = "x1" ; then COND_SHARED_1_USE_GUI_1_USE_OPENGL_1="" @@ -45046,7 +45040,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by wxWidgets $as_me 3.3.3, which was +This file was extended by wxWidgets $as_me 3.3.4, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -45112,7 +45106,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -wxWidgets config.status 3.3.3 +wxWidgets config.status 3.3.4 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 8b182a61ea..8e18ba12b1 100644 --- a/configure.ac +++ b/configure.ac @@ -13,7 +13,7 @@ dnl --------------------------------------------------------------------------- dnl initialization dnl --------------------------------------------------------------------------- -AC_INIT([wxWidgets], [3.3.3], [wx-dev@googlegroups.com]) +AC_INIT([wxWidgets], [3.3.4], [wx-dev@googlegroups.com]) dnl the file passed to AC_CONFIG_SRCDIR should be specific to our package AC_CONFIG_SRCDIR([wx-config.in]) @@ -39,7 +39,7 @@ dnl wx_release_number += 1 wx_major_version_number=3 wx_minor_version_number=3 -wx_release_number=3 +wx_release_number=4 wx_subrelease_number=0 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number diff --git a/demos/bombs/Makefile.in b/demos/bombs/Makefile.in index 817024853f..060648fda2 100644 --- a/demos/bombs/Makefile.in +++ b/demos/bombs/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib BOMBS_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/demos/forty/Makefile.in b/demos/forty/Makefile.in index cdab8bf437..2614c5b757 100644 --- a/demos/forty/Makefile.in +++ b/demos/forty/Makefile.in @@ -45,7 +45,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib FORTY_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/demos/fractal/Makefile.in b/demos/fractal/Makefile.in index 68f2b9a0c6..6b43d9d600 100644 --- a/demos/fractal/Makefile.in +++ b/demos/fractal/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib FRACTAL_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/demos/life/Makefile.in b/demos/life/Makefile.in index 29f82bac9d..7c464e3002 100644 --- a/demos/life/Makefile.in +++ b/demos/life/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib LIFE_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/demos/poem/Makefile.in b/demos/poem/Makefile.in index 1fe55e1dad..9802a13ef8 100644 --- a/demos/poem/Makefile.in +++ b/demos/poem/Makefile.in @@ -45,7 +45,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib WXPOEM_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/docs/doxygen/Doxyfile b/docs/doxygen/Doxyfile index 645501b86f..acf712da6f 100644 --- a/docs/doxygen/Doxyfile +++ b/docs/doxygen/Doxyfile @@ -6,7 +6,7 @@ DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = wxWidgets -PROJECT_NUMBER = 3.3.3 +PROJECT_NUMBER = 3.3.4 PROJECT_BRIEF = PROJECT_LOGO = logo.png PROJECT_ICON = diff --git a/docs/msw/binaries.md b/docs/msw/binaries.md index 91804c14ac..0c39ab2d14 100644 --- a/docs/msw/binaries.md +++ b/docs/msw/binaries.md @@ -17,18 +17,18 @@ Getting the files ----------------- First, you need to get the correct files. You will always need the -`wxWidgets-3.3.3-headers.7z` one but the "Dev" and the "ReleaseDLL" +`wxWidgets-3.3.4-headers.7z` one but the "Dev" and the "ReleaseDLL" files depend on your compiler: for example, for MSVS you will need -`wxMSW-3.3.3_vc14x_x64_Dev.7z` and `wxMSW-3.3.3_vc14x_x64_ReleaseDLL.7z`, but -if you are using gcc, you will need `wxMSW-3.3.3_gcc1510_x64_Dev.7z` and -`wxMSW-3.3.3_gcc1510_x64_ReleaseDLL.7z`. +`wxMSW-3.3.4_vc14x_x64_Dev.7z` and `wxMSW-3.3.4_vc14x_x64_ReleaseDLL.7z`, but +if you are using gcc, you will need `wxMSW-3.3.4_gcc1510_x64_Dev.7z` and +`wxMSW-3.3.4_gcc1510_x64_ReleaseDLL.7z`. All binaries are available at: -https://www.wxwidgets.org/downloads#v3.3.3_msw +https://www.wxwidgets.org/downloads#v3.3.4_msw Once you have the files you need, unzip all of them into the same directory, for -example `c:\wx\3.3.3`. You should have `include` and `lib` subdirectories under +example `c:\wx\3.3.4`. You should have `include` and `lib` subdirectories under this directory, as well as files such as `wxwidgets.props`. Note: To avoid hard-coding this path into your projects, define `wxwin` diff --git a/docs/readme.txt b/docs/readme.txt index d89cdf1e59..f47360ad35 100644 --- a/docs/readme.txt +++ b/docs/readme.txt @@ -1,4 +1,4 @@ -wxWidgets 3.3.3 Release Notes +wxWidgets 3.3.4 Release Notes ============================= Welcome to the latest release of wxWidgets, a free and open source @@ -16,7 +16,7 @@ more about wxWidgets at: Documentation is available online at: -* https://docs.wxwidgets.org/3.3.3/ +* https://docs.wxwidgets.org/3.3.4/ wxWidgets sources and binaries for the selected platforms are available for download from: @@ -25,9 +25,9 @@ download from: or, for a more more permanent but less convenient to use link, from -* https://github.com/wxWidgets/wxWidgets/releases/tag/v3.3.3/ +* https://github.com/wxWidgets/wxWidgets/releases/tag/v3.3.4/ -Please see https://docs.wxwidgets.org/3.3.3/overview_install.html for full +Please see https://docs.wxwidgets.org/3.3.4/overview_install.html for full installation instructions. @@ -63,7 +63,7 @@ There were also a number of bug fixes, the most important ones being: Please see the change log for the more complete list: -https://raw.githubusercontent.com/wxWidgets/wxWidgets/v3.3.3/docs/changes.txt +https://raw.githubusercontent.com/wxWidgets/wxWidgets/v3.3.4/docs/changes.txt and also see @@ -74,7 +74,7 @@ include multiple buffer overflows in different image handlers and other components. -Note that in spite of all these changes, wxWidgets 3.3.3 is almost fully +Note that in spite of all these changes, wxWidgets 3.3.4 is almost fully compatible with wxWidgets 3.2 and updating the existing applications to use it shouldn't require much effort. However please make sure to read the "INCOMPATIBLE CHANGES" section of the change log above when upgrading to be diff --git a/docs/release.md b/docs/release.md index 9582fdd16d..9fff2ee7fd 100644 --- a/docs/release.md +++ b/docs/release.md @@ -1,32 +1,32 @@ Welcome to wxWidgets, a free and open source cross-platform C++ framework for writing advanced GUI applications using native controls. -wxWidgets 3.3.3 is the fourth release in the 3.3 development branch, bringing many new features and improvements compared to the stable 3.2 branch while remaining mostly API-compatible with it. +wxWidgets 3.3.4 is the fourth release in the 3.3 development branch, bringing many new features and improvements compared to the stable 3.2 branch while remaining mostly API-compatible with it. Please note that even this is not a "stable" release, it is still considered to be suitable to be used in production, the only difference with the stable releases is that API and ABI compatibility are not guaranteed for the releases in this series. In practice, however, backwards-incompatible API changes are expected to be rare. -Please see [**README**](https://raw.githubusercontent.com/wxWidgets/wxWidgets/v3.3.3/docs/readme.txt) for more information about this release and the [change log](https://raw.githubusercontent.com/wxWidgets/wxWidgets/v3.3.3/docs/changes.txt) for more details of the changes in it. In particular, please read the "INCOMPATIBLE CHANGES" section in the change log if you are upgrading from a previous version of wxWidgets. +Please see [**README**](https://raw.githubusercontent.com/wxWidgets/wxWidgets/v3.3.4/docs/readme.txt) for more information about this release and the [change log](https://raw.githubusercontent.com/wxWidgets/wxWidgets/v3.3.4/docs/changes.txt) for more details of the changes in it. In particular, please read the "INCOMPATIBLE CHANGES" section in the change log if you are upgrading from a previous version of wxWidgets. ## Source Files and Documentation If you intend to build wxWidgets from sources (which is recommended), please do **NOT** download the files using the "Source code" links just above, which are automatically generated by GitHub and don't contain the submodules sources which are necessary for building wxWidgets. -Instead, download one of [wxWidgets-3.3.3.zip](https://github.com/wxWidgets/wxWidgets/releases/download/v3.3.3/wxWidgets-3.3.3.zip) or [wxWidgets-3.3.3.7z](https://github.com/wxWidgets/wxWidgets/releases/download/v3.3.3/wxWidgets-3.3.3.7z), for much smaller size, for Microsoft Windows systems or [wxWidgets-3.3.3.tar.bz2](https://github.com/wxWidgets/wxWidgets/releases/download/v3.3.3/wxWidgets-3.3.3.tar.bz2) for Unix ones, including macOS. These archives have exactly the same contents, but use the line endings appropriate for the corresponding platform. +Instead, download one of [wxWidgets-3.3.4.zip](https://github.com/wxWidgets/wxWidgets/releases/download/v3.3.4/wxWidgets-3.3.4.zip) or [wxWidgets-3.3.4.7z](https://github.com/wxWidgets/wxWidgets/releases/download/v3.3.4/wxWidgets-3.3.4.7z), for much smaller size, for Microsoft Windows systems or [wxWidgets-3.3.4.tar.bz2](https://github.com/wxWidgets/wxWidgets/releases/download/v3.3.4/wxWidgets-3.3.4.tar.bz2) for Unix ones, including macOS. These archives have exactly the same contents, but use the line endings appropriate for the corresponding platform. -In addition, we provide archives containing the documentation in either HTML or Microsoft CHM formats. Notice that the documentation is also [available online](https://docs.wxwidgets.org/3.3.3). +In addition, we provide archives containing the documentation in either HTML or Microsoft CHM formats. Notice that the documentation is also [available online](https://docs.wxwidgets.org/3.3.4). -Finally, Microsoft Windows users may download [Setup.exe file](https://github.com/wxWidgets/wxWidgets/releases/download/v3.3.3/wxMSW-3.3.3-Setup.exe) containing both sources and documentation, however please note that this file does _not_ contain any binaries, please see below for those. +Finally, Microsoft Windows users may download [Setup.exe file](https://github.com/wxWidgets/wxWidgets/releases/download/v3.3.4/wxMSW-3.3.4-Setup.exe) containing both sources and documentation, however please note that this file does _not_ contain any binaries, please see below for those. To verify your download please use the following SHA-1 checksums: - f23bb4c805cf733a7b8aafff7cca86a78dc46d0d wxMSW-3.3.3-Setup.exe - 2bb7b6f08cd6006b418d57d95a8fac9027e553d3 wxWidgets-3.3.3-docs-chm.zip - 8ed1c251e1828e72fc8b8c7607a54e8251bfde74 wxWidgets-3.3.3-docs-html.tar.bz2 - 526885ab4ad22195567992f3b1d128986c468eb2 wxWidgets-3.3.3-docs-html.zip - 164c0321605f42f47ef88ee3b6546782d8220a71 wxWidgets-3.3.3-headers.7z - 3ab86816d727a6d183e1f19c8831690eac220a44 wxWidgets-3.3.3.7z - 0f7cec37b22ec5719805849716254cbb2d943f59 wxWidgets-3.3.3.tar.bz2 - c72a835b2bfccf0b6c3c1cf49bdc603593a379fc wxWidgets-3.3.3.zip + f23bb4c805cf733a7b8aafff7cca86a78dc46d0d wxMSW-3.3.4-Setup.exe + 2bb7b6f08cd6006b418d57d95a8fac9027e553d3 wxWidgets-3.3.4-docs-chm.zip + 8ed1c251e1828e72fc8b8c7607a54e8251bfde74 wxWidgets-3.3.4-docs-html.tar.bz2 + 526885ab4ad22195567992f3b1d128986c468eb2 wxWidgets-3.3.4-docs-html.zip + 164c0321605f42f47ef88ee3b6546782d8220a71 wxWidgets-3.3.4-headers.7z + 3ab86816d727a6d183e1f19c8831690eac220a44 wxWidgets-3.3.4.7z + 0f7cec37b22ec5719805849716254cbb2d943f59 wxWidgets-3.3.4.tar.bz2 + c72a835b2bfccf0b6c3c1cf49bdc603593a379fc wxWidgets-3.3.4.zip ## Binaries @@ -37,34 +37,34 @@ We provide pre-built binary files for x86-64 Windows for the following compilers ### For Developers -For developing applications with wxWidgets you need to download the compiler-independent `wxWidgets-3.3.3_Headers.7z` file and one of `wxMSW-3.3.3-vc14x_x64_Dev.7z` or `wxMSW-3.3.3_gcc1510_x64_Dev.7z` files depending on your compiler. +For developing applications with wxWidgets you need to download the compiler-independent `wxWidgets-3.3.4_Headers.7z` file and one of `wxMSW-3.3.4-vc14x_x64_Dev.7z` or `wxMSW-3.3.4_gcc1510_x64_Dev.7z` files depending on your compiler. Unpack both files into the same directory so that `include` and `lib` directories are at the same level after unpacking. You should be able to compile and link applications using wxWidgets in both debug and release modes but the debug symbols are provided only for debug libraries in this archive, see below for the release build debug symbols. Note that if you're setting up a new project using these binaries, the simplest way to do it is to use the provided `wxwidgets.props` file: for this, open the `View|Property Manager` menu item in the IDE, select "Add Existing Property Sheet..." from the project context menu and browse to this file in the file open dialog. -Please see the [instructions in the manual](https://docs.wxwidgets.org/3.3.3/plat_msw_binaries.html) for more details. +Please see the [instructions in the manual](https://docs.wxwidgets.org/3.3.4/plat_msw_binaries.html) for more details. ### For End Users -End users may download one of `wxMSW-3.3.3_vc14x_x64_ReleaseDLL.7z` or `wxMSW-3.3.3_gcc1510_x64_ReleaseDLL.7z` files to get just the DLLs required for running the applications using wxWidgets. +End users may download one of `wxMSW-3.3.4_vc14x_x64_ReleaseDLL.7z` or `wxMSW-3.3.4_gcc1510_x64_ReleaseDLL.7z` files to get just the DLLs required for running the applications using wxWidgets. ### For Debugging -* Microsoft Visual C++ users: File `wxMSW-3.3.3_vc14x_x64_ReleasePDB.7z` contains the debug symbols for the release build of the DLLs. Download it if you want to debug your own applications in release build or if you want to get meaningful information from mini-dumps retrieved from your users machines. +* Microsoft Visual C++ users: File `wxMSW-3.3.4_vc14x_x64_ReleasePDB.7z` contains the debug symbols for the release build of the DLLs. Download it if you want to debug your own applications in release build or if you want to get meaningful information from mini-dumps retrieved from your users machines. * gcc users: Currently the debug symbols are not available for the release build of the DLLs (only the debug versions of the DLLs contain the debug symbols). ### Binary File Download Verification To verify your download please use the following SHA-1 checksums: - d4d6f092b6088cd0d0716810d8e1eb10d8beb906 wxMSW-3.3.3_gcc1420UCRT_x64_Dev.7z - 3de235804320033ab3c6958d61737607af7f160a wxMSW-3.3.3_gcc1420UCRT_x64_ReleaseDLL.7z - 7058a62f85f56eaa95efc8b435fb88578bb9b827 wxMSW-3.3.3_gcc1610_x64_Dev.7z - 45becf4f8e7e5545597acb7eb45c37b9185286bf wxMSW-3.3.3_gcc1610_x64_ReleaseDLL.7z - 66cdb09b5445e609f82fdd332da094bd41dd52de wxMSW-3.3.3_vc14x_x64_Dev.7z - 94e3c79bb8adc14bf39c9969587535639ae14a29 wxMSW-3.3.3_vc14x_x64_ReleaseDLL.7z - acca573822072e08c7c8aa3d72c42b7183e8da88 wxMSW-3.3.3_vc14x_x64_ReleasePDB.7z + d4d6f092b6088cd0d0716810d8e1eb10d8beb906 wxMSW-3.3.4_gcc1420UCRT_x64_Dev.7z + 3de235804320033ab3c6958d61737607af7f160a wxMSW-3.3.4_gcc1420UCRT_x64_ReleaseDLL.7z + 7058a62f85f56eaa95efc8b435fb88578bb9b827 wxMSW-3.3.4_gcc1610_x64_Dev.7z + 45becf4f8e7e5545597acb7eb45c37b9185286bf wxMSW-3.3.4_gcc1610_x64_ReleaseDLL.7z + 66cdb09b5445e609f82fdd332da094bd41dd52de wxMSW-3.3.4_vc14x_x64_Dev.7z + 94e3c79bb8adc14bf39c9969587535639ae14a29 wxMSW-3.3.4_vc14x_x64_ReleaseDLL.7z + acca573822072e08c7c8aa3d72c42b7183e8da88 wxMSW-3.3.4_vc14x_x64_ReleasePDB.7z ## Reporting Problems diff --git a/include/wx/version.h b/include/wx/version.h index c156b977bc..38585d45d7 100644 --- a/include/wx/version.h +++ b/include/wx/version.h @@ -27,9 +27,9 @@ /* NB: this file is parsed by automatic tools so don't change its format! */ #define wxMAJOR_VERSION 3 #define wxMINOR_VERSION 3 -#define wxRELEASE_NUMBER 3 +#define wxRELEASE_NUMBER 4 #define wxSUBRELEASE_NUMBER 0 -#define wxVERSION_STRING wxT("wxWidgets 3.3.3") +#define wxVERSION_STRING wxT("wxWidgets 3.3.4") /* nothing to update below this line when updating the version */ /* ---------------------------------------------------------------------------- */ diff --git a/samples/access/Makefile.in b/samples/access/Makefile.in index 89de3adc98..b332d7f1b7 100644 --- a/samples/access/Makefile.in +++ b/samples/access/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib ACCESSTEST_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/animate/Makefile.in b/samples/animate/Makefile.in index a8216d05c4..2b845565e3 100644 --- a/samples/animate/Makefile.in +++ b/samples/animate/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib ANITEST_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/artprov/Makefile.in b/samples/artprov/Makefile.in index 457687dc87..58a6bf4865 100644 --- a/samples/artprov/Makefile.in +++ b/samples/artprov/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib ARTTEST_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/aui/Makefile.in b/samples/aui/Makefile.in index 481348d874..4924f91324 100644 --- a/samples/aui/Makefile.in +++ b/samples/aui/Makefile.in @@ -45,7 +45,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib AUIDEMO_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/calendar/Makefile.in b/samples/calendar/Makefile.in index 3a02f43086..1c84479788 100644 --- a/samples/calendar/Makefile.in +++ b/samples/calendar/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib CALENDAR_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/caret/Makefile.in b/samples/caret/Makefile.in index becafbd8da..a21279def1 100644 --- a/samples/caret/Makefile.in +++ b/samples/caret/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib CARET_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/collpane/Makefile.in b/samples/collpane/Makefile.in index 95691ee2f9..bc81c8fa56 100644 --- a/samples/collpane/Makefile.in +++ b/samples/collpane/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib COLLPANE_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/combo/Makefile.in b/samples/combo/Makefile.in index 66b3572cc8..d59847bee2 100644 --- a/samples/combo/Makefile.in +++ b/samples/combo/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib COMBO_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/config/Makefile.in b/samples/config/Makefile.in index 1e2626d56e..aba834e372 100644 --- a/samples/config/Makefile.in +++ b/samples/config/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib CONFTEST_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/dataview/Makefile.in b/samples/dataview/Makefile.in index a1fab31cb8..a910b52b1c 100644 --- a/samples/dataview/Makefile.in +++ b/samples/dataview/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib DATAVIEW_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/debugrpt/Makefile.in b/samples/debugrpt/Makefile.in index e66dd37791..6acd05577c 100644 --- a/samples/debugrpt/Makefile.in +++ b/samples/debugrpt/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib DEBUGRPT_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/dialogs/Makefile.in b/samples/dialogs/Makefile.in index 65bb387fb0..8293bddb8b 100644 --- a/samples/dialogs/Makefile.in +++ b/samples/dialogs/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib DIALOGS_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/dialup/Makefile.in b/samples/dialup/Makefile.in index ca91813100..78922f20e9 100644 --- a/samples/dialup/Makefile.in +++ b/samples/dialup/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib NETTEST_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/display/Makefile.in b/samples/display/Makefile.in index e0977cf797..85b0c47a10 100644 --- a/samples/display/Makefile.in +++ b/samples/display/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib DISPLAY_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/dll/Makefile.in b/samples/dll/Makefile.in index 2f31fa2b30..ab60d98230 100644 --- a/samples/dll/Makefile.in +++ b/samples/dll/Makefile.in @@ -50,7 +50,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib MY_DLL_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/dnd/Makefile.in b/samples/dnd/Makefile.in index 45af2ef294..c116a08250 100644 --- a/samples/dnd/Makefile.in +++ b/samples/dnd/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib DND_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/docview/Makefile.in b/samples/docview/Makefile.in index aca833f0bd..cacea2061c 100644 --- a/samples/docview/Makefile.in +++ b/samples/docview/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib DOCVIEW_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/dragimag/Makefile.in b/samples/dragimag/Makefile.in index bd1bb0d8c5..90e083977f 100644 --- a/samples/dragimag/Makefile.in +++ b/samples/dragimag/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib DRAGIMAG_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/drawing/Makefile.in b/samples/drawing/Makefile.in index 689cde0b99..e15d7907a0 100644 --- a/samples/drawing/Makefile.in +++ b/samples/drawing/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib DRAWING_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/erase/Makefile.in b/samples/erase/Makefile.in index 2fbbe8be4d..66ee79266f 100644 --- a/samples/erase/Makefile.in +++ b/samples/erase/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib ERASE_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/event/Makefile.in b/samples/event/Makefile.in index 42f28516de..7b28d2750b 100644 --- a/samples/event/Makefile.in +++ b/samples/event/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib EVENT_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/except/Makefile.in b/samples/except/Makefile.in index 71c13e6bbf..9e834e4fd9 100644 --- a/samples/except/Makefile.in +++ b/samples/except/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib EXCEPT_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/exec/Makefile.in b/samples/exec/Makefile.in index 2a95ecde08..e2a5faf979 100644 --- a/samples/exec/Makefile.in +++ b/samples/exec/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib EXEC_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/font/Makefile.in b/samples/font/Makefile.in index 8a2bc98b5d..51addc0b73 100644 --- a/samples/font/Makefile.in +++ b/samples/font/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib FONT_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/fswatcher/Makefile.in b/samples/fswatcher/Makefile.in index 1334de0a4f..b3ed8c5102 100644 --- a/samples/fswatcher/Makefile.in +++ b/samples/fswatcher/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib FSWATCHER_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/grid/Makefile.in b/samples/grid/Makefile.in index 680dd12719..16b3ae2e9f 100644 --- a/samples/grid/Makefile.in +++ b/samples/grid/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib GRID_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/help/Makefile.in b/samples/help/Makefile.in index 610b339e3d..2fdfeb5da5 100644 --- a/samples/help/Makefile.in +++ b/samples/help/Makefile.in @@ -45,7 +45,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib HELP_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/htlbox/Makefile.in b/samples/htlbox/Makefile.in index 49f4f434f0..ae7f5ae7e6 100644 --- a/samples/htlbox/Makefile.in +++ b/samples/htlbox/Makefile.in @@ -45,7 +45,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib HTLBOX_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/html/about/Makefile.in b/samples/html/about/Makefile.in index fad8827178..166094589f 100644 --- a/samples/html/about/Makefile.in +++ b/samples/html/about/Makefile.in @@ -45,7 +45,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib ABOUT_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/html/help/Makefile.in b/samples/html/help/Makefile.in index 66b766538f..b0d89f7f46 100644 --- a/samples/html/help/Makefile.in +++ b/samples/html/help/Makefile.in @@ -45,7 +45,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib HTMLHELP_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/html/helpview/Makefile.in b/samples/html/helpview/Makefile.in index 471f5aedb5..d4b76a6a77 100644 --- a/samples/html/helpview/Makefile.in +++ b/samples/html/helpview/Makefile.in @@ -45,7 +45,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib HELPVIEW_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/html/printing/Makefile.in b/samples/html/printing/Makefile.in index 1642b185d6..e7200ac01c 100644 --- a/samples/html/printing/Makefile.in +++ b/samples/html/printing/Makefile.in @@ -45,7 +45,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib HTMLPRINTING_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/html/test/Makefile.in b/samples/html/test/Makefile.in index 8e1a885599..5fcb5d785b 100644 --- a/samples/html/test/Makefile.in +++ b/samples/html/test/Makefile.in @@ -45,7 +45,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib TEST_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/html/virtual/Makefile.in b/samples/html/virtual/Makefile.in index 0022dc8298..e93b9c0a0e 100644 --- a/samples/html/virtual/Makefile.in +++ b/samples/html/virtual/Makefile.in @@ -45,7 +45,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib VIRTUAL_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/html/widget/Makefile.in b/samples/html/widget/Makefile.in index a266bfe0c5..38d3d680f2 100644 --- a/samples/html/widget/Makefile.in +++ b/samples/html/widget/Makefile.in @@ -45,7 +45,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib WIDGET_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/html/zip/Makefile.in b/samples/html/zip/Makefile.in index be0a137c71..10758c0ee9 100644 --- a/samples/html/zip/Makefile.in +++ b/samples/html/zip/Makefile.in @@ -45,7 +45,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib ZIP_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/image/Makefile.in b/samples/image/Makefile.in index 7a084c0ba9..b3b76d2191 100644 --- a/samples/image/Makefile.in +++ b/samples/image/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib IMAGE_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/internat/Makefile.in b/samples/internat/Makefile.in index 50c0783105..d8f3855ff3 100644 --- a/samples/internat/Makefile.in +++ b/samples/internat/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib INTERNAT_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/ipc/Makefile.in b/samples/ipc/Makefile.in index 70bb75b2e8..4fc7ded862 100644 --- a/samples/ipc/Makefile.in +++ b/samples/ipc/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib IPCCLIENT_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/joytest/Makefile.in b/samples/joytest/Makefile.in index 3dad0094e2..2d33f0cc00 100644 --- a/samples/joytest/Makefile.in +++ b/samples/joytest/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib JOYTEST_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/keyboard/Makefile.in b/samples/keyboard/Makefile.in index ad6902ba17..85d2eaec48 100644 --- a/samples/keyboard/Makefile.in +++ b/samples/keyboard/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib KEYBOARD_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/layout/Makefile.in b/samples/layout/Makefile.in index f72007b39f..25f89ab33b 100644 --- a/samples/layout/Makefile.in +++ b/samples/layout/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib LAYOUT_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/listctrl/Makefile.in b/samples/listctrl/Makefile.in index f0a95adaed..cc9a3b9a22 100644 --- a/samples/listctrl/Makefile.in +++ b/samples/listctrl/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib LISTCTRL_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/mdi/Makefile.in b/samples/mdi/Makefile.in index d76575766f..0e33119339 100644 --- a/samples/mdi/Makefile.in +++ b/samples/mdi/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib MDI_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/mediaplayer/Makefile.in b/samples/mediaplayer/Makefile.in index c2f1329cb1..e5ed1ce05d 100644 --- a/samples/mediaplayer/Makefile.in +++ b/samples/mediaplayer/Makefile.in @@ -45,7 +45,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib MEDIAPLAYER_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/menu/Makefile.in b/samples/menu/Makefile.in index fda220f968..9213f68029 100644 --- a/samples/menu/Makefile.in +++ b/samples/menu/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib MENU_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/minimal/Info_cocoa.plist b/samples/minimal/Info_cocoa.plist index 34159e356a..34737110b6 100644 --- a/samples/minimal/Info_cocoa.plist +++ b/samples/minimal/Info_cocoa.plist @@ -7,7 +7,7 @@ CFBundleExecutable $(PRODUCT_NAME) CFBundleGetInfoString - $(PRODUCT_NAME) version 3.3.3, (c) 2005-2026 wxWidgets + $(PRODUCT_NAME) version 3.3.4, (c) 2005-2026 wxWidgets CFBundleIconFile wxmac.icns CFBundleIdentifier @@ -15,15 +15,15 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleLongVersionString - 3.3.3, (c) 2005-2026 wxWidgets + 3.3.4, (c) 2005-2026 wxWidgets CFBundleName $(PRODUCT_NAME) CFBundlePackageType $(PRODUCT_BUNDLE_PACKAGE_TYPE) CFBundleShortVersionString - 3.3.3 + 3.3.4 CFBundleVersion - 3.3.3 + 3.3.4 NSHumanReadableCopyright Copyright 2005-2026 wxWidgets NSPrincipalClass diff --git a/samples/minimal/Makefile.in b/samples/minimal/Makefile.in index 5e9493e7a7..9bde26b390 100644 --- a/samples/minimal/Makefile.in +++ b/samples/minimal/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib MINIMAL_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/nativdlg/Makefile.in b/samples/nativdlg/Makefile.in index f430f71026..ceee53028c 100644 --- a/samples/nativdlg/Makefile.in +++ b/samples/nativdlg/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib NATIVDLG_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/notebook/Makefile.in b/samples/notebook/Makefile.in index a6676b1cba..94191e2407 100644 --- a/samples/notebook/Makefile.in +++ b/samples/notebook/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib NOTEBOOK_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/oleauto/Makefile.in b/samples/oleauto/Makefile.in index 12b8321906..72566d6173 100644 --- a/samples/oleauto/Makefile.in +++ b/samples/oleauto/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib OLEAUTO_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/opengl/cube/Makefile.in b/samples/opengl/cube/Makefile.in index 6e5b0a202c..2e20b9ec0a 100644 --- a/samples/opengl/cube/Makefile.in +++ b/samples/opengl/cube/Makefile.in @@ -45,7 +45,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib CUBE_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/opengl/isosurf/Makefile.in b/samples/opengl/isosurf/Makefile.in index f19b8ec643..77bdf268d0 100644 --- a/samples/opengl/isosurf/Makefile.in +++ b/samples/opengl/isosurf/Makefile.in @@ -45,7 +45,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib ISOSURF_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/opengl/penguin/Makefile.in b/samples/opengl/penguin/Makefile.in index 05e8ee9aac..81ed189e9c 100644 --- a/samples/opengl/penguin/Makefile.in +++ b/samples/opengl/penguin/Makefile.in @@ -48,7 +48,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib PENGUIN_CFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/opengl/pyramid/Makefile.in b/samples/opengl/pyramid/Makefile.in index ccf69c3183..c1a3876673 100644 --- a/samples/opengl/pyramid/Makefile.in +++ b/samples/opengl/pyramid/Makefile.in @@ -45,7 +45,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib PYRAMID_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/ownerdrw/Makefile.in b/samples/ownerdrw/Makefile.in index dfea988959..f48502c3fb 100644 --- a/samples/ownerdrw/Makefile.in +++ b/samples/ownerdrw/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib OWNERDRW_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/popup/Makefile.in b/samples/popup/Makefile.in index 312cbfb66f..72fa75cf97 100644 --- a/samples/popup/Makefile.in +++ b/samples/popup/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib POPUP_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/power/Makefile.in b/samples/power/Makefile.in index c50e3a8aea..b3c073674f 100644 --- a/samples/power/Makefile.in +++ b/samples/power/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib POWER_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/preferences/Makefile.in b/samples/preferences/Makefile.in index 8e5060694d..a1ec55ff12 100644 --- a/samples/preferences/Makefile.in +++ b/samples/preferences/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib PREFERENCES_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/printing/Makefile.in b/samples/printing/Makefile.in index 45791d6f3a..cfd9d65ea8 100644 --- a/samples/printing/Makefile.in +++ b/samples/printing/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib PRINTING_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/propgrid/Makefile.in b/samples/propgrid/Makefile.in index bda5d95aeb..a3ee04416b 100644 --- a/samples/propgrid/Makefile.in +++ b/samples/propgrid/Makefile.in @@ -45,7 +45,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib PROPGRID_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/regtest/Makefile.in b/samples/regtest/Makefile.in index 05f2ab388b..a44ddfb9b7 100644 --- a/samples/regtest/Makefile.in +++ b/samples/regtest/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib REGTEST_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/render/Makefile.in b/samples/render/Makefile.in index 8c6511417e..6e49d8b6d3 100644 --- a/samples/render/Makefile.in +++ b/samples/render/Makefile.in @@ -53,8 +53,8 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 WX_RELEASE_NODOT = 33 -WX_VERSION = $(WX_RELEASE).3 -WX_VERSION_NODOT = $(WX_RELEASE_NODOT)3 +WX_VERSION = $(WX_RELEASE).4 +WX_VERSION_NODOT = $(WX_RELEASE_NODOT)4 LIBDIRNAME = $(wx_top_builddir)/lib PLUGINS_INST_DIR = $(libdir)/wx/$(PLUGIN_VERSION0) RENDER_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ diff --git a/samples/render/makefile.gcc b/samples/render/makefile.gcc index f25df7e8a2..9bd62bbb4f 100644 --- a/samples/render/makefile.gcc +++ b/samples/render/makefile.gcc @@ -14,7 +14,7 @@ include ../../build/msw/config.gcc CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 33 -WX_VERSION_NODOT = $(WX_RELEASE_NODOT)3 +WX_VERSION_NODOT = $(WX_RELEASE_NODOT)4 COMPILER_PREFIX = gcc OBJS = \ $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) diff --git a/samples/render/makefile.vc b/samples/render/makefile.vc index 9612be0b6d..90e621fd08 100644 --- a/samples/render/makefile.vc +++ b/samples/render/makefile.vc @@ -13,7 +13,7 @@ ### Variables: ### WX_RELEASE_NODOT = 33 -WX_VERSION_NODOT = $(WX_RELEASE_NODOT)3 +WX_VERSION_NODOT = $(WX_RELEASE_NODOT)4 COMPILER_PREFIX = vc OBJS = \ $(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) diff --git a/samples/ribbon/Makefile.in b/samples/ribbon/Makefile.in index 46254d58bf..00cff3ccbd 100644 --- a/samples/ribbon/Makefile.in +++ b/samples/ribbon/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib RIBBON_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/richtext/Makefile.in b/samples/richtext/Makefile.in index 88a0b07802..ad28476b39 100644 --- a/samples/richtext/Makefile.in +++ b/samples/richtext/Makefile.in @@ -45,7 +45,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib RICHTEXT_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/sashtest/Makefile.in b/samples/sashtest/Makefile.in index ee182c41d9..a8b266ecca 100644 --- a/samples/sashtest/Makefile.in +++ b/samples/sashtest/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib SASHTEST_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/scroll/Makefile.in b/samples/scroll/Makefile.in index 32c55ddef2..3501f5ee6a 100644 --- a/samples/scroll/Makefile.in +++ b/samples/scroll/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib SCROLL_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/shaped/Makefile.in b/samples/shaped/Makefile.in index 544b436479..8c503151c3 100644 --- a/samples/shaped/Makefile.in +++ b/samples/shaped/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib SHAPED_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/sockets/Makefile.in b/samples/sockets/Makefile.in index 4a5aa6e549..6c519ca86a 100644 --- a/samples/sockets/Makefile.in +++ b/samples/sockets/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib CLIENT_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/sound/Makefile.in b/samples/sound/Makefile.in index 7fba7d1d95..b70efe5747 100644 --- a/samples/sound/Makefile.in +++ b/samples/sound/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib SOUND_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/splash/Makefile.in b/samples/splash/Makefile.in index 78483cd8a6..e0a3408dc2 100644 --- a/samples/splash/Makefile.in +++ b/samples/splash/Makefile.in @@ -45,7 +45,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib SPLASH_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/splitter/Makefile.in b/samples/splitter/Makefile.in index ae144be38a..ad045bd254 100644 --- a/samples/splitter/Makefile.in +++ b/samples/splitter/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib SPLITTER_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/statbar/Makefile.in b/samples/statbar/Makefile.in index 2728f9a9e0..4457d328a6 100644 --- a/samples/statbar/Makefile.in +++ b/samples/statbar/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib STATBAR_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/stc/Makefile.in b/samples/stc/Makefile.in index 84d8c5afb0..e34dd1e5c7 100644 --- a/samples/stc/Makefile.in +++ b/samples/stc/Makefile.in @@ -45,7 +45,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib STCTEST_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/stylus/Makefile.in b/samples/stylus/Makefile.in index f6251e9b36..ef9b08b404 100644 --- a/samples/stylus/Makefile.in +++ b/samples/stylus/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib STYLUS_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/svg/Makefile.in b/samples/svg/Makefile.in index 818fefa0d1..66dcdd22ac 100644 --- a/samples/svg/Makefile.in +++ b/samples/svg/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib SVGTEST_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/taborder/Makefile.in b/samples/taborder/Makefile.in index 328ef279a4..893ef4bd66 100644 --- a/samples/taborder/Makefile.in +++ b/samples/taborder/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib TABORDER_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/taskbar/Makefile.in b/samples/taskbar/Makefile.in index 8228664016..e48cadf06f 100644 --- a/samples/taskbar/Makefile.in +++ b/samples/taskbar/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib TASKBAR_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/taskbarbutton/Makefile.in b/samples/taskbarbutton/Makefile.in index 3b84259252..8e940b58e5 100644 --- a/samples/taskbarbutton/Makefile.in +++ b/samples/taskbarbutton/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib TASKBARBUTTON_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ diff --git a/samples/text/Makefile.in b/samples/text/Makefile.in index d3140a4007..7f84541af7 100644 --- a/samples/text/Makefile.in +++ b/samples/text/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib TEXT_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/thread/Makefile.in b/samples/thread/Makefile.in index 085e497edf..a7b290a8bd 100644 --- a/samples/thread/Makefile.in +++ b/samples/thread/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib THREAD_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/toolbar/Makefile.in b/samples/toolbar/Makefile.in index 5154913727..3c912dddb0 100644 --- a/samples/toolbar/Makefile.in +++ b/samples/toolbar/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib TOOLBAR_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/touchtest/Makefile.in b/samples/touchtest/Makefile.in index f960d9a9ec..60bfb6af6e 100644 --- a/samples/touchtest/Makefile.in +++ b/samples/touchtest/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib TOUCHTEST_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/treectrl/Makefile.in b/samples/treectrl/Makefile.in index a2e114ed49..4cee4bc115 100644 --- a/samples/treectrl/Makefile.in +++ b/samples/treectrl/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib TREECTRL_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/treelist/Makefile.in b/samples/treelist/Makefile.in index 8fba1dc7f4..7c96f2a5ed 100644 --- a/samples/treelist/Makefile.in +++ b/samples/treelist/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib TREELIST_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/typetest/Makefile.in b/samples/typetest/Makefile.in index f25a93aa61..6c383fc560 100644 --- a/samples/typetest/Makefile.in +++ b/samples/typetest/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib TYPETEST_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/uiaction/Makefile.in b/samples/uiaction/Makefile.in index 948d860916..94e459dcb3 100644 --- a/samples/uiaction/Makefile.in +++ b/samples/uiaction/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib UIACTION_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/validate/Makefile.in b/samples/validate/Makefile.in index e07bba7578..5d3630c77f 100644 --- a/samples/validate/Makefile.in +++ b/samples/validate/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib VALIDATE_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/vscroll/Makefile.in b/samples/vscroll/Makefile.in index c58780cc91..1cf8e05858 100644 --- a/samples/vscroll/Makefile.in +++ b/samples/vscroll/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib VSTEST_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/webrequest/Makefile.in b/samples/webrequest/Makefile.in index 8600ed200d..7819b3352c 100644 --- a/samples/webrequest/Makefile.in +++ b/samples/webrequest/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib WEBREQUEST_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/webview/Makefile.in b/samples/webview/Makefile.in index 2e9e3fb8b9..4044d69364 100644 --- a/samples/webview/Makefile.in +++ b/samples/webview/Makefile.in @@ -47,7 +47,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib WEBVIEW_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/widgets/Makefile.in b/samples/widgets/Makefile.in index 987253c587..1e3c94a9ed 100644 --- a/samples/widgets/Makefile.in +++ b/samples/widgets/Makefile.in @@ -45,7 +45,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib WIDGETS_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/wizard/Makefile.in b/samples/wizard/Makefile.in index 43d407ec35..5c6a041bd2 100644 --- a/samples/wizard/Makefile.in +++ b/samples/wizard/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib WIZARD_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/wrapsizer/Makefile.in b/samples/wrapsizer/Makefile.in index 2b43495ead..e24e5b5bdc 100644 --- a/samples/wrapsizer/Makefile.in +++ b/samples/wrapsizer/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib WRAPSIZER_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/xrc/Makefile.in b/samples/xrc/Makefile.in index e5f6676b13..9e24f8347f 100644 --- a/samples/xrc/Makefile.in +++ b/samples/xrc/Makefile.in @@ -45,7 +45,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib XRCDEMO_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/xti/Makefile.in b/samples/xti/Makefile.in index 7414f71ab9..d395a90e26 100644 --- a/samples/xti/Makefile.in +++ b/samples/xti/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib XTI_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/tests/Makefile.in b/tests/Makefile.in index 6aa09907fc..84c0d02a24 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -11,17 +11,13 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ -SHARED_LD_MODULE_CXX = @SHARED_LD_MODULE_CXX@ -SO_SUFFIX_MODULE = @SO_SUFFIX_MODULE@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -PIC_FLAG = @PIC_FLAG@ ICC_PCH_USE_SWITCH = @ICC_PCH_USE_SWITCH@ BK_DEPS = @BK_DEPS@ BK_MAKE_PCH = @BK_MAKE_PCH@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -DLLPREFIX_MODULE = @DLLPREFIX_MODULE@ LIBS = @LIBS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ @@ -53,7 +49,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib TEST_CXXFLAGS = $(__test_PCH_INC) $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ @@ -328,9 +324,6 @@ TEST_ALLHEADERS_ODEP = \ @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \ @COND_MONOLITHIC_1_USE_STC_1@ = $(__LIB_SCINTILLA_p) @COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p) -@COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p_1 \ -@COND_MONOLITHIC_1_USE_STC_1@ = $(__LIB_SCINTILLA_p) -@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p_1 = $(__LIB_LEXILLA_p) @COND_USE_GUI_1@__test_gui___depname = test_gui$(EXEEXT) @COND_PLATFORM_MACOSX_1_USE_GUI_1@__test_gui_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1_USE_GUI_1@ = test_gui.app/Contents/PkgInfo @@ -370,9 +363,9 @@ COND_MONOLITHIC_0___WXLIB_HTML_p = \ COND_MONOLITHIC_0___WXLIB_PROPGRID_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_0@__WXLIB_PROPGRID_p = $(COND_MONOLITHIC_0___WXLIB_PROPGRID_p) -@COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p_2 \ +@COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p_1 \ @COND_MONOLITHIC_1_USE_STC_1@ = $(__LIB_SCINTILLA_p) -@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p_2 = $(__LIB_LEXILLA_p) +@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p_1 = $(__LIB_LEXILLA_p) @COND_USE_GUI_1@__test_allheaders___depname = test_allheaders$(EXEEXT) @COND_PLATFORM_MACOSX_1_USE_GUI_1@__test_allheaders_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1_USE_GUI_1@ = test_allheaders.app/Contents/PkgInfo @@ -400,24 +393,24 @@ COND_MONOLITHIC_0___WXLIB_PROPGRID_p = \ @COND_ICC_PCH_1@ ./.pch/testprec_test_allheaders/testprec.h.gch @COND_USE_PCH_1@_____pch_testprec_test_allheaders_testprec_h_gch___depname \ @COND_USE_PCH_1@ = ./.pch/testprec_test_allheaders/testprec.h.gch -@COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p_3 \ +@COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p_2 \ @COND_MONOLITHIC_1_USE_STC_1@ = $(__LIB_SCINTILLA_p) -@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p_3 = $(__LIB_LEXILLA_p) +@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p_2 = $(__LIB_LEXILLA_p) COND_MONOLITHIC_0___WXLIB_XML_p = \ -lwx_base$(WXBASEPORT)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_0@__WXLIB_XML_p = $(COND_MONOLITHIC_0___WXLIB_XML_p) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_10 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_9 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_10 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_9 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_10 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_9 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_10 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_9 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_10 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_9 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_10 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_9 = --define WXUSINGDLL @COND_PLATFORM_WIN32_1@__WIN32_DPI_MANIFEST_p = \ @COND_PLATFORM_WIN32_1@ --define \ @COND_PLATFORM_WIN32_1@ wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST) @@ -503,7 +496,7 @@ test$(EXEEXT): $(TEST_OBJECTS) $(__test___win32rc) @COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/testprec_test_drawing/testprec.h.gch testprec.h $(CXX) $(TEST_DRAWING_CXXFLAGS) @COND_USE_GUI_1@test_gui$(EXEEXT): $(TEST_GUI_OBJECTS) $(__test_gui___win32rc) -@COND_USE_GUI_1@ $(CXX) -o $@ $(TEST_GUI_OBJECTS) -L$(LIBDIRNAME) $(DYLIB_RPATH_FLAG) $(LDFLAGS) $(WX_LDFLAGS) $(__WXLIB_WEBVIEW_p) $(EXTRALIBS_WEBVIEW) $(__WXLIB_STC_p) $(EXTRALIBS_STC) $(__WXLIB_AUI_p) $(__WXLIB_RICHTEXT_p) $(__WXLIB_MEDIA_p) $(EXTRALIBS_MEDIA) $(__WXLIB_XRC_p) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_PROPGRID_p) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__LIB_SCINTILLA_p) $(__LIB_LEXILLA_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p_2) $(__LIB_LEXILLA_IF_MONO_p_2) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_WEBP_p) $(__LIB_LUNASVG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) +@COND_USE_GUI_1@ $(CXX) -o $@ $(TEST_GUI_OBJECTS) -L$(LIBDIRNAME) $(DYLIB_RPATH_FLAG) $(LDFLAGS) $(WX_LDFLAGS) $(__WXLIB_WEBVIEW_p) $(EXTRALIBS_WEBVIEW) $(__WXLIB_STC_p) $(EXTRALIBS_STC) $(__WXLIB_AUI_p) $(__WXLIB_RICHTEXT_p) $(__WXLIB_MEDIA_p) $(EXTRALIBS_MEDIA) $(__WXLIB_XRC_p) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_PROPGRID_p) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__LIB_SCINTILLA_p) $(__LIB_LEXILLA_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p_1) $(__LIB_LEXILLA_IF_MONO_p_1) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_WEBP_p) $(__LIB_LUNASVG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) @COND_PLATFORM_MACOSX_1_USE_GUI_1@test_gui.app/Contents/PkgInfo: $(__test_gui___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns $(top_srcdir)/tests/horse.png $(top_srcdir)/include/wx/msw/bullseye.cur @COND_PLATFORM_MACOSX_1_USE_GUI_1@ mkdir -p test_gui.app/Contents @@ -537,7 +530,7 @@ test$(EXEEXT): $(TEST_OBJECTS) $(__test___win32rc) @COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/testprec_test_gui/testprec.h.gch testprec.h $(CXX) $(TEST_GUI_CXXFLAGS) @COND_USE_GUI_1@test_allheaders$(EXEEXT): $(TEST_ALLHEADERS_OBJECTS) $(__test_allheaders___win32rc) -@COND_USE_GUI_1@ $(CXX) -o $@ $(TEST_ALLHEADERS_OBJECTS) -L$(LIBDIRNAME) $(DYLIB_RPATH_FLAG) $(LDFLAGS) $(WX_LDFLAGS) $(__WXLIB_WEBVIEW_p) $(EXTRALIBS_WEBVIEW) $(__WXLIB_STC_p) $(EXTRALIBS_STC) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__LIB_SCINTILLA_p) $(__LIB_LEXILLA_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p_3) $(__LIB_LEXILLA_IF_MONO_p_3) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_WEBP_p) $(__LIB_LUNASVG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) +@COND_USE_GUI_1@ $(CXX) -o $@ $(TEST_ALLHEADERS_OBJECTS) -L$(LIBDIRNAME) $(DYLIB_RPATH_FLAG) $(LDFLAGS) $(WX_LDFLAGS) $(__WXLIB_WEBVIEW_p) $(EXTRALIBS_WEBVIEW) $(__WXLIB_STC_p) $(EXTRALIBS_STC) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__LIB_SCINTILLA_p) $(__LIB_LEXILLA_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p_2) $(__LIB_LEXILLA_IF_MONO_p_2) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_WEBP_p) $(__LIB_LUNASVG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) @COND_PLATFORM_MACOSX_1_USE_GUI_1@test_allheaders.app/Contents/PkgInfo: $(__test_allheaders___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1_USE_GUI_1@ mkdir -p test_allheaders.app/Contents @@ -654,7 +647,7 @@ xart-dothraki: done test_test_rc.o: $(srcdir)/../tests/test.rc $(TEST_ODEP) - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_10) $(__DEBUG_DEFINE_p_10) $(__EXCEPTIONS_DEFINE_p_10) $(__RTTI_DEFINE_p_10) $(__THREAD_DEFINE_p_10) --include-dir $(srcdir) $(__DLLFLAG_p_10) --define wxUSE_GUI=0 --include-dir $(top_srcdir)/samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_9) $(__DEBUG_DEFINE_p_9) $(__EXCEPTIONS_DEFINE_p_9) $(__RTTI_DEFINE_p_9) $(__THREAD_DEFINE_p_9) --include-dir $(srcdir) $(__DLLFLAG_p_9) --define wxUSE_GUI=0 --include-dir $(top_srcdir)/samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include test_test.o: $(srcdir)/test.cpp $(TEST_ODEP) $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/test.cpp @@ -915,7 +908,7 @@ test_xmltest.o: $(srcdir)/xml/xmltest.cpp $(TEST_ODEP) $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/xml/xmltest.cpp test_drawing_test_rc.o: $(srcdir)/../tests/test.rc $(TEST_DRAWING_ODEP) - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_10) $(__DEBUG_DEFINE_p_10) $(__EXCEPTIONS_DEFINE_p_10) $(__RTTI_DEFINE_p_10) $(__THREAD_DEFINE_p_10) --include-dir $(srcdir) $(__DLLFLAG_p_10) --define wxUSE_GUI=0 --include-dir $(top_srcdir)/samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_9) $(__DEBUG_DEFINE_p_9) $(__EXCEPTIONS_DEFINE_p_9) $(__RTTI_DEFINE_p_9) $(__THREAD_DEFINE_p_9) --include-dir $(srcdir) $(__DLLFLAG_p_9) --define wxUSE_GUI=0 --include-dir $(top_srcdir)/samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include test_drawing_test.o: $(srcdir)/test.cpp $(TEST_DRAWING_ODEP) $(CXXC) -c -o $@ $(TEST_DRAWING_CXXFLAGS) $(srcdir)/test.cpp @@ -930,7 +923,7 @@ test_drawing_fonttest.o: $(srcdir)/drawing/fonttest.cpp $(TEST_DRAWING_ODEP) $(CXXC) -c -o $@ $(TEST_DRAWING_CXXFLAGS) $(srcdir)/drawing/fonttest.cpp test_gui_test_rc.o: $(srcdir)/../tests/test.rc $(TEST_GUI_ODEP) - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_10) $(__DEBUG_DEFINE_p_10) $(__EXCEPTIONS_DEFINE_p_10) $(__RTTI_DEFINE_p_10) $(__THREAD_DEFINE_p_10) --include-dir $(srcdir) $(__DLLFLAG_p_10) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include --include-dir $(top_srcdir)/samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_9) $(__DEBUG_DEFINE_p_9) $(__EXCEPTIONS_DEFINE_p_9) $(__RTTI_DEFINE_p_9) $(__THREAD_DEFINE_p_9) --include-dir $(srcdir) $(__DLLFLAG_p_9) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include --include-dir $(top_srcdir)/samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include test_gui_asserthelper.o: $(srcdir)/asserthelper.cpp $(TEST_GUI_ODEP) $(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/asserthelper.cpp @@ -1269,7 +1262,7 @@ test_gui_xrctest.o: $(srcdir)/xml/xrctest.cpp $(TEST_GUI_ODEP) $(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/xml/xrctest.cpp test_allheaders_test_rc.o: $(srcdir)/../tests/test.rc $(TEST_ALLHEADERS_ODEP) - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_10) $(__DEBUG_DEFINE_p_10) $(__EXCEPTIONS_DEFINE_p_10) $(__RTTI_DEFINE_p_10) $(__THREAD_DEFINE_p_10) --include-dir $(srcdir) $(__DLLFLAG_p_10) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include --include-dir $(top_srcdir)/samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_9) $(__DEBUG_DEFINE_p_9) $(__EXCEPTIONS_DEFINE_p_9) $(__RTTI_DEFINE_p_9) $(__THREAD_DEFINE_p_9) --include-dir $(srcdir) $(__DLLFLAG_p_9) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include --include-dir $(top_srcdir)/samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include test_allheaders_asserthelper.o: $(srcdir)/asserthelper.cpp $(TEST_ALLHEADERS_ODEP) $(CXXC) -c -o $@ $(TEST_ALLHEADERS_CXXFLAGS) $(srcdir)/asserthelper.cpp diff --git a/tests/benchmarks/Makefile.in b/tests/benchmarks/Makefile.in index 82af50e975..f9d518ec8d 100644 --- a/tests/benchmarks/Makefile.in +++ b/tests/benchmarks/Makefile.in @@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib BENCH_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/tests/makefile.gcc b/tests/makefile.gcc index f2b82ba6a6..49b4ddc6a9 100644 --- a/tests/makefile.gcc +++ b/tests/makefile.gcc @@ -227,6 +227,7 @@ TEST_GUI_OBJECTS = \ $(OBJS)\test_gui_image.o \ $(OBJS)\test_gui_imagwebp.o \ $(OBJS)\test_gui_rawbmp.o \ + $(OBJS)\test_gui_helpdata.o \ $(OBJS)\test_gui_htmlparser.o \ $(OBJS)\test_gui_htmlwindow.o \ $(OBJS)\test_gui_htmprint.o \ @@ -309,11 +310,6 @@ ifeq ($(USE_STC),1) __LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p) endif endif -ifeq ($(MONOLITHIC),1) -ifeq ($(USE_STC),1) -__LIB_LEXILLA_IF_MONO_p_1 = $(__LIB_LEXILLA_p) -endif -endif ifeq ($(USE_GUI),1) __test_gui___depname = $(OBJS)\test_gui.exe endif @@ -345,7 +341,7 @@ __WXLIB_PROPGRID_p = \ endif ifeq ($(MONOLITHIC),1) ifeq ($(USE_STC),1) -__LIB_LEXILLA_IF_MONO_p_2 = $(__LIB_LEXILLA_p) +__LIB_LEXILLA_IF_MONO_p_1 = $(__LIB_LEXILLA_p) endif endif ifeq ($(USE_GUI),1) @@ -353,7 +349,7 @@ __test_allheaders___depname = $(OBJS)\test_allheaders.exe endif ifeq ($(MONOLITHIC),1) ifeq ($(USE_STC),1) -__LIB_LEXILLA_IF_MONO_p_3 = $(__LIB_LEXILLA_p) +__LIB_LEXILLA_IF_MONO_p_2 = $(__LIB_LEXILLA_p) endif endif ifeq ($(MONOLITHIC),0) @@ -382,37 +378,37 @@ ifeq ($(WXUNIV),1) __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ endif ifeq ($(WXUNIV),1) -__WXUNIV_DEFINE_p_10 = --define __WXUNIVERSAL__ +__WXUNIV_DEFINE_p_9 = --define __WXUNIVERSAL__ endif ifeq ($(DEBUG_FLAG),0) __DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 endif ifeq ($(DEBUG_FLAG),0) -__DEBUG_DEFINE_p_10 = --define wxDEBUG_LEVEL=0 +__DEBUG_DEFINE_p_9 = --define wxDEBUG_LEVEL=0 endif ifeq ($(BUILD),release) __NDEBUG_DEFINE_p = -DNDEBUG endif ifeq ($(BUILD),release) -__NDEBUG_DEFINE_p_10 = --define NDEBUG +__NDEBUG_DEFINE_p_9 = --define NDEBUG endif ifeq ($(USE_EXCEPTIONS),0) __EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS endif ifeq ($(USE_EXCEPTIONS),0) -__EXCEPTIONS_DEFINE_p_10 = --define wxNO_EXCEPTIONS +__EXCEPTIONS_DEFINE_p_9 = --define wxNO_EXCEPTIONS endif ifeq ($(USE_RTTI),0) __RTTI_DEFINE_p = -DwxNO_RTTI endif ifeq ($(USE_RTTI),0) -__RTTI_DEFINE_p_10 = --define wxNO_RTTI +__RTTI_DEFINE_p_9 = --define wxNO_RTTI endif ifeq ($(USE_THREADS),0) __THREAD_DEFINE_p = -DwxNO_THREADS endif ifeq ($(USE_THREADS),0) -__THREAD_DEFINE_p_10 = --define wxNO_THREADS +__THREAD_DEFINE_p_9 = --define wxNO_THREADS endif ifeq ($(USE_CAIRO),1) ____CAIRO_INCLUDEDIR_FILENAMES = -I$(CAIRO_ROOT)\include\cairo @@ -424,7 +420,7 @@ ifeq ($(SHARED),1) __DLLFLAG_p = -DWXUSINGDLL endif ifeq ($(SHARED),1) -__DLLFLAG_p_10 = --define WXUSINGDLL +__DLLFLAG_p_9 = --define WXUSINGDLL endif ifeq ($(MONOLITHIC),0) ifeq ($(USE_WEBVIEW),1) @@ -542,7 +538,7 @@ ifeq ($(USE_GUI),1) $(OBJS)\test_gui.exe: $(TEST_GUI_OBJECTS) $(OBJS)\test_gui_test_rc.o $(foreach f,$(subst \,/,$(TEST_GUI_OBJECTS)),$(shell echo $f >> $(subst \,/,$@).rsp.tmp)) @move /y $@.rsp.tmp $@.rsp >nul - $(CXX) -o $@ @$@.rsp $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__WXLIB_WEBVIEW_p) $(__WXLIB_STC_p) -limm32 $(__WXLIB_AUI_p) $(__WXLIB_RICHTEXT_p) $(__WXLIB_MEDIA_p) $(__WXLIB_XRC_p) $(__WXLIB_XML_p) $(__WXLIB_HTML_p) $(__WXLIB_PROPGRID_p) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) -lwxscintilla$(WXDEBUGFLAG) $(__LIB_LEXILLA_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p_2) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_WEBP_p) $(__LIB_LUNASVG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregexu$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lgdiplus -lmsimg32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lws2_32 -lwininet -loleacc -luxtheme + $(CXX) -o $@ @$@.rsp $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__WXLIB_WEBVIEW_p) $(__WXLIB_STC_p) -limm32 $(__WXLIB_AUI_p) $(__WXLIB_RICHTEXT_p) $(__WXLIB_MEDIA_p) $(__WXLIB_XRC_p) $(__WXLIB_XML_p) $(__WXLIB_HTML_p) $(__WXLIB_PROPGRID_p) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) -lwxscintilla$(WXDEBUGFLAG) $(__LIB_LEXILLA_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p_1) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_WEBP_p) $(__LIB_LUNASVG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregexu$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lgdiplus -lmsimg32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lws2_32 -lwininet -loleacc -luxtheme @-del $@.rsp endif @@ -550,7 +546,7 @@ ifeq ($(USE_GUI),1) $(OBJS)\test_allheaders.exe: $(TEST_ALLHEADERS_OBJECTS) $(OBJS)\test_allheaders_test_rc.o $(foreach f,$(subst \,/,$(TEST_ALLHEADERS_OBJECTS)),$(shell echo $f >> $(subst \,/,$@).rsp.tmp)) @move /y $@.rsp.tmp $@.rsp >nul - $(CXX) -o $@ @$@.rsp $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__WXLIB_WEBVIEW_p) $(__WXLIB_STC_p) -limm32 $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) -lwxscintilla$(WXDEBUGFLAG) $(__LIB_LEXILLA_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p_3) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_WEBP_p) $(__LIB_LUNASVG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregexu$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lgdiplus -lmsimg32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lws2_32 -lwininet -loleacc -luxtheme + $(CXX) -o $@ @$@.rsp $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__WXLIB_WEBVIEW_p) $(__WXLIB_STC_p) -limm32 $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) -lwxscintilla$(WXDEBUGFLAG) $(__LIB_LEXILLA_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p_2) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_WEBP_p) $(__LIB_LUNASVG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregexu$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lgdiplus -lmsimg32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lws2_32 -lwininet -loleacc -luxtheme @-del $@.rsp endif @@ -583,7 +579,7 @@ xart-dothraki: for %%f in (internat.po internat.mo) do if not exist $(OBJS)\intl\xart-dothraki\%%f copy .\intl\xart-dothraki\%%f $(OBJS)\intl\xart-dothraki $(OBJS)\test_test_rc.o: ./../tests/test.rc - $(WINDRES) -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_10) $(__DEBUG_DEFINE_p_10) $(__NDEBUG_DEFINE_p_10) $(__EXCEPTIONS_DEFINE_p_10) $(__RTTI_DEFINE_p_10) $(__THREAD_DEFINE_p_10) --include-dir $(SETUPHDIR) --include-dir ./../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_10) --define wxUSE_GUI=0 --include-dir ./../samples --include-dir ./../3rdparty/catch/single_include + $(WINDRES) -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_9) $(__DEBUG_DEFINE_p_9) $(__NDEBUG_DEFINE_p_9) $(__EXCEPTIONS_DEFINE_p_9) $(__RTTI_DEFINE_p_9) $(__THREAD_DEFINE_p_9) --include-dir $(SETUPHDIR) --include-dir ./../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_9) --define wxUSE_GUI=0 --include-dir ./../samples --include-dir ./../3rdparty/catch/single_include $(OBJS)\test_dummy.o: ./dummy.cpp $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $< @@ -847,7 +843,7 @@ $(OBJS)\test_xmltest.o: ./xml/xmltest.cpp $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\test_drawing_test_rc.o: ./../tests/test.rc - $(WINDRES) -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_10) $(__DEBUG_DEFINE_p_10) $(__NDEBUG_DEFINE_p_10) $(__EXCEPTIONS_DEFINE_p_10) $(__RTTI_DEFINE_p_10) $(__THREAD_DEFINE_p_10) --include-dir $(SETUPHDIR) --include-dir ./../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_10) --define wxUSE_GUI=0 --include-dir ./../samples --include-dir ./../3rdparty/catch/single_include + $(WINDRES) -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_9) $(__DEBUG_DEFINE_p_9) $(__NDEBUG_DEFINE_p_9) $(__EXCEPTIONS_DEFINE_p_9) $(__RTTI_DEFINE_p_9) $(__THREAD_DEFINE_p_9) --include-dir $(SETUPHDIR) --include-dir ./../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_9) --define wxUSE_GUI=0 --include-dir ./../samples --include-dir ./../3rdparty/catch/single_include $(OBJS)\test_drawing_dummy.o: ./dummy.cpp $(CXX) -c -o $@ $(TEST_DRAWING_CXXFLAGS) $(CPPDEPS) $< @@ -865,7 +861,7 @@ $(OBJS)\test_drawing_fonttest.o: ./drawing/fonttest.cpp $(CXX) -c -o $@ $(TEST_DRAWING_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\test_gui_test_rc.o: ./../tests/test.rc - $(WINDRES) -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_10) $(__DEBUG_DEFINE_p_10) $(__NDEBUG_DEFINE_p_10) $(__EXCEPTIONS_DEFINE_p_10) $(__RTTI_DEFINE_p_10) $(__THREAD_DEFINE_p_10) --include-dir $(SETUPHDIR) --include-dir ./../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_10) --define wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST) --include-dir ./../samples --define NOPCH --include-dir ./../samples --include-dir ./../3rdparty/catch/single_include + $(WINDRES) -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_9) $(__DEBUG_DEFINE_p_9) $(__NDEBUG_DEFINE_p_9) $(__EXCEPTIONS_DEFINE_p_9) $(__RTTI_DEFINE_p_9) $(__THREAD_DEFINE_p_9) --include-dir $(SETUPHDIR) --include-dir ./../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_9) --define wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST) --include-dir ./../samples --define NOPCH --include-dir ./../samples --include-dir ./../3rdparty/catch/single_include $(OBJS)\test_gui_dummy.o: ./dummy.cpp $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $< @@ -1131,6 +1127,9 @@ $(OBJS)\test_gui_imagwebp.o: ./image/imagwebp.cpp $(OBJS)\test_gui_rawbmp.o: ./image/rawbmp.cpp $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\test_gui_helpdata.o: ./html/helpdata.cpp + $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\test_gui_htmlparser.o: ./html/htmlparser.cpp $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $< @@ -1204,7 +1203,7 @@ $(OBJS)\test_gui_xrctest.o: ./xml/xrctest.cpp $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\test_allheaders_test_rc.o: ./../tests/test.rc - $(WINDRES) -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_10) $(__DEBUG_DEFINE_p_10) $(__NDEBUG_DEFINE_p_10) $(__EXCEPTIONS_DEFINE_p_10) $(__RTTI_DEFINE_p_10) $(__THREAD_DEFINE_p_10) --include-dir $(SETUPHDIR) --include-dir ./../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_10) --define wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST) --include-dir ./../samples --define NOPCH --include-dir ./../samples --include-dir ./../3rdparty/catch/single_include + $(WINDRES) -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_9) $(__DEBUG_DEFINE_p_9) $(__NDEBUG_DEFINE_p_9) $(__EXCEPTIONS_DEFINE_p_9) $(__RTTI_DEFINE_p_9) $(__THREAD_DEFINE_p_9) --include-dir $(SETUPHDIR) --include-dir ./../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_9) --define wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST) --include-dir ./../samples --define NOPCH --include-dir ./../samples --include-dir ./../3rdparty/catch/single_include $(OBJS)\test_allheaders_dummy.o: ./dummy.cpp $(CXX) -c -o $@ $(TEST_ALLHEADERS_CXXFLAGS) $(CPPDEPS) $< diff --git a/tests/makefile.vc b/tests/makefile.vc index 4b427cd2cc..155aec7fd2 100644 --- a/tests/makefile.vc +++ b/tests/makefile.vc @@ -139,7 +139,7 @@ TEST_DRAWING_OBJECTS = \ $(OBJS)\test_drawing_fonttest.obj TEST_DRAWING_RESOURCES = \ $(OBJS)\test_drawing_test.res -TEST_GUI_CXXFLAGS = /M$(__RUNTIME_LIBS_59)$(__DEBUGRUNTIME) /DWIN32 \ +TEST_GUI_CXXFLAGS = /M$(__RUNTIME_LIBS_44)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) /Fd$(OBJS)\test_gui.pdb $(____DEBUGRUNTIME) \ $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \ /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \ @@ -239,6 +239,7 @@ TEST_GUI_OBJECTS = \ $(OBJS)\test_gui_image.obj \ $(OBJS)\test_gui_imagwebp.obj \ $(OBJS)\test_gui_rawbmp.obj \ + $(OBJS)\test_gui_helpdata.obj \ $(OBJS)\test_gui_htmlparser.obj \ $(OBJS)\test_gui_htmlwindow.obj \ $(OBJS)\test_gui_htmprint.obj \ @@ -265,7 +266,7 @@ TEST_GUI_OBJECTS = \ $(OBJS)\test_gui_xrctest.obj TEST_GUI_RESOURCES = \ $(OBJS)\test_gui_test.res -TEST_ALLHEADERS_CXXFLAGS = /M$(__RUNTIME_LIBS_76)$(__DEBUGRUNTIME) /DWIN32 \ +TEST_ALLHEADERS_CXXFLAGS = /M$(__RUNTIME_LIBS_61)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) /Fd$(OBJS)\test_allheaders.pdb $(____DEBUGRUNTIME) \ $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \ /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \ @@ -433,7 +434,7 @@ EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE = !endif !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_2 = $(__DEBUGRUNTIME_3) +__DEBUGINFO_2 = $(__DEBUGRUNTIME_2) !endif !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" __DEBUGINFO_2 = @@ -442,7 +443,7 @@ __DEBUGINFO_2 = __DEBUGINFO_2 = !endif !if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_2 = $(__DEBUGRUNTIME_3) +__DEBUGINFO_2 = $(__DEBUGRUNTIME_2) !endif !if "$(RUNTIME_LIBS)" == "dynamic" __RUNTIME_LIBS_10 = D @@ -457,7 +458,7 @@ __LIB_PNG_IF_MONO_p = $(__LIB_PNG_p) __test_drawing___depname = $(OBJS)\test_drawing.exe !endif !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_19 = $(__DEBUGRUNTIME_3) +__DEBUGINFO_19 = $(__DEBUGRUNTIME_2) !endif !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" __DEBUGINFO_19 = @@ -466,7 +467,7 @@ __DEBUGINFO_19 = __DEBUGINFO_19 = !endif !if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_19 = $(__DEBUGRUNTIME_3) +__DEBUGINFO_19 = $(__DEBUGRUNTIME_2) !endif !if "$(RUNTIME_LIBS)" == "dynamic" __RUNTIME_LIBS_27 = D @@ -477,47 +478,26 @@ __RUNTIME_LIBS_27 = $(__THREADSFLAG) !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p) !endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_37 = $(__DEBUGRUNTIME_3) -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_37 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_37 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_37 = $(__DEBUGRUNTIME_3) -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_45 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_45 = $(__THREADSFLAG) -!endif -!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" -__LIB_LEXILLA_IF_MONO_p_1 = $(__LIB_LEXILLA_p) -!endif !if "$(USE_GUI)" == "1" __test_gui___depname = $(OBJS)\test_gui.exe !endif !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_51 = $(__DEBUGRUNTIME_3) +__DEBUGINFO_36 = $(__DEBUGRUNTIME_2) !endif !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_51 = +__DEBUGINFO_36 = !endif !if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_51 = +__DEBUGINFO_36 = !endif !if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_51 = $(__DEBUGRUNTIME_3) +__DEBUGINFO_36 = $(__DEBUGRUNTIME_2) !endif !if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_59 = D +__RUNTIME_LIBS_44 = D !endif !if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_59 = $(__THREADSFLAG) +__RUNTIME_LIBS_44 = $(__THREADSFLAG) !endif !if "$(MONOLITHIC)" == "0" __WXLIB_AUI_p = \ @@ -544,31 +524,31 @@ __WXLIB_PROPGRID_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.lib !endif !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" -__LIB_LEXILLA_IF_MONO_p_2 = $(__LIB_LEXILLA_p) +__LIB_LEXILLA_IF_MONO_p_1 = $(__LIB_LEXILLA_p) !endif !if "$(USE_GUI)" == "1" __test_allheaders___depname = $(OBJS)\test_allheaders.exe !endif !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_68 = $(__DEBUGRUNTIME_3) +__DEBUGINFO_53 = $(__DEBUGRUNTIME_2) !endif !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_68 = +__DEBUGINFO_53 = !endif !if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_68 = +__DEBUGINFO_53 = !endif !if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_68 = $(__DEBUGRUNTIME_3) +__DEBUGINFO_53 = $(__DEBUGRUNTIME_2) !endif !if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_76 = D +__RUNTIME_LIBS_61 = D !endif !if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_76 = $(__THREADSFLAG) +__RUNTIME_LIBS_61 = $(__THREADSFLAG) !endif !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" -__LIB_LEXILLA_IF_MONO_p_3 = $(__LIB_LEXILLA_p) +__LIB_LEXILLA_IF_MONO_p_2 = $(__LIB_LEXILLA_p) !endif !if "$(MONOLITHIC)" == "0" __WXLIB_XML_p = \ @@ -587,16 +567,16 @@ __DEBUGINFO = __DEBUGINFO = /Zi !endif !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_5 = /DEBUG +__DEBUGINFO_4 = /DEBUG !endif !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_5 = +__DEBUGINFO_4 = !endif !if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_5 = +__DEBUGINFO_4 = !endif !if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_5 = /DEBUG +__DEBUGINFO_4 = /DEBUG !endif !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" ____DEBUGRUNTIME = /D_DEBUG @@ -635,16 +615,16 @@ __DEBUGRUNTIME = __DEBUGRUNTIME = d !endif !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = +__DEBUGRUNTIME_2 = !endif !if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = /opt:ref /opt:icf +__DEBUGRUNTIME_2 = /opt:ref /opt:icf !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = /opt:ref /opt:icf +__DEBUGRUNTIME_2 = /opt:ref /opt:icf !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = +__DEBUGRUNTIME_2 = !endif !if "$(BUILD)" == "debug" __OPTIMIZEFLAG = /Od @@ -677,10 +657,10 @@ __NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ __NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ !endif !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_10 = /d __NO_VC_CRTDBG__ +__NO_VC_CRTDBG_p_9 = /d __NO_VC_CRTDBG__ !endif !if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_10 = /d __NO_VC_CRTDBG__ +__NO_VC_CRTDBG_p_9 = /d __NO_VC_CRTDBG__ !endif !if "$(TARGET_CPU)" == "" __TARGET_CPU_COMPFLAG_p = /DTARGET_CPU_COMPFLAG=0 @@ -692,25 +672,25 @@ __TARGET_CPU_COMPFLAG_p = __TARGET_CPU_COMPFLAG_p = !endif !if "$(TARGET_CPU)" == "" -__TARGET_CPU_COMPFLAG_p_10 = /d TARGET_CPU_COMPFLAG=0 +__TARGET_CPU_COMPFLAG_p_9 = /d TARGET_CPU_COMPFLAG=0 !endif !if "$(TARGET_CPU)" == "" && "$(VISUALSTUDIOPLATFORM)" == "X64" -__TARGET_CPU_COMPFLAG_p_10 = +__TARGET_CPU_COMPFLAG_p_9 = !endif !if "$(TARGET_CPU)" == "" && "$(VISUALSTUDIOPLATFORM)" == "x64" -__TARGET_CPU_COMPFLAG_p_10 = +__TARGET_CPU_COMPFLAG_p_9 = !endif !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ !endif !if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_10 = /d __WXUNIVERSAL__ +__WXUNIV_DEFINE_p_9 = /d __WXUNIVERSAL__ !endif !if "$(DEBUG_FLAG)" == "0" __DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 !endif !if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_10 = /d wxDEBUG_LEVEL=0 +__DEBUG_DEFINE_p_9 = /d wxDEBUG_LEVEL=0 !endif !if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" __NDEBUG_DEFINE_p = /DNDEBUG @@ -719,28 +699,28 @@ __NDEBUG_DEFINE_p = /DNDEBUG __NDEBUG_DEFINE_p = /DNDEBUG !endif !if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__NDEBUG_DEFINE_p_10 = /d NDEBUG +__NDEBUG_DEFINE_p_9 = /d NDEBUG !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" -__NDEBUG_DEFINE_p_10 = /d NDEBUG +__NDEBUG_DEFINE_p_9 = /d NDEBUG !endif !if "$(USE_EXCEPTIONS)" == "0" __EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS !endif !if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_10 = /d wxNO_EXCEPTIONS +__EXCEPTIONS_DEFINE_p_9 = /d wxNO_EXCEPTIONS !endif !if "$(USE_RTTI)" == "0" __RTTI_DEFINE_p = /DwxNO_RTTI !endif !if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_10 = /d wxNO_RTTI +__RTTI_DEFINE_p_9 = /d wxNO_RTTI !endif !if "$(USE_THREADS)" == "0" __THREAD_DEFINE_p = /DwxNO_THREADS !endif !if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_10 = /d wxNO_THREADS +__THREAD_DEFINE_p_9 = /d wxNO_THREADS !endif !if "$(USE_CAIRO)" == "1" ____CAIRO_INCLUDEDIR_FILENAMES = /I$(CAIRO_ROOT)\include\cairo @@ -752,7 +732,7 @@ ____CAIRO_INCLUDEDIR_FILENAMES_2 = /i $(CAIRO_ROOT)\include\cairo __DLLFLAG_p = /DWXUSINGDLL !endif !if "$(SHARED)" == "1" -__DLLFLAG_p_10 = /d WXUSINGDLL +__DLLFLAG_p_9 = /d WXUSINGDLL !endif !if "$(MONOLITHIC)" == "0" && "$(USE_WEBVIEW)" == "1" __WXLIB_WEBVIEW_p = \ @@ -833,28 +813,28 @@ clean: -if exist $(OBJS)\test_allheaders.pdb del $(OBJS)\test_allheaders.pdb $(OBJS)\test.exe: $(OBJS)\test_dummy.obj $(TEST_OBJECTS) $(OBJS)\test_test.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_5) /pdb:"$(OBJS)\test.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_4) /pdb:"$(OBJS)\test.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<< $(TEST_OBJECTS) $(TEST_RESOURCES) $(__WXLIB_NET_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregexu$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib gdiplus.lib msimg32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib << !if "$(USE_GUI)" == "1" $(OBJS)\test_drawing.exe: $(OBJS)\test_drawing_dummy.obj $(TEST_DRAWING_OBJECTS) $(OBJS)\test_drawing_test.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_5) /pdb:"$(OBJS)\test_drawing.pdb" $(__DEBUGINFO_19) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_4) /pdb:"$(OBJS)\test_drawing.pdb" $(__DEBUGINFO_19) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<< $(TEST_DRAWING_OBJECTS) $(TEST_DRAWING_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_WEBP_p) $(__LIB_LUNASVG_p) wxzlib$(WXDEBUGFLAG).lib wxregexu$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib gdiplus.lib msimg32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib << !endif !if "$(USE_GUI)" == "1" $(OBJS)\test_gui.exe: $(OBJS)\test_gui_dummy.obj $(TEST_GUI_OBJECTS) $(OBJS)\test_gui_test.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_5) /pdb:"$(OBJS)\test_gui.pdb" $(__DEBUGINFO_51) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(WIN32_DPI_LINKFLAG) /SUBSYSTEM:CONSOLE $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<< - $(TEST_GUI_OBJECTS) $(TEST_GUI_RESOURCES) $(__WXLIB_WEBVIEW_p) $(__WXLIB_STC_p) imm32.lib $(__WXLIB_AUI_p) $(__WXLIB_RICHTEXT_p) $(__WXLIB_MEDIA_p) $(__WXLIB_XRC_p) $(__WXLIB_XML_p) $(__WXLIB_HTML_p) $(__WXLIB_PROPGRID_p) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) wxscintilla$(WXDEBUGFLAG).lib $(__LIB_LEXILLA_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p_2) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_WEBP_p) $(__LIB_LUNASVG_p) wxzlib$(WXDEBUGFLAG).lib wxregexu$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib gdiplus.lib msimg32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib + link /NOLOGO /OUT:$@ $(__DEBUGINFO_4) /pdb:"$(OBJS)\test_gui.pdb" $(__DEBUGINFO_36) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(WIN32_DPI_LINKFLAG) /SUBSYSTEM:CONSOLE $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<< + $(TEST_GUI_OBJECTS) $(TEST_GUI_RESOURCES) $(__WXLIB_WEBVIEW_p) $(__WXLIB_STC_p) imm32.lib $(__WXLIB_AUI_p) $(__WXLIB_RICHTEXT_p) $(__WXLIB_MEDIA_p) $(__WXLIB_XRC_p) $(__WXLIB_XML_p) $(__WXLIB_HTML_p) $(__WXLIB_PROPGRID_p) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) wxscintilla$(WXDEBUGFLAG).lib $(__LIB_LEXILLA_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p_1) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_WEBP_p) $(__LIB_LUNASVG_p) wxzlib$(WXDEBUGFLAG).lib wxregexu$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib gdiplus.lib msimg32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib << !endif !if "$(USE_GUI)" == "1" $(OBJS)\test_allheaders.exe: $(OBJS)\test_allheaders_dummy.obj $(TEST_ALLHEADERS_OBJECTS) $(OBJS)\test_allheaders_test.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_5) /pdb:"$(OBJS)\test_allheaders.pdb" $(__DEBUGINFO_68) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(WIN32_DPI_LINKFLAG) /SUBSYSTEM:CONSOLE $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<< - $(TEST_ALLHEADERS_OBJECTS) $(TEST_ALLHEADERS_RESOURCES) $(__WXLIB_WEBVIEW_p) $(__WXLIB_STC_p) imm32.lib $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) wxscintilla$(WXDEBUGFLAG).lib $(__LIB_LEXILLA_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p_3) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_WEBP_p) $(__LIB_LUNASVG_p) wxzlib$(WXDEBUGFLAG).lib wxregexu$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib gdiplus.lib msimg32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib + link /NOLOGO /OUT:$@ $(__DEBUGINFO_4) /pdb:"$(OBJS)\test_allheaders.pdb" $(__DEBUGINFO_53) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(WIN32_DPI_LINKFLAG) /SUBSYSTEM:CONSOLE $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<< + $(TEST_ALLHEADERS_OBJECTS) $(TEST_ALLHEADERS_RESOURCES) $(__WXLIB_WEBVIEW_p) $(__WXLIB_STC_p) imm32.lib $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) wxscintilla$(WXDEBUGFLAG).lib $(__LIB_LEXILLA_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p_2) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_WEBP_p) $(__LIB_LUNASVG_p) wxzlib$(WXDEBUGFLAG).lib wxregexu$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib gdiplus.lib msimg32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib << !endif @@ -887,7 +867,7 @@ xart-dothraki: for %f in (internat.po internat.mo) do if not exist $(OBJS)\intl\xart-dothraki\%f copy .\intl\xart-dothraki\%f $(OBJS)\intl\xart-dothraki $(OBJS)\test_test.res: .\..\tests\test.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_10) $(__TARGET_CPU_COMPFLAG_p_10) /d __WXMSW__ $(__WXUNIV_DEFINE_p_10) $(__DEBUG_DEFINE_p_10) $(__NDEBUG_DEFINE_p_10) $(__EXCEPTIONS_DEFINE_p_10) $(__RTTI_DEFINE_p_10) $(__THREAD_DEFINE_p_10) /i $(SETUPHDIR) /i .\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_2) /i . $(__DLLFLAG_p_10) /d _CONSOLE /d wxUSE_GUI=0 /i .\..\samples /i .\..\3rdparty\catch\single_include .\..\tests\test.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_9) $(__TARGET_CPU_COMPFLAG_p_9) /d __WXMSW__ $(__WXUNIV_DEFINE_p_9) $(__DEBUG_DEFINE_p_9) $(__NDEBUG_DEFINE_p_9) $(__EXCEPTIONS_DEFINE_p_9) $(__RTTI_DEFINE_p_9) $(__THREAD_DEFINE_p_9) /i $(SETUPHDIR) /i .\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_2) /i . $(__DLLFLAG_p_9) /d _CONSOLE /d wxUSE_GUI=0 /i .\..\samples /i .\..\3rdparty\catch\single_include .\..\tests\test.rc $(OBJS)\test_dummy.obj: .\dummy.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) /Yctestprec.h .\dummy.cpp @@ -1151,7 +1131,7 @@ $(OBJS)\test_xmltest.obj: .\xml\xmltest.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\xml\xmltest.cpp $(OBJS)\test_drawing_test.res: .\..\tests\test.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_10) $(__TARGET_CPU_COMPFLAG_p_10) /d __WXMSW__ $(__WXUNIV_DEFINE_p_10) $(__DEBUG_DEFINE_p_10) $(__NDEBUG_DEFINE_p_10) $(__EXCEPTIONS_DEFINE_p_10) $(__RTTI_DEFINE_p_10) $(__THREAD_DEFINE_p_10) /i $(SETUPHDIR) /i .\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_2) /i . $(__DLLFLAG_p_10) /d _CONSOLE /d wxUSE_GUI=0 /i .\..\samples /i .\..\3rdparty\catch\single_include .\..\tests\test.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_9) $(__TARGET_CPU_COMPFLAG_p_9) /d __WXMSW__ $(__WXUNIV_DEFINE_p_9) $(__DEBUG_DEFINE_p_9) $(__NDEBUG_DEFINE_p_9) $(__EXCEPTIONS_DEFINE_p_9) $(__RTTI_DEFINE_p_9) $(__THREAD_DEFINE_p_9) /i $(SETUPHDIR) /i .\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_2) /i . $(__DLLFLAG_p_9) /d _CONSOLE /d wxUSE_GUI=0 /i .\..\samples /i .\..\3rdparty\catch\single_include .\..\tests\test.rc $(OBJS)\test_drawing_dummy.obj: .\dummy.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_DRAWING_CXXFLAGS) /Yctestprec.h .\dummy.cpp @@ -1172,7 +1152,7 @@ $(OBJS)\test_gui_dummy.obj: .\dummy.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) /Yctestprec.h .\dummy.cpp $(OBJS)\test_gui_test.res: .\..\tests\test.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_10) $(__TARGET_CPU_COMPFLAG_p_10) /d __WXMSW__ $(__WXUNIV_DEFINE_p_10) $(__DEBUG_DEFINE_p_10) $(__NDEBUG_DEFINE_p_10) $(__EXCEPTIONS_DEFINE_p_10) $(__RTTI_DEFINE_p_10) $(__THREAD_DEFINE_p_10) /i $(SETUPHDIR) /i .\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_2) /i . $(__DLLFLAG_p_10) /i .\..\samples /d NOPCH /i .\..\samples /i .\..\3rdparty\catch\single_include /d _CONSOLE .\..\tests\test.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_9) $(__TARGET_CPU_COMPFLAG_p_9) /d __WXMSW__ $(__WXUNIV_DEFINE_p_9) $(__DEBUG_DEFINE_p_9) $(__NDEBUG_DEFINE_p_9) $(__EXCEPTIONS_DEFINE_p_9) $(__RTTI_DEFINE_p_9) $(__THREAD_DEFINE_p_9) /i $(SETUPHDIR) /i .\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_2) /i . $(__DLLFLAG_p_9) /i .\..\samples /d NOPCH /i .\..\samples /i .\..\3rdparty\catch\single_include /d _CONSOLE .\..\tests\test.rc $(OBJS)\test_gui_asserthelper.obj: .\asserthelper.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\asserthelper.cpp @@ -1435,6 +1415,9 @@ $(OBJS)\test_gui_imagwebp.obj: .\image\imagwebp.cpp $(OBJS)\test_gui_rawbmp.obj: .\image\rawbmp.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\image\rawbmp.cpp +$(OBJS)\test_gui_helpdata.obj: .\html\helpdata.cpp + $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\html\helpdata.cpp + $(OBJS)\test_gui_htmlparser.obj: .\html\htmlparser.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\html\htmlparser.cpp @@ -1511,7 +1494,7 @@ $(OBJS)\test_allheaders_dummy.obj: .\dummy.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_ALLHEADERS_CXXFLAGS) /Yctestprec.h .\dummy.cpp $(OBJS)\test_allheaders_test.res: .\..\tests\test.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_10) $(__TARGET_CPU_COMPFLAG_p_10) /d __WXMSW__ $(__WXUNIV_DEFINE_p_10) $(__DEBUG_DEFINE_p_10) $(__NDEBUG_DEFINE_p_10) $(__EXCEPTIONS_DEFINE_p_10) $(__RTTI_DEFINE_p_10) $(__THREAD_DEFINE_p_10) /i $(SETUPHDIR) /i .\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_2) /i . $(__DLLFLAG_p_10) /i .\..\samples /d NOPCH /i .\..\samples /i .\..\3rdparty\catch\single_include /d _CONSOLE .\..\tests\test.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_9) $(__TARGET_CPU_COMPFLAG_p_9) /d __WXMSW__ $(__WXUNIV_DEFINE_p_9) $(__DEBUG_DEFINE_p_9) $(__NDEBUG_DEFINE_p_9) $(__EXCEPTIONS_DEFINE_p_9) $(__RTTI_DEFINE_p_9) $(__THREAD_DEFINE_p_9) /i $(SETUPHDIR) /i .\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_2) /i . $(__DLLFLAG_p_9) /i .\..\samples /d NOPCH /i .\..\samples /i .\..\3rdparty\catch\single_include /d _CONSOLE .\..\tests\test.rc $(OBJS)\test_allheaders_asserthelper.obj: .\asserthelper.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_ALLHEADERS_CXXFLAGS) .\asserthelper.cpp diff --git a/utils/helpview/src/Makefile.in b/utils/helpview/src/Makefile.in index d123fb9503..12d5137c90 100644 --- a/utils/helpview/src/Makefile.in +++ b/utils/helpview/src/Makefile.in @@ -48,7 +48,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib HELPVIEW_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/utils/screenshotgen/src/Makefile.in b/utils/screenshotgen/src/Makefile.in index c770ab482a..a4a1636ab0 100644 --- a/utils/screenshotgen/src/Makefile.in +++ b/utils/screenshotgen/src/Makefile.in @@ -49,7 +49,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.3 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib SCREENSHOTGEN_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \