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:
Robin Dunn
2001-06-06 16:50:48 +00:00
parent 7ca4d1212e
commit 014e19de74
12 changed files with 101 additions and 85 deletions

View File

@@ -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
@@ -3054,7 +3054,7 @@ fi
TIFF_INCLUDE= TIFF_INCLUDE=
if test "$wxUSE_LIBTIFF" = "yes" -o "$wxUSE_LIBTIFF" = "sys" ; then if test "$wxUSE_LIBTIFF" = "yes" -o "$wxUSE_LIBTIFF" = "sys" ; then
AC_DEFINE(wxUSE_LIBTIFF) AC_DEFINE(wxUSE_LIBTIFF)
if test "$wxUSE_LIBTIFF" = "yes" ; then if test "$wxUSE_LIBTIFF" = "yes" ; then
TIFF_INCLUDE="-I\${top_srcdir}/src/tiff" TIFF_INCLUDE="-I\${top_srcdir}/src/tiff"
else else
TIFF_LINK= TIFF_LINK=
@@ -4177,12 +4177,12 @@ if test -d include; then
if test -d include/wx; then if test -d include/wx; then
if test -d include/wx/${TOOLKIT_DIR}; then if test -d include/wx/${TOOLKIT_DIR}; then
if test -f include/wx/${TOOLKIT_DIR}/setup.h; then if test -f include/wx/${TOOLKIT_DIR}/setup.h; then
mv -f include/wx/${TOOLKIT_DIR}/setup.h setup.h mv -f include/wx/${TOOLKIT_DIR}/setup.h setup.h
fi fi
fi fi
fi fi
fi fi
AC_CONFIG_HEADER(setup.h:setup.h.in) AC_CONFIG_HEADER(setup.h:setup.h.in)
dnl some more GUI only things dnl some more GUI only things
@@ -4212,10 +4212,10 @@ AC_OUTPUT([
chmod +x wx-config chmod +x wx-config
mv wx-config wx${TOOLKIT_NAME}-config mv wx-config wx${TOOLKIT_NAME}-config
${LN_S} wx${TOOLKIT_NAME}-config wx-config ${LN_S} wx${TOOLKIT_NAME}-config wx-config
dnl the debian build process wants setup.h in the lib subdir so we dnl the debian build process wants setup.h in the lib subdir so we
dnl can pretend wxWin is already installed, so we *copy* it there dnl can pretend wxWin is already installed, so we *copy* it there
if test ! -d lib; then if test ! -d lib; then
mkdir lib mkdir lib
fi fi
@@ -4249,7 +4249,7 @@ AC_OUTPUT([
if test -f setup.h; then if test -f setup.h; then
cp -fp setup.h include/wx/${TOOLKIT_DIR}/setup.h cp -fp setup.h include/wx/${TOOLKIT_DIR}/setup.h
fi fi
], ],
[ [
TOOLKIT_DIR="${TOOLKIT_DIR}" TOOLKIT_DIR="${TOOLKIT_DIR}"

View File

@@ -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
----- -----

View File

@@ -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)

View File

@@ -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

View File

@@ -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

View File

@@ -1,7 +1,7 @@
# #
# makeg95.env # makeg95.env
# Common makefile settings for wxWindows programs # Common makefile settings for wxWindows programs
# This file is included by all the other makefiles, thus changes # This file is included by all the other makefiles, thus changes
# made here take effect everywhere (except where overriden). # made here take effect everywhere (except where overriden).
# The settings are for GnuWin32-derived compilers, i.e. Cygwin and Mingw32. # The settings are for GnuWin32-derived compilers, i.e. Cygwin and Mingw32.
# #
@@ -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
@@ -28,7 +28,7 @@ LD_SUPPORTS_SHARED=yes
# Set to the appropriate remove command (must support forward slashes) # Set to the appropriate remove command (must support forward slashes)
# You can get a suitable rm.exe from ports/mingw32/extra.zip on the ftp site. # You can get a suitable rm.exe from ports/mingw32/extra.zip on the ftp site.
RM=rm -f RM=rm -f
# Set to the appropriate copy command (must support forward slashes) # Set to the appropriate copy command (must support forward slashes)
# You can get a suitable cp.exe from ports/mingw32/extra.zip on the ftp site. # You can get a suitable cp.exe from ports/mingw32/extra.zip on the ftp site.
@@ -167,7 +167,7 @@ WXINC=$(WXDIR)/include
WXBASESRC=$(WXDIR)/src/common WXBASESRC=$(WXDIR)/src/common
WXLIB=$(WXDIR)/lib/$(LIBPREFIX)wx.$(LIBSUFF) WXLIB=$(WXDIR)/lib/$(LIBPREFIX)wx.$(LIBSUFF)
GNUWIN32EXTRA=-I$(WXDIR)/include/wx/msw/gnuwin32 GNUWIN32EXTRA=-I$(WXDIR)/include/wx/msw/gnuwin32
ifeq ($(MINGW32),1) ifeq ($(MINGW32),1)
ifneq "$(findstring 2.95, $(MINGW32VERSION))" "" ifneq "$(findstring 2.95, $(MINGW32VERSION))" ""
@@ -178,7 +178,7 @@ endif
#ifeq ($(MINGW32),1) #ifeq ($(MINGW32),1)
#INC = -I$(WXINC) -I$(WXDIR)/contrib/include -I$(WXDIR)/src/png -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/zlib -I$(WXDIR)/src/tiff $(EXTRAINC) $(COMPPATHS) #INC = -I$(WXINC) -I$(WXDIR)/contrib/include -I$(WXDIR)/src/png -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/zlib -I$(WXDIR)/src/tiff $(EXTRAINC) $(COMPPATHS)
#else #else
INC = -I$(WXINC) -I$(WXDIR)/contrib/include -I$(WXDIR)/src/png -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/zlib -I$(WXDIR)/src/tiff $(EXTRAINC) $(COMPPATHS) -I$(WXDIR)/include/wx/msw/gnuwin32 INC = -I$(WXINC) -I$(WXDIR)/contrib/include -I$(WXDIR)/src/png -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/zlib -I$(WXDIR)/src/tiff $(EXTRAINC) $(COMPPATHS) -I$(WXDIR)/include/wx/msw/gnuwin32
#endif #endif
RCLFLAGS=-cpp "cpp -lang-c++ -DWIN32 -D_WIN32 -DRCL_INVOKED -I$(WXWIN)/include" RCLFLAGS=-cpp "cpp -lang-c++ -DWIN32 -D_WIN32 -DRCL_INVOKED -I$(WXWIN)/include"

View File

@@ -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
@@ -199,18 +199,18 @@ PCH=
PRECOMP= PRECOMP=
MAKEPRECOMP= MAKEPRECOMP=
!else !else
!if "$(wxUSE_GUI)" == "0" !if "$(wxUSE_GUI)" == "0"
PCH=wxBase.pch PCH=wxBase.pch
!else !else
PCH=wxvc.pch PCH=wxvc.pch
!endif !endif
PRECOMP=/YuWX/WXPREC.H /Fp$(WXDIR)\src\msw\$D\$(PCH) /Fd$(WXDIR)\src\msw\$D\vc60.pdb PRECOMP=/YuWX/WXPREC.H /Fp$(WXDIR)\src\msw\$D\$(PCH) /Fd$(WXDIR)\src\msw\$D\vc60.pdb
MAKEPRECOMP=/YcWX/WXPREC.H MAKEPRECOMP=/YcWX/WXPREC.H
!endif !endif
CPPFLAGS=$(WINFLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(EXTRAFLAGS) /D__WXMSW__ $(INC) $(OPT) $(EXTRADLLFLAGS) $(CRTFLAG) /D__WINDOWS__ /GX /DSTRICT $(OVERRIDEFLAGS) CPPFLAGS=$(WINFLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(EXTRAFLAGS) /D__WXMSW__ $(INC) $(OPT) $(EXTRADLLFLAGS) $(CRTFLAG) /D__WINDOWS__ /GX /DSTRICT $(OVERRIDEFLAGS)
# If you don't include wxprec.h, use CPPFLAGS2 # If you don't include wxprec.h, use CPPFLAGS2

View File

@@ -7,19 +7,19 @@
CFG=wxvc_dll - Win32 Debug CFG=wxvc_dll - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run !MESSAGE use the Export Makefile command and run
!MESSAGE !MESSAGE
!MESSAGE NMAKE /f "wxvc_dll.mak". !MESSAGE NMAKE /f "wxvc_dll.mak".
!MESSAGE !MESSAGE
!MESSAGE You can specify a configuration when running NMAKE !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE !MESSAGE
!MESSAGE NMAKE /f "wxvc_dll.mak" CFG="wxvc_dll - Win32 Debug" !MESSAGE NMAKE /f "wxvc_dll.mak" CFG="wxvc_dll - Win32 Debug"
!MESSAGE !MESSAGE
!MESSAGE Possible choices for configuration are: !MESSAGE Possible choices for configuration are:
!MESSAGE !MESSAGE
!MESSAGE "wxvc_dll - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "wxvc_dll - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "wxvc_dll - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "wxvc_dll - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE !MESSAGE
# Begin Project # Begin Project
# PROP AllowPerConfigDependencies 0 # PROP AllowPerConfigDependencies 0
@@ -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,9 +79,9 @@ 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
# Begin Target # Begin Target
@@ -1371,7 +1371,7 @@ SOURCE=.\jpeg\jcapimin.c
# ADD CPP /Zi /I ".." # ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu # SUBTRACT CPP /YX /Yc /Yu
!ENDIF !ENDIF
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -1388,7 +1388,7 @@ SOURCE=.\jpeg\jcapistd.c
# ADD CPP /Zi /I ".." # ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu # SUBTRACT CPP /YX /Yc /Yu
!ENDIF !ENDIF
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -1405,7 +1405,7 @@ SOURCE=.\jpeg\jccoefct.c
# ADD CPP /Zi /I ".." # ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu # SUBTRACT CPP /YX /Yc /Yu
!ENDIF !ENDIF
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -1422,7 +1422,7 @@ SOURCE=.\jpeg\jccolor.c
# ADD CPP /Zi /I ".." # ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu # SUBTRACT CPP /YX /Yc /Yu
!ENDIF !ENDIF
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -1439,7 +1439,7 @@ SOURCE=.\jpeg\jcdctmgr.c
# ADD CPP /Zi /I ".." # ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu # SUBTRACT CPP /YX /Yc /Yu
!ENDIF !ENDIF
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -1456,7 +1456,7 @@ SOURCE=.\jpeg\jchuff.c
# ADD CPP /Zi /I ".." # ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu # SUBTRACT CPP /YX /Yc /Yu
!ENDIF !ENDIF
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -1473,7 +1473,7 @@ SOURCE=.\jpeg\jcinit.c
# ADD CPP /Zi /I ".." # ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu # SUBTRACT CPP /YX /Yc /Yu
!ENDIF !ENDIF
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -1490,7 +1490,7 @@ SOURCE=.\jpeg\jcmainct.c
# ADD CPP /Zi /I ".." # ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu # SUBTRACT CPP /YX /Yc /Yu
!ENDIF !ENDIF
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -1507,7 +1507,7 @@ SOURCE=.\jpeg\jcmarker.c
# ADD CPP /Zi /I ".." # ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu # SUBTRACT CPP /YX /Yc /Yu
!ENDIF !ENDIF
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -1524,7 +1524,7 @@ SOURCE=.\jpeg\jcmaster.c
# ADD CPP /Zi /I ".." # ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu # SUBTRACT CPP /YX /Yc /Yu
!ENDIF !ENDIF
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -1541,7 +1541,7 @@ SOURCE=.\jpeg\jcomapi.c
# ADD CPP /Zi /I ".." # ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu # SUBTRACT CPP /YX /Yc /Yu
!ENDIF !ENDIF
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -1558,7 +1558,7 @@ SOURCE=.\jpeg\jcparam.c
# ADD CPP /Zi /I ".." # ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu # SUBTRACT CPP /YX /Yc /Yu
!ENDIF !ENDIF
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -1575,7 +1575,7 @@ SOURCE=.\jpeg\jcphuff.c
# ADD CPP /Zi /I ".." # ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu # SUBTRACT CPP /YX /Yc /Yu
!ENDIF !ENDIF
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -1592,7 +1592,7 @@ SOURCE=.\jpeg\jcprepct.c
# ADD CPP /Zi /I ".." # ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu # SUBTRACT CPP /YX /Yc /Yu
!ENDIF !ENDIF
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -1609,7 +1609,7 @@ SOURCE=.\jpeg\jcsample.c
# ADD CPP /Zi /I ".." # ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu # SUBTRACT CPP /YX /Yc /Yu
!ENDIF !ENDIF
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -1626,7 +1626,7 @@ SOURCE=.\jpeg\jctrans.c
# ADD CPP /Zi /I ".." # ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu # SUBTRACT CPP /YX /Yc /Yu
!ENDIF !ENDIF
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -1643,7 +1643,7 @@ SOURCE=.\jpeg\jdapimin.c
# ADD CPP /Zi /I ".." # ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu # SUBTRACT CPP /YX /Yc /Yu
!ENDIF !ENDIF
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -1660,7 +1660,7 @@ SOURCE=.\jpeg\jdapistd.c
# ADD CPP /Zi /I ".." # ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu # SUBTRACT CPP /YX /Yc /Yu
!ENDIF !ENDIF
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -1677,7 +1677,7 @@ SOURCE=.\jpeg\jdatadst.c
# ADD CPP /Zi /I ".." # ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu # SUBTRACT CPP /YX /Yc /Yu
!ENDIF !ENDIF
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -1694,7 +1694,7 @@ SOURCE=.\jpeg\jdatasrc.c
# ADD CPP /Zi /I ".." # ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu # SUBTRACT CPP /YX /Yc /Yu
!ENDIF !ENDIF
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -1711,7 +1711,7 @@ SOURCE=.\jpeg\jdcoefct.c
# ADD CPP /Zi /I ".." # ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu # SUBTRACT CPP /YX /Yc /Yu
!ENDIF !ENDIF
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -1728,7 +1728,7 @@ SOURCE=.\jpeg\jdcolor.c
# ADD CPP /Zi /I ".." # ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu # SUBTRACT CPP /YX /Yc /Yu
!ENDIF !ENDIF
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -1745,7 +1745,7 @@ SOURCE=.\jpeg\jddctmgr.c
# ADD CPP /Zi /I ".." # ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu # SUBTRACT CPP /YX /Yc /Yu
!ENDIF !ENDIF
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -1762,7 +1762,7 @@ SOURCE=.\jpeg\jdhuff.c
# ADD CPP /Zi /I ".." # ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu # SUBTRACT CPP /YX /Yc /Yu
!ENDIF !ENDIF
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -1779,7 +1779,7 @@ SOURCE=.\jpeg\jdinput.c
# ADD CPP /Zi /I ".." # ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu # SUBTRACT CPP /YX /Yc /Yu
!ENDIF !ENDIF
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -1796,7 +1796,7 @@ SOURCE=.\jpeg\jdmainct.c
# ADD CPP /Zi /I ".." # ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu # SUBTRACT CPP /YX /Yc /Yu
!ENDIF !ENDIF
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -1813,7 +1813,7 @@ SOURCE=.\jpeg\jdmarker.c
# ADD CPP /Zi /I ".." # ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu # SUBTRACT CPP /YX /Yc /Yu
!ENDIF !ENDIF
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -1830,7 +1830,7 @@ SOURCE=.\jpeg\jdmaster.c
# ADD CPP /Zi /I ".." # ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu # SUBTRACT CPP /YX /Yc /Yu
!ENDIF !ENDIF
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -1847,7 +1847,7 @@ SOURCE=.\jpeg\jdmerge.c
# ADD CPP /Zi /I ".." # ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu # SUBTRACT CPP /YX /Yc /Yu
!ENDIF !ENDIF
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -1864,7 +1864,7 @@ SOURCE=.\jpeg\jdphuff.c
# ADD CPP /Zi /I ".." # ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu # SUBTRACT CPP /YX /Yc /Yu
!ENDIF !ENDIF
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -1881,7 +1881,7 @@ SOURCE=.\jpeg\jdpostct.c
# ADD CPP /Zi /I ".." # ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu # SUBTRACT CPP /YX /Yc /Yu
!ENDIF !ENDIF
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -1898,7 +1898,7 @@ SOURCE=.\jpeg\jdsample.c
# ADD CPP /Zi /I ".." # ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu # SUBTRACT CPP /YX /Yc /Yu
!ENDIF !ENDIF
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -1915,7 +1915,7 @@ SOURCE=.\jpeg\jdtrans.c
# ADD CPP /Zi /I ".." # ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu # SUBTRACT CPP /YX /Yc /Yu
!ENDIF !ENDIF
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -1932,7 +1932,7 @@ SOURCE=.\jpeg\jerror.c
# ADD CPP /Zi /I ".." # ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu # SUBTRACT CPP /YX /Yc /Yu
!ENDIF !ENDIF
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -1949,7 +1949,7 @@ SOURCE=.\jpeg\jfdctflt.c
# ADD CPP /Zi /I ".." # ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu # SUBTRACT CPP /YX /Yc /Yu
!ENDIF !ENDIF
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -1966,7 +1966,7 @@ SOURCE=.\jpeg\jfdctfst.c
# ADD CPP /Zi /I ".." # ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu # SUBTRACT CPP /YX /Yc /Yu
!ENDIF !ENDIF
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -1983,7 +1983,7 @@ SOURCE=.\jpeg\jfdctint.c
# ADD CPP /Zi /I ".." # ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu # SUBTRACT CPP /YX /Yc /Yu
!ENDIF !ENDIF
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -2000,7 +2000,7 @@ SOURCE=.\jpeg\jidctflt.c
# ADD CPP /Zi /I ".." # ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu # SUBTRACT CPP /YX /Yc /Yu
!ENDIF !ENDIF
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -2017,7 +2017,7 @@ SOURCE=.\jpeg\jidctfst.c
# ADD CPP /Zi /I ".." # ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu # SUBTRACT CPP /YX /Yc /Yu
!ENDIF !ENDIF
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -2034,7 +2034,7 @@ SOURCE=.\jpeg\jidctint.c
# ADD CPP /Zi /I ".." # ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu # SUBTRACT CPP /YX /Yc /Yu
!ENDIF !ENDIF
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -2051,7 +2051,7 @@ SOURCE=.\jpeg\jidctred.c
# ADD CPP /Zi /I ".." # ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu # SUBTRACT CPP /YX /Yc /Yu
!ENDIF !ENDIF
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -2068,7 +2068,7 @@ SOURCE=.\jpeg\jmemmgr.c
# ADD CPP /Zi /I ".." # ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu # SUBTRACT CPP /YX /Yc /Yu
!ENDIF !ENDIF
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -2085,7 +2085,7 @@ SOURCE=.\jpeg\jmemnobs.c
# ADD CPP /Zi /I ".." # ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu # SUBTRACT CPP /YX /Yc /Yu
!ENDIF !ENDIF
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -2102,7 +2102,7 @@ SOURCE=.\jpeg\jquant1.c
# ADD CPP /Zi /I ".." # ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu # SUBTRACT CPP /YX /Yc /Yu
!ENDIF !ENDIF
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -2119,7 +2119,7 @@ SOURCE=.\jpeg\jquant2.c
# ADD CPP /Zi /I ".." # ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu # SUBTRACT CPP /YX /Yc /Yu
!ENDIF !ENDIF
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -2136,7 +2136,7 @@ SOURCE=.\jpeg\jutils.c
# ADD CPP /Zi /I ".." # ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu # SUBTRACT CPP /YX /Yc /Yu
!ENDIF !ENDIF
# End Source File # End Source File
# End Group # End Group

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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