Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bumped subrelease number

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32356 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2005-02-24 18:41:51 +00:00
parent 5207975ffb
commit 2da0c077ce
5 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
configure vendored
View File

@@ -1659,7 +1659,7 @@ test -n "$target_alias" &&
wx_major_version_number=2 wx_major_version_number=2
wx_minor_version_number=5 wx_minor_version_number=5
wx_release_number=4 wx_release_number=4
wx_subrelease_number=0 wx_subrelease_number=1
WX_RELEASE=$wx_major_version_number.$wx_minor_version_number WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
WX_VERSION=$WX_RELEASE.$wx_release_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:$LINENO: WARNING: Building DLLs requires OMF mode, enabled" >&5
echo "$as_me: WARNING: Building DLLs requires OMF mode, enabled" >&2;} echo "$as_me: WARNING: Building DLLs requires OMF mode, enabled" >&2;}
wxUSE_OMF=yes wxUSE_OMF=yes
enable_omf=yes
fi fi
if test "$wxUSE_OMF" = "yes"; then if test "$wxUSE_OMF" = "yes"; then
LDFLAGS="$LDFLAGS -Zomf -Zlinker /PMTYPE:PM -Zlinker /EXEPACK" LDFLAGS="$LDFLAGS -Zlinker /EXEPACK -Zlinker /PMTYPE:PM"
fi fi
;; ;;
*) *)
@@ -28207,10 +28208,6 @@ echo "$as_me: WARNING: system ODBC library not found, will use built-in instead"
wxUSE_ODBC=sys wxUSE_ODBC=sys
fi fi
fi fi
if test "$wxUSE_ODBC" != "no" ; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_ODBC 1
_ACEOF
if test "$wxUSE_ODBC" = "builtin" ; then if test "$wxUSE_ODBC" = "builtin" ; then
cat >>confdefs.h <<\_ACEOF cat >>confdefs.h <<\_ACEOF
@@ -28218,12 +28215,17 @@ _ACEOF
_ACEOF _ACEOF
fi fi
fi
if test "$wxUSE_ODBC" != "no" ; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_ODBC 1
_ACEOF
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS db" SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS db"
WXODBCFLAG="-D_IODBC_" WXODBCFLAG="-D_IODBC_"
fi fi
fi
if test "$wxUSE_DISPLAY" = "yes"; then if test "$wxUSE_DISPLAY" = "yes"; then

2
configure.in
View File

@@ -56,7 +56,7 @@ dnl libwx_$(TOOLKIT)-$(WX_RELEASE).so.$(WX_CURRENT).$(WX_REVISION).$(WX_AGE)
wx_major_version_number=2 wx_major_version_number=2
wx_minor_version_number=5 wx_minor_version_number=5
wx_release_number=4 wx_release_number=4
wx_subrelease_number=0 wx_subrelease_number=1
WX_RELEASE=$wx_major_version_number.$wx_minor_version_number WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
WX_VERSION=$WX_RELEASE.$wx_release_number WX_VERSION=$WX_RELEASE.$wx_release_number

2
include/wx/version.h
View File

@@ -22,7 +22,7 @@
#define wxMAJOR_VERSION 2 #define wxMAJOR_VERSION 2
#define wxMINOR_VERSION 5 #define wxMINOR_VERSION 5
#define wxRELEASE_NUMBER 4 #define wxRELEASE_NUMBER 4
#define wxSUBRELEASE_NUMBER 0 #define wxSUBRELEASE_NUMBER 1
#define wxVERSION_STRING _T("wxWidgets 2.5.4") #define wxVERSION_STRING _T("wxWidgets 2.5.4")
/* nothing to update below this line when updating the version */ /* nothing to update below this line when updating the version */

4
wxPython/config.py
View File

@@ -39,8 +39,8 @@ import distutils.command.clean
VER_MAJOR = 2 # The first three must match wxWidgets VER_MAJOR = 2 # The first three must match wxWidgets
VER_MINOR = 5 VER_MINOR = 5
VER_RELEASE = 4 VER_RELEASE = 4
VER_SUBREL = 0 # wxPython release num for x.y.z release of wxWidgets VER_SUBREL = 1 # wxPython release num for x.y.z release of wxWidgets
VER_FLAGS = "pre" # release flags, such as prerelease num, unicode, etc. VER_FLAGS = "rc1" # release flags, such as prerelease num, unicode, etc.
DESCRIPTION = "Cross platform GUI toolkit for Python" DESCRIPTION = "Cross platform GUI toolkit for Python"
AUTHOR = "Robin Dunn" AUTHOR = "Robin Dunn"

10
wxPython/docs/CHANGES.txt
View File

@@ -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 Added wx.lib.gestures module from Daniel Pozmanter which supports
using Mouse Gestures in an application. 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