Incremented the version number to 2.9.4 everywhere.

The misc/scripts/inc_release script was used to update the versions.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70021 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/build/osx/wxvers.xcconfig b/build/osx/wxvers.xcconfig
index 28855542c7bac11557c97598d03c140d8d7d9470..b460ad2e2308bfbe7aa1e38c6f70d11955702b9a 100644 (file)
--- a/build/osx/wxvers.xcconfig
+++ b/build/osx/wxvers.xcconfig
@@ -1,4 +1,4 @@
 // update this file with new version numbers
 
 DYLIB_COMPATIBILITY_VERSION = 2.9
-DYLIB_CURRENT_VERSION = 2.9.3
+DYLIB_CURRENT_VERSION = 2.9.4

diff --git a/build/tools/bld_chm_exe.bat b/build/tools/bld_chm_exe.bat
index 4b634f9a9832fba5daafeb062b684f7b07414cec..59c70e3d60a2b073cad7980648ba013d0a502b6d 100644 (file)
--- a/build/tools/bld_chm_exe.bat
+++ b/build/tools/bld_chm_exe.bat
@@ -1,5 +1,5 @@
 rem Uncomment the next line to set the version; used also in wxWidgets.iss\r
-SET WXW_VER=2.9.3\r
+SET WXW_VER=2.9.4\r
 if (%WXW_VER%)==() SET WXW_VER=SVN\r
 \r
 echo docs building for %WXW_VER%\r

diff --git a/configure b/configure
index a986af452dd523068c0dac0d41bee293123f43fe..596bcf2519460c06511586d9442dc5ff5d3c8b54 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
 # From configure.in Id.
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for wxWidgets 2.9.3.
+# Generated by GNU Autoconf 2.61 for wxWidgets 2.9.4.
 #
 # Report bugs to <wx-dev@lists.wxwidgets.org>.
 #
@@ -575,8 +575,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='wxWidgets'
 PACKAGE_TARNAME='wxwidgets'
-PACKAGE_VERSION='2.9.3'
-PACKAGE_STRING='wxWidgets 2.9.3'
+PACKAGE_VERSION='2.9.4'
+PACKAGE_STRING='wxWidgets 2.9.4'
 PACKAGE_BUGREPORT='wx-dev@lists.wxwidgets.org'
 
 ac_unique_file="wx-config.in"
