bumped subrelease number

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

diff --git a/configure b/configure
index e871b3418170e0124a508f26cd237c9b64c51b9b..cfcf0558cc5cc851e3da1f7700201114942039b7 100755 (executable)
--- a/configure
+++ b/configure
@@ -1659,7 +1659,7 @@ test -n "$target_alias" &&
 wx_major_version_number=2
 wx_minor_version_number=5
 wx_release_number=4
 wx_major_version_number=2
 wx_minor_version_number=5
 wx_release_number=4

-wx_subrelease_number=0
+wx_subrelease_number=1

 
 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
 WX_VERSION=$WX_RELEASE.$wx_release_number
 
 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
 WX_VERSION=$WX_RELEASE.$wx_release_number


@@ -13364,9 +13364,10 @@ echo "${ECHO_T}$wx_cv_gccversion" >&6
         { echo "$as_me:$LINENO: WARNING: Building DLLs requires OMF mode, enabled" >&5
 echo "$as_me: WARNING: Building DLLs requires OMF mode, enabled" >&2;}
         wxUSE_OMF=yes
         { echo "$as_me:$LINENO: WARNING: Building DLLs requires OMF mode, enabled" >&5
 echo "$as_me: WARNING: Building DLLs requires OMF mode, enabled" >&2;}
         wxUSE_OMF=yes

+       enable_omf=yes

       fi
       if test "$wxUSE_OMF" = "yes"; then
       fi
       if test "$wxUSE_OMF" = "yes"; then

-        LDFLAGS="$LDFLAGS -Zomf -Zlinker /PMTYPE:PM -Zlinker /EXEPACK"
+        LDFLAGS="$LDFLAGS -Zlinker /EXEPACK -Zlinker /PMTYPE:PM"

       fi
         ;;
   *)
       fi
         ;;
   *)


@@ -28207,23 +28208,24 @@ echo "$as_me: WARNING: system ODBC library not found, will use built-in instead"
                         wxUSE_ODBC=sys
         fi
     fi
                         wxUSE_ODBC=sys
         fi
     fi

-    if test "$wxUSE_ODBC" != "no" ; then
-        cat >>confdefs.h <<\_ACEOF
-#define wxUSE_ODBC 1
-_ACEOF

 
 

-        if test "$wxUSE_ODBC" = "builtin" ; then
-            cat >>confdefs.h <<\_ACEOF
+    if test "$wxUSE_ODBC" = "builtin" ; then
+        cat >>confdefs.h <<\_ACEOF

 #define wxUSE_BUILTIN_IODBC 1
 _ACEOF
 
 #define wxUSE_BUILTIN_IODBC 1
 _ACEOF
 

-        fi
-        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS db"
-
-                WXODBCFLAG="-D_IODBC_"

     fi
 fi
 
     fi
 fi
 

+if test "$wxUSE_ODBC" != "no" ; then
+    cat >>confdefs.h <<\_ACEOF
+#define wxUSE_ODBC 1
+_ACEOF
+
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS db"
+
+        WXODBCFLAG="-D_IODBC_"
+fi

 
 
 if test "$wxUSE_DISPLAY" = "yes"; then
 
 
 if test "$wxUSE_DISPLAY" = "yes"; then

diff --git a/configure.in b/configure.in
index 95b8aa9a55a592120b8b6f1d15ffacb30660fb20..d069bcf376b3bca291f0a1a390e29b5831b30d66 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -56,7 +56,7 @@ dnl   libwx_$(TOOLKIT)-$(WX_RELEASE).so.$(WX_CURRENT).$(WX_REVISION).$(WX_AGE)
 wx_major_version_number=2
 wx_minor_version_number=5
 wx_release_number=4
 wx_major_version_number=2
 wx_minor_version_number=5
 wx_release_number=4

-wx_subrelease_number=0
+wx_subrelease_number=1

 
 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
 WX_VERSION=$WX_RELEASE.$wx_release_number
 
 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
 WX_VERSION=$WX_RELEASE.$wx_release_number

diff --git a/include/wx/version.h b/include/wx/version.h
index 67e137eae453023368b09358f4d3691c92501082..32b40178cdd7df17c85e942bac9eed55c4aa0e39 100644 (file)
--- a/include/wx/version.h
+++ b/include/wx/version.h
@@ -22,7 +22,7 @@
 #define wxMAJOR_VERSION      2
 #define wxMINOR_VERSION      5
 #define wxRELEASE_NUMBER     4
 #define wxMAJOR_VERSION      2
 #define wxMINOR_VERSION      5
 #define wxRELEASE_NUMBER     4

-#define wxSUBRELEASE_NUMBER  0
+#define wxSUBRELEASE_NUMBER  1

 #define wxVERSION_STRING   _T("wxWidgets 2.5.4")
 
 /*  nothing to update below this line when updating the version */
 #define wxVERSION_STRING   _T("wxWidgets 2.5.4")
 
 /*  nothing to update below this line when updating the version */

diff --git a/wxPython/config.py b/wxPython/config.py
index b9ebe12e749b6193f692380caa36e78ec9428a4a..6a93443a3bf5e80cdda3840a963910498510d60d 100644 (file)
--- a/wxPython/config.py
+++ b/wxPython/config.py
@@ -39,8 +39,8 @@ import distutils.command.clean
 VER_MAJOR        = 2      # The first three must match wxWidgets
 VER_MINOR        = 5
 VER_RELEASE      = 4
 VER_MAJOR        = 2      # The first three must match wxWidgets
 VER_MINOR        = 5
 VER_RELEASE      = 4

-VER_SUBREL       = 0      # wxPython release num for x.y.z release of wxWidgets
-VER_FLAGS        = "pre"     # release flags, such as prerelease num, unicode, etc.
+VER_SUBREL       = 1      # wxPython release num for x.y.z release of wxWidgets
+VER_FLAGS        = "rc1"     # release flags, such as prerelease num, unicode, etc.

 
 DESCRIPTION      = "Cross platform GUI toolkit for Python"
 AUTHOR           = "Robin Dunn"
 
 DESCRIPTION      = "Cross platform GUI toolkit for Python"
 AUTHOR           = "Robin Dunn"

diff --git a/wxPython/docs/CHANGES.txt b/wxPython/docs/CHANGES.txt
index 2f2e649d72b43719c2b6c881bcf66ab70f01b747..65a889e69daac50bac0928ab3102a03c2fabd69b 100644 (file)
--- a/wxPython/docs/CHANGES.txt
+++ b/wxPython/docs/CHANGES.txt
@@ -2,7 +2,7 @@ Recent Changes for wxPython
 =====================================================================
 
 
 =====================================================================
 
 

-2.5.4.0
+2.5.4.1

 -------
 
 wx.Sizer Add, Insert, and Prepend functions now return a reference to the
 -------
 
 wx.Sizer Add, Insert, and Prepend functions now return a reference to the


@@ -226,6 +226,14 @@ wx.html.HtmlWindow now supports background images.
 Added wx.lib.gestures module from Daniel Pozmanter which supports
 using Mouse Gestures in an application.
 
 Added wx.lib.gestures module from Daniel Pozmanter which supports
 using Mouse Gestures in an application.
 

+wxGTK2: ENTER and LEAVE mouse events are now sent for multi-line text
+controls.
+
+wxMSW:  "Alt" key (VK_MENU) now results in WXK_ALT keyboard event, not
+WXK_MENU
+
+
+