Updated version numbers to 2.3.1
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10444 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -472,7 +472,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=3
|
WX_MINOR_VERSION_NUMBER=3
|
||||||
WX_RELEASE_NUMBER=0
|
WX_RELEASE_NUMBER=1
|
||||||
|
|
||||||
WX_VERSION=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER.$WX_RELEASE_NUMBER
|
WX_VERSION=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER.$WX_RELEASE_NUMBER
|
||||||
WX_RELEASE=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER
|
WX_RELEASE=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER
|
||||||
|
@@ -1,6 +1,20 @@
|
|||||||
wxWindows 2 Change Log
|
wxWindows 2 Change Log
|
||||||
----------------------
|
----------------------
|
||||||
|
|
||||||
|
2.3.1
|
||||||
|
-----
|
||||||
|
|
||||||
|
All (GUI):
|
||||||
|
|
||||||
|
- Added EVT_GRID_EDITOR_CREATED and wxGridEditorCreatedEvent so the
|
||||||
|
user code can get access to the edit control when it is created, (to
|
||||||
|
push on a custom event handler for example.)
|
||||||
|
- Added wxTextAttr class and SetStyle, SetDefaultStyle and
|
||||||
|
GetDefaultStyle methods to wxTextCtrl.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
2.3.0
|
2.3.0
|
||||||
-----
|
-----
|
||||||
|
|
||||||
|
@@ -2,6 +2,8 @@ This file contains the detailed log of wxGTK-specific changes, please see
|
|||||||
doc/changes.txt for the concise log of important changes in all wxWindows
|
doc/changes.txt for the concise log of important changes in all wxWindows
|
||||||
ports.
|
ports.
|
||||||
|
|
||||||
|
*** wxWindows 2.3.1 ***
|
||||||
|
|
||||||
*** wxWindows 2.3.0 ***
|
*** wxWindows 2.3.0 ***
|
||||||
|
|
||||||
scaling for map modes other than wxMM_TEXT works correctly (Derry Bryson)
|
scaling for map modes other than wxMM_TEXT works correctly (Derry Bryson)
|
||||||
|
@@ -15,13 +15,13 @@
|
|||||||
// Bump-up with each new version
|
// Bump-up with each new version
|
||||||
#define wxMAJOR_VERSION 2
|
#define wxMAJOR_VERSION 2
|
||||||
#define wxMINOR_VERSION 3
|
#define wxMINOR_VERSION 3
|
||||||
#define wxRELEASE_NUMBER 0
|
#define wxRELEASE_NUMBER 1
|
||||||
#define wxVERSION_STRING _T("wxWindows 2.3.0")
|
#define wxVERSION_STRING _T("wxWindows 2.3.1")
|
||||||
|
|
||||||
// These are used by src/msw/version.rc and should always be ASCII, not Unicode
|
// These are used by src/msw/version.rc and should always be ASCII, not Unicode
|
||||||
// and must be updated manually as well each time the version above changes
|
// and must be updated manually as well each time the version above changes
|
||||||
#define wxVERSION_NUM_DOT_STRING "2.3.0"
|
#define wxVERSION_NUM_DOT_STRING "2.3.1"
|
||||||
#define wxVERSION_NUM_STRING "230"
|
#define wxVERSION_NUM_STRING "231"
|
||||||
|
|
||||||
// nothing should be updated below this line when updating the version
|
// nothing should be updated below this line when updating the version
|
||||||
|
|
||||||
|
@@ -43,7 +43,7 @@ DLL=0
|
|||||||
|
|
||||||
!if "$(WXMAKINGDLL)" == "1"
|
!if "$(WXMAKINGDLL)" == "1"
|
||||||
DLL_FLAGS= -DWXMAKINGDLL=1 -D_RTLDLL
|
DLL_FLAGS= -DWXMAKINGDLL=1 -D_RTLDLL
|
||||||
WXLIB= $(WXLIBDIR)\wx230.lib
|
WXLIB= $(WXLIBDIR)\wx231.lib
|
||||||
|
|
||||||
!else
|
!else
|
||||||
|
|
||||||
@@ -51,7 +51,7 @@ LINK_FLAGS= /aa /c
|
|||||||
|
|
||||||
!if "$(WXUSINGDLL)" == "1"
|
!if "$(WXUSINGDLL)" == "1"
|
||||||
DLL_FLAGS= -DWXUSINGDLL=1 -D_RTLDLL
|
DLL_FLAGS= -DWXUSINGDLL=1 -D_RTLDLL
|
||||||
WXLIB= $(WXLIBDIR)\wx230.lib
|
WXLIB= $(WXLIBDIR)\wx231.lib
|
||||||
!else
|
!else
|
||||||
DLL_FLAGS=
|
DLL_FLAGS=
|
||||||
WXLIB= $(WXLIBDIR)\wx32.lib
|
WXLIB= $(WXLIBDIR)\wx32.lib
|
||||||
|
@@ -18,7 +18,7 @@ MINGW32=1
|
|||||||
MINGW32VERSION=2.95
|
MINGW32VERSION=2.95
|
||||||
|
|
||||||
# If building DLL, the version
|
# If building DLL, the version
|
||||||
WXVERSION=23_0
|
WXVERSION=23_1
|
||||||
|
|
||||||
# Say yes if you have a "modern" linker that supports --shared option.
|
# Say yes if you have a "modern" linker that supports --shared option.
|
||||||
# Note that you're probably going to wait forever for dlltool/gcc/etc
|
# Note that you're probably going to wait forever for dlltool/gcc/etc
|
||||||
|
@@ -12,7 +12,7 @@
|
|||||||
RM= erase
|
RM= erase
|
||||||
!endif
|
!endif
|
||||||
|
|
||||||
WXVERSION=23_0
|
WXVERSION=23_1
|
||||||
WIN95=1
|
WIN95=1
|
||||||
|
|
||||||
!if "$(WIN95)" == "0"
|
!if "$(WIN95)" == "0"
|
||||||
@@ -157,7 +157,7 @@ WXLIB=$(WXDIR)\lib\$(WXLIBNAME).lib
|
|||||||
INC=$(EXTRAINC) -I$(WXINC) -I$(WXDIR)/contrib/include -I$(WXDIR)/src/png -I$(WXDIR)/src/zlib -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/tiff
|
INC=$(EXTRAINC) -I$(WXINC) -I$(WXDIR)/contrib/include -I$(WXDIR)/src/png -I$(WXDIR)/src/zlib -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/tiff
|
||||||
|
|
||||||
!if "$(WXUSINGDLL)" == "1" || "$(wxUSE_GUI)" == "0"
|
!if "$(WXUSINGDLL)" == "1" || "$(wxUSE_GUI)" == "0"
|
||||||
LIBS = $(EXTRALIBS) $(WXLIB) $(WINLIBS)
|
LIBS = $(EXTRALIBS) $(WXLIB) $(WINLIBS) $(WXDIR)\lib\zlib$(LIBEXT).lib
|
||||||
!else
|
!else
|
||||||
LIBS = $(EXTRALIBS) $(WXLIB) $(WINLIBS) $(WXDIR)\lib\png$(LIBEXT).lib $(WXDIR)\lib\zlib$(LIBEXT).lib $(WXDIR)\lib\jpeg$(LIBEXT).lib $(WXDIR)\lib\tiff$(LIBEXT).lib
|
LIBS = $(EXTRALIBS) $(WXLIB) $(WINLIBS) $(WXDIR)\lib\png$(LIBEXT).lib $(WXDIR)\lib\zlib$(LIBEXT).lib $(WXDIR)\lib\jpeg$(LIBEXT).lib $(WXDIR)\lib\tiff$(LIBEXT).lib
|
||||||
!endif
|
!endif
|
||||||
|
@@ -53,7 +53,7 @@ BSC32=bscmake.exe
|
|||||||
# ADD BSC32 /nologo
|
# ADD BSC32 /nologo
|
||||||
LINK32=link.exe
|
LINK32=link.exe
|
||||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
|
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
|
||||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comctl32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib rpcrt4.lib winmm.lib opengl32.lib glu32.lib /nologo /subsystem:windows /dll /machine:I386 /out:"../lib/wx23_0.dll"
|
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comctl32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib rpcrt4.lib winmm.lib opengl32.lib glu32.lib /nologo /subsystem:windows /dll /machine:I386 /out:"../lib/wx23_1.dll"
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
|
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
|
||||||
|
|
||||||
@@ -79,7 +79,7 @@ BSC32=bscmake.exe
|
|||||||
# ADD BSC32 /nologo
|
# ADD BSC32 /nologo
|
||||||
LINK32=link.exe
|
LINK32=link.exe
|
||||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
|
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
|
||||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comctl32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib rpcrt4.lib winmm.lib opengl32.lib glu32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"../lib/wx23_0d.dll" /pdbtype:sept
|
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comctl32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib rpcrt4.lib winmm.lib opengl32.lib glu32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"../lib/wx23_1d.dll" /pdbtype:sept
|
||||||
|
|
||||||
!ENDIF
|
!ENDIF
|
||||||
|
|
||||||
|
@@ -1,6 +1,6 @@
|
|||||||
%define pref /usr
|
%define pref /usr
|
||||||
%define ver 2.3.0
|
%define ver 2.3.1
|
||||||
%define rel 0
|
%define rel 1
|
||||||
|
|
||||||
Summary: wxBase library - non-GUI support classes of wxWindows toolkit
|
Summary: wxBase library - non-GUI support classes of wxWindows toolkit
|
||||||
Name: wxBase
|
Name: wxBase
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
%define pref /usr
|
%define pref /usr
|
||||||
%define ver 2.3.0
|
%define ver 2.3.1
|
||||||
%define rel 1
|
%define rel 1
|
||||||
|
|
||||||
Summary: The GTK+ 1.2 port of the wxWindows library
|
Summary: The GTK+ 1.2 port of the wxWindows library
|
||||||
|
@@ -3,8 +3,8 @@
|
|||||||
|
|
||||||
# Note that this is NOT a relocatable package
|
# Note that this is NOT a relocatable package
|
||||||
%define pref /usr
|
%define pref /usr
|
||||||
%define ver 2.1.16
|
%define ver 2.3.1
|
||||||
%define rel 0
|
%define rel 1
|
||||||
|
|
||||||
Summary: The Motif/Lesstif port of the wxWindows library
|
Summary: The Motif/Lesstif port of the wxWindows library
|
||||||
Name: wxMotif
|
Name: wxMotif
|
||||||
|
@@ -1,7 +1,7 @@
|
|||||||
# Note that this is NOT a relocatable package
|
# Note that this is NOT a relocatable package
|
||||||
%define pref /usr
|
%define pref /usr
|
||||||
%define ver 2.1.0
|
%define ver 2.3.1
|
||||||
%define rel 8
|
%define rel 1
|
||||||
|
|
||||||
Summary: The WINE port of the wxWindows library
|
Summary: The WINE port of the wxWindows library
|
||||||
Name: wxWINE
|
Name: wxWINE
|
||||||
|
Reference in New Issue
Block a user