@@ -1623,7 +1623,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.9.3 to adapt to many kinds of systems.
+\`configure' configures wxWidgets 2.9.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1692,7 +1692,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of wxWidgets 2.9.3:";;
+     short | recursive ) echo "Configuration of wxWidgets 2.9.4:";;
    esac
   cat <<\_ACEOF
 
@@ -2146,7 +2146,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-wxWidgets configure 2.9.3
+wxWidgets configure 2.9.4
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -2160,7 +2160,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 2.9.3, which was
+It was created by wxWidgets $as_me 2.9.4, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -2642,7 +2642,7 @@ fi
 
 wx_major_version_number=2
 wx_minor_version_number=9
-wx_release_number=3
+wx_release_number=4
 wx_subrelease_number=0
 
 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
@@ -56254,7 +56254,7 @@ exec 6>&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 2.9.3, which was
+This file was extended by wxWidgets $as_me 2.9.4, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -56307,7 +56307,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-wxWidgets config.status 2.9.3
+wxWidgets config.status 2.9.4
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 

diff --git a/configure.in b/configure.in
index ac5b8c5a5f8e2981807f51f012c5bad0bdb43616..8c16e20472be00350b964da6cf7d246ef5c2ed10 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -17,7 +17,7 @@ dnl ---------------------------------------------------------------------------
 dnl initialization
 dnl ---------------------------------------------------------------------------
 
-AC_INIT([wxWidgets], [2.9.3], [wx-dev@lists.wxwidgets.org])
+AC_INIT([wxWidgets], [2.9.4], [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])
@@ -43,7 +43,7 @@ dnl wx_release_number += 1
 
 wx_major_version_number=2
 wx_minor_version_number=9
-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/docs/doxygen/Doxyfile_inc b/docs/doxygen/Doxyfile_inc
index 796a80d479ba028913a7891faddc724114afcf42..8e99bb77de8ea478a79cbf31e517e25ed751e12c 100644 (file)
--- a/docs/doxygen/Doxyfile_inc
+++ b/docs/doxygen/Doxyfile_inc
@@ -12,7 +12,7 @@
 
 DOXYFILE_ENCODING      = UTF-8
 PROJECT_NAME           = wxWidgets
-PROJECT_NUMBER         = 2.9.3
+PROJECT_NUMBER         = 2.9.4
 PROJECT_BRIEF          =
 PROJECT_LOGO           = logo.png
 OUTPUT_DIRECTORY       = out

diff --git a/docs/doxygen/latexdocstart.inc b/docs/doxygen/latexdocstart.inc
index 9e509b46cec8a526bfc00733ad8a18cd4e9710f7..4c6e369063a6620c4b62a68a55b405532733aaaf 100644 (file)
--- a/docs/doxygen/latexdocstart.inc
+++ b/docs/doxygen/latexdocstart.inc
@@ -49,7 +49,7 @@
 \end{center}
 \end{figure}
 \vspace*{2cm}
-{\large Version 2.9.3 }\\
+{\large Version 2.9.4 }\\
 \vspace*{1cm}
 {Generated on \today}\\
 \end{center}

diff --git a/docs/readme.txt b/docs/readme.txt
index 304c63acc1a17b2e1803c3e337cde6e1bb08d2e9..5923ca34c1cacec0a2b5ee0e2653f37694ce0148 100644 (file)
--- a/docs/readme.txt
+++ b/docs/readme.txt
@@ -1,4 +1,4 @@
-               wxWidgets 2.9.3 Release Notes
+               wxWidgets 2.9.4 Release Notes
                =============================
 
 Welcome to the latest release of wxWidgets, a free cross-platform C++
@@ -16,11 +16,11 @@ thread handling, and so on. You can learn more about wxWidgets at
 
 wxWidgets sources are available for download from
 
-        https://sourceforge.net/projects/wxwindows/files/2.9.3/
+        https://sourceforge.net/projects/wxwindows/files/2.9.4/
 
 or
 
-        ftp://ftp.wxwidgets.org/pub/2.9.3/
+        ftp://ftp.wxwidgets.org/pub/2.9.4/
 
 Please see the "Files" section below for the description of various
 files available at these locations.
@@ -29,10 +29,10 @@ files available at these locations.
 A detailed reference manual including in-depth overviews for various
 topics is supplied in various formats and can be accessed online at
 
-        http://docs.wxwidgets.org/2.9.3/
+        http://docs.wxwidgets.org/2.9.4/
 
 
-Note about naming: while 2.9.3 is called a "development" release,
+Note about naming: while 2.9.4 is called a "development" release,
 this only means that API is not guaranteed to remain unchanged in the
 subsequent 2.9.x releases (although it is still likely that it will),
 unlike in the stable 2.8.x branch. We believe the current version is
@@ -160,7 +160,7 @@ Documentation
 -------------
 
 wxWidgets documentation is available online at
-http://docs.wxwidgets.org/2.9.3/ and can also be downloaded in HTML
+http://docs.wxwidgets.org/2.9.4/ and can also be downloaded in HTML
 format. To generate documentation in other formats (PDF, CHM, ...)
 please use the scripts in docs/doxygen directory.
 

diff --git a/include/wx/osx/config_xcode.h b/include/wx/osx/config_xcode.h
index 6b12608433aaed1112997a32d49315a52cc7a5ec..67f02e7137ba3f8f99f56cc83cefa0b041c450bf 100644 (file)
--- a/include/wx/osx/config_xcode.h
+++ b/include/wx/osx/config_xcode.h
@@ -133,9 +133,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.9.3"
+#define PACKAGE_STRING "wxWidgets 2.9.4"
 #define PACKAGE_TARNAME "wxwidgets"
-#define PACKAGE_VERSION "2.9.3"
+#define PACKAGE_VERSION "2.9.4"
 
 // for regex
 #define WX_NO_REGEX_ADVANCED 1

diff --git a/include/wx/version.h b/include/wx/version.h
index 70b0da8008848ed358685f4e7c3f8c6a8f7168f9..438ce94590b1c66298f93dc7a7895814232af384 100644 (file)
--- 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      9
-#define wxRELEASE_NUMBER     3
+#define wxRELEASE_NUMBER     4
 #define wxSUBRELEASE_NUMBER  0
-#define wxVERSION_STRING   wxT("wxWidgets 2.9.3")
+#define wxVERSION_STRING   wxT("wxWidgets 2.9.4")
 
 /*  nothing to update below this line when updating the version */
 /*  ---------------------------------------------------------------------------- */

diff --git a/samples/Info.plist b/samples/Info.plist
index 6c4091dfeb41e2e7677b2c1405aae7423e5a1420..91f1474eb7f038d95db9c0d9f7d850f19fc2b229 100644 (file)
--- a/samples/Info.plist
+++ b/samples/Info.plist
@@ -7,7 +7,7 @@
        <key>CFBundleExecutable</key>
        <string>$(PRODUCT_NAME)</string>
        <key>CFBundleGetInfoString</key>
-       <string>$(PRODUCT_NAME) version 2.9.3, (c) 2005-2011 wxWidgets</string>
+       <string>$(PRODUCT_NAME) version 2.9.4, (c) 2005-2011 wxWidgets</string>
        <key>CFBundleIconFile</key>
        <string>wxmac.icns</string>
        <key>CFBundleIdentifier</key>
@@ -15,17 +15,17 @@
        <key>CFBundleInfoDictionaryVersion</key>
        <string>6.0</string>
        <key>CFBundleLongVersionString</key>
-       <string>2.9.3, (c) 2005-2011 wxWidgets</string>
+       <string>2.9.4, (c) 2005-2011 wxWidgets</string>
        <key>CFBundleName</key>
        <string>$(PRODUCT_NAME)</string>
        <key>CFBundlePackageType</key>
        <string>APPL</string>
        <key>CFBundleShortVersionString</key>
-       <string>2.9.3</string>
+       <string>2.9.4</string>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
-       <string>2.9.3</string>
+       <string>2.9.4</string>
        <key>CSResourcesFileMapped</key>
        <true/>
        <key>LSRequiresCarbon</key>

diff --git a/samples/docview/Info.plist b/samples/docview/Info.plist
index b196d7564f5d825569af7563cfe71418a45ec3f3..cf709698d9635d78e479f445d7bd5c771938c2b4 100644 (file)
--- a/samples/docview/Info.plist
+++ b/samples/docview/Info.plist
@@ -51,7 +51,7 @@
        <key>CFBundleExecutable</key>
        <string>$(PRODUCT_NAME)</string>
        <key>CFBundleGetInfoString</key>
-       <string>$(PRODUCT_NAME) version 2.9.3, (c) 2005-2011 wxWidgets</string>
+       <string>$(PRODUCT_NAME) version 2.9.4, (c) 2005-2011 wxWidgets</string>
        <key>CFBundleIconFile</key>
        <string>doc</string>
        <key>CFBundleIdentifier</key>
@@ -66,17 +66,17 @@
                <string>it</string>
        </array>
        <key>CFBundleLongVersionString</key>
-       <string>2.9.3, (c) 2005-2011 wxWidgets</string>
+       <string>2.9.4, (c) 2005-2011 wxWidgets</string>
        <key>CFBundleName</key>
        <string>$(PRODUCT_NAME)</string>
        <key>CFBundlePackageType</key>
        <string>APPL</string>
        <key>CFBundleShortVersionString</key>
-       <string>2.9.3</string>
+       <string>2.9.4</string>
        <key>CFBundleSignature</key>
        <string>WXMA</string>
        <key>CFBundleVersion</key>
-       <string>2.9.3</string>
+       <string>2.9.4</string>
        <key>CSResourcesFileMapped</key>
        <true/>
        <key>LSRequiresCarbon</key>

diff --git a/samples/minimal/Info_carbon.plist b/samples/minimal/Info_carbon.plist
index 46cabbc52f90e8d2dbc01ec6b9567e8cfb8e4403..a2df2b46011f0b982cfb72fbbf40676bc7968874 100644 (file)
--- a/samples/minimal/Info_carbon.plist
+++ b/samples/minimal/Info_carbon.plist
@@ -7,7 +7,7 @@
        <key>CFBundleExecutable</key>
        <string>$(PRODUCT_NAME)</string>
        <key>CFBundleGetInfoString</key>
-       <string>$(PRODUCT_NAME) version 2.9.3, (c) 2005-2011 wxWidgets</string>
+       <string>$(PRODUCT_NAME) version 2.9.4, (c) 2005-2011 wxWidgets</string>
        <key>CFBundleIconFile</key>
        <string>wxmac.icns</string>
        <key>CFBundleIdentifier</key>
@@ -22,17 +22,17 @@
                <string>it</string>
        </array>
        <key>CFBundleLongVersionString</key>
-       <string>2.9.3, (c) 2005-2011 wxWidgets</string>
+       <string>2.9.4, (c) 2005-2011 wxWidgets</string>
        <key>CFBundleName</key>
        <string>$(PRODUCT_NAME)</string>
        <key>CFBundlePackageType</key>
        <string>APPL</string>
        <key>CFBundleShortVersionString</key>
-       <string>2.9.3</string>
+       <string>2.9.4</string>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
-       <string>2.9.3</string>
+       <string>2.9.4</string>
        <key>NSHumanReadableCopyright</key>
        <string>Copyright 2005-2011 wxWidgets</string>
 </dict>

diff --git a/samples/minimal/Info_cocoa.plist b/samples/minimal/Info_cocoa.plist
index 46cabbc52f90e8d2dbc01ec6b9567e8cfb8e4403..a2df2b46011f0b982cfb72fbbf40676bc7968874 100644 (file)
--- a/samples/minimal/Info_cocoa.plist
+++ b/samples/minimal/Info_cocoa.plist
@@ -7,7 +7,7 @@
        <key>CFBundleExecutable</key>
        <string>$(PRODUCT_NAME)</string>
        <key>CFBundleGetInfoString</key>
-       <string>$(PRODUCT_NAME) version 2.9.3, (c) 2005-2011 wxWidgets</string>
+       <string>$(PRODUCT_NAME) version 2.9.4, (c) 2005-2011 wxWidgets</string>
        <key>CFBundleIconFile</key>
        <string>wxmac.icns</string>
        <key>CFBundleIdentifier</key>
@@ -22,17 +22,17 @@
                <string>it</string>
        </array>
        <key>CFBundleLongVersionString</key>
-       <string>2.9.3, (c) 2005-2011 wxWidgets</string>
+       <string>2.9.4, (c) 2005-2011 wxWidgets</string>
        <key>CFBundleName</key>
        <string>$(PRODUCT_NAME)</string>
        <key>CFBundlePackageType</key>
        <string>APPL</string>
        <key>CFBundleShortVersionString</key>
-       <string>2.9.3</string>
+       <string>2.9.4</string>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
-       <string>2.9.3</string>
+       <string>2.9.4</string>
        <key>NSHumanReadableCopyright</key>
        <string>Copyright 2005-2011 wxWidgets</string>
 </dict>

diff --git a/wxBase.spec b/wxBase.spec
index eeaaca38c2d16c2e5779fbd714a08e448959404c..16ce9f8aa05e672e6fc1b907f78a8c498e980adc 100644 (file)
--- a/wxBase.spec
+++ b/wxBase.spec
@@ -1,5 +1,5 @@
 %define pref /usr
-%define ver  2.9.3
+%define ver  2.9.4
 %define ver2 2.9
 %define rel  1
 

diff --git a/wxGTK.spec b/wxGTK.spec
index ac8b684162603c112d32296863b284ace581e92a..0300819cd5c2fac7cbac5a618139d435cb1bc9b1 100644 (file)
--- a/wxGTK.spec
+++ b/wxGTK.spec
@@ -1,5 +1,5 @@
 %define _prefix /usr
-%define ver  2.9.3
+%define ver  2.9.4
 %define ver2 2.9
 %define rel  1
 

diff --git a/wxMGL.spec b/wxMGL.spec
index f75efd6c9e86cb900057a6a00e109f2237fca24c..f48f2aa806bea05f0d799f6b1802dbcfe05808f8 100644 (file)
--- a/wxMGL.spec
+++ b/wxMGL.spec
@@ -1,5 +1,5 @@
 %define pref /usr
-%define ver 2.9.3
+%define ver 2.9.4
 %define ver2 2.9
 %define rel 1
 

diff --git a/wxMotif.spec b/wxMotif.spec
index 3f0fc55331c41a3ef30df38f98a4ddc85a68fff5..db4d569d2b93c16f8351622e7204f0ae1e02dbe6 100644 (file)
--- a/wxMotif.spec
+++ b/wxMotif.spec
@@ -1,5 +1,5 @@
 %define pref /usr
-%define ver  2.9.3
+%define ver  2.9.4
 %define ver2 2.9
 %define rel  1
 

diff --git a/wxX11.spec b/wxX11.spec
index f9e2c8540e4af0cc3d024f7353fda61f1674abb2..a76794a9794f83cf2dc7e03ce3eb7f390e02c9aa 100644 (file)
--- a/wxX11.spec
+++ b/wxX11.spec
@@ -1,5 +1,5 @@
 %define pref /usr
-%define ver  2.9.3
+%define ver  2.9.4
 %define ver2 2.9
 %define rel  1