diff --git a/build/bakefiles/version.bkl b/build/bakefiles/version.bkl index 0d7df5b70c..b8d65049b1 100644 --- a/build/bakefiles/version.bkl +++ b/build/bakefiles/version.bkl @@ -23,9 +23,9 @@ 3. Else, i.e. if there were no changes at all to API but only internal changes, change C:R:A to C:R+1:A --> - 5 + 6 0 - 5 + 0 diff --git a/build/script/win_docs.bat b/build/script/win_docs.bat index e544c3081b..9c2bd20a00 100644 --- a/build/script/win_docs.bat +++ b/build/script/win_docs.bat @@ -1,5 +1,5 @@ rem Uncomment the next line to set the version; used also in wxWidgets.iss -SET WXW_VER=2.8.9 +SET WXW_VER=2.8.10-rc1 if (%WXW_VER%)==() SET WXW_VER=CVS diff --git a/configure b/configure index a8503f7618..bd6f362d67 100755 --- a/configure +++ b/configure @@ -1,7 +1,7 @@ #! /bin/sh # From configure.in Id: configure.in 55211 2008-08-23 18:30:30Z VZ . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for wxWidgets 2.8.8. +# Generated by GNU Autoconf 2.59 for wxWidgets 2.8.10. # # Report bugs to . # @@ -270,8 +270,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='wxWidgets' PACKAGE_TARNAME='wxwidgets' -PACKAGE_VERSION='2.8.9' -PACKAGE_STRING='wxWidgets 2.8.9' +PACKAGE_VERSION='2.8.10' +PACKAGE_STRING='wxWidgets 2.8.10' PACKAGE_BUGREPORT='wx-dev@lists.wxwidgets.org' ac_unique_file="wx-config.in" @@ -866,7 +866,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 2.8.9 to adapt to many kinds of systems. +\`configure' configures wxWidgets 2.8.10 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -932,7 +932,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of wxWidgets 2.8.9:";; + short | recursive ) echo "Configuration of wxWidgets 2.8.10:";; esac cat <<\_ACEOF @@ -1338,7 +1338,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -wxWidgets configure 2.8.9 +wxWidgets configure 2.8.10 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1352,7 +1352,7 @@ cat >&5 <<_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 2.8.9, which was +It was created by wxWidgets $as_me 2.8.10, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1803,8 +1803,8 @@ test -n "$target_alias" && wx_major_version_number=2 wx_minor_version_number=8 -wx_release_number=9 -wx_subrelease_number=2 +wx_release_number=10 +wx_subrelease_number=0 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number WX_VERSION=$WX_RELEASE.$wx_release_number @@ -50941,7 +50941,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by wxWidgets $as_me 2.8.9, which was +This file was extended by wxWidgets $as_me 2.8.10, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -51004,7 +51004,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -wxWidgets config.status 2.8.9 +wxWidgets config.status 2.8.10 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.in b/configure.in index ef3ef77d1a..9be0ce23f8 100644 --- a/configure.in +++ b/configure.in @@ -17,7 +17,7 @@ dnl --------------------------------------------------------------------------- dnl initialization dnl --------------------------------------------------------------------------- -AC_INIT([wxWidgets], [2.8.9], [wx-dev@lists.wxwidgets.org]) +AC_INIT([wxWidgets], [2.8.10], [wx-dev@lists.wxwidgets.org]) dnl the file passed to AC_CONFIG_SRCDIR should be specific to our package AC_CONFIG_SRCDIR([wx-config.in]) @@ -34,8 +34,8 @@ dnl wx_release_number += 1 wx_major_version_number=2 wx_minor_version_number=8 -wx_release_number=9 -wx_subrelease_number=2 +wx_release_number=10 +wx_subrelease_number=0 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number WX_VERSION=$WX_RELEASE.$wx_release_number diff --git a/distrib/scripts/build-environ.cfg b/distrib/scripts/build-environ.cfg index 031c6f895d..3e104c7e65 100644 --- a/distrib/scripts/build-environ.cfg +++ b/distrib/scripts/build-environ.cfg @@ -18,7 +18,7 @@ DOCDIR=${WX_TEMP_DIR}/wxWidgets/docs/ CURDATE=`date -I` # build info -BUILD_VERSION=2.8.9 +BUILD_VERSION=2.8.10-rc1 BUILD_TAG=HEAD diff --git a/docs/latex/wx/manual.tex b/docs/latex/wx/manual.tex index 58a53c9a1b..1d78c712ae 100644 --- a/docs/latex/wx/manual.tex +++ b/docs/latex/wx/manual.tex @@ -26,13 +26,13 @@ %\special{!/@scaleunit 1 def} \parskip=10pt \parindent=0pt -\title{wxWidgets 2.8.9: A portable C++ and Python GUI toolkit} +\title{wxWidgets 2.8.10: A portable C++ and Python GUI toolkit} \winhelponly{\author{by Julian Smart et al %\winhelponly{\\$$\image{1cm;0cm}{wxwin.wmf}$$} }} \winhelpignore{\author{Julian Smart, Robert Roebling, Vadim Zeitlin, Robin Dunn, et al} -\date{August, 2008} +\date{February, 2009} } \makeindex \begin{document} diff --git a/docs/readme.txt b/docs/readme.txt index 7d1a277c4e..45d4266692 100644 --- a/docs/readme.txt +++ b/docs/readme.txt @@ -1,4 +1,4 @@ -wxWidgets 2.8.9 +wxWidgets 2.8.10 --------------------------------------------------------- Welcome to wxWidgets, a sophisticated cross-platform C++ diff --git a/docs/tech/tn0011.txt b/docs/tech/tn0011.txt index aef8e9d446..82f5e41109 100644 --- a/docs/tech/tn0011.txt +++ b/docs/tech/tn0011.txt @@ -20,7 +20,7 @@ {wx}/build/bakefiles/version.bkl {C:R:A} {wx}/build/script/win_docs.bat {windows doc and setup file} {wx}/distrib/scripts/build-environ.cfg {cvs tar and zip files} - {wx}/include/wx/mac/carbon/config_xcode.h + {wx}/include/wx/mac/carbon/config_xcode.h {out of date in 2.8.10} The script misc/scripts/inc_release can be used for incrementing the release field of the version, i.e. changing 2.8.x to 2.8.x+1. diff --git a/include/wx/mac/carbon/config_xcode.h b/include/wx/mac/carbon/config_xcode.h index aaf9ec1c8c..30599f666f 100644 --- a/include/wx/mac/carbon/config_xcode.h +++ b/include/wx/mac/carbon/config_xcode.h @@ -117,9 +117,9 @@ // #define WXWIN_OS_DESCRIPTION "Darwin 7.9.0 Power Macintosh" // #define PACKAGE_BUGREPORT "wx-dev@lists.wxwidgets.org" // #define PACKAGE_NAME "wxWidgets" -// #define PACKAGE_STRING "wxWidgets 2.8.9" +// #define PACKAGE_STRING "wxWidgets 2.8.10" // #define PACKAGE_TARNAME "wxwidgets" -// #define PACKAGE_VERSION "2.8.9" +// #define PACKAGE_VERSION "2.8.10" // for regex #define WX_NO_REGEX_ADVANCED 1 diff --git a/include/wx/version.h b/include/wx/version.h index d8b8fc3729..075725ad91 100644 --- a/include/wx/version.h +++ b/include/wx/version.h @@ -28,9 +28,9 @@ /* NB: this file is parsed by automatic tools so don't change its format! */ #define wxMAJOR_VERSION 2 #define wxMINOR_VERSION 8 -#define wxRELEASE_NUMBER 9 -#define wxSUBRELEASE_NUMBER 2 -#define wxVERSION_STRING _T("wxWidgets 2.8.9") +#define wxRELEASE_NUMBER 10 +#define wxSUBRELEASE_NUMBER 0 +#define wxVERSION_STRING _T("wxWidgets 2.8.10") /* nothing to update below this line when updating the version */ /* ---------------------------------------------------------------------------- */ diff --git a/wxBase.spec b/wxBase.spec index a41e9424f7..8c387252ff 100644 --- a/wxBase.spec +++ b/wxBase.spec @@ -1,5 +1,5 @@ %define pref /usr -%define ver 2.8.9 +%define ver 2.8.10 %define ver2 2.8 %define rel 0 diff --git a/wxGTK.spec b/wxGTK.spec index 7071118ebe..6cf38f3a58 100644 --- a/wxGTK.spec +++ b/wxGTK.spec @@ -1,5 +1,5 @@ %define _prefix /usr -%define ver 2.8.9 +%define ver 2.8.10 %define ver2 2.8 %define rel 0 diff --git a/wxMGL.spec b/wxMGL.spec index d4179c2683..f87921b195 100644 --- a/wxMGL.spec +++ b/wxMGL.spec @@ -1,5 +1,5 @@ %define pref /usr -%define ver 2.8.9 +%define ver 2.8.10 %define ver2 2.8 %define rel 0 diff --git a/wxMotif.spec b/wxMotif.spec index b1d9a8b7c9..42bc538e2c 100644 --- a/wxMotif.spec +++ b/wxMotif.spec @@ -1,5 +1,5 @@ %define pref /usr -%define ver 2.8.9 +%define ver 2.8.10 %define ver2 2.8 %define rel 0 diff --git a/wxX11.spec b/wxX11.spec index 43108ff99f..6abcdded8d 100644 --- a/wxX11.spec +++ b/wxX11.spec @@ -1,5 +1,5 @@ %define pref /usr -%define ver 2.8.9 +%define ver 2.8.10 %define ver2 2.8 %define rel 0