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

oops, neglected to include no end of v3.2.2.1 files

Browse Source
This commit is contained in:
Cheng 2023-10-15 10:13:45 +10:00
parent c14f1bc55b
commit 01d9a0d35c
No known key found for this signature in database
GPG Key ID: 571C3A9C3B9E6FCA
13 changed files with 39 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/make_release.yml vendored
View File

@ -40,10 +40,10 @@ jobs:
- name: Create Draft Release
# Note: use a fork of softprops/action-gh-release which includes
# https://github.com/softprops/action-gh-release/pull/254 fixing
# https://github.com/softprops/action-gh-release/pull/255 fixing
# updating the body of the draft releases. We should replace the SHA-1
# with a tag when an upstream release including this fix is made.
uses: vadz/action-gh-release@1460c8b8cca97de38c3557ca4a277b55f4971abc
uses: vadz/action-gh-release@4c1f6af6e1a4dbfc4691427d2822c34374d558a2
id: create_release
with:
name: wxWidgets ${{ inputs.version }}
@ -109,7 +109,7 @@ jobs:
type ..\..\..\checksums
- name: Add Files to the Release
uses: vadz/action-gh-release@1460c8b8cca97de38c3557ca4a277b55f4971abc
uses: vadz/action-gh-release@4c1f6af6e1a4dbfc4691427d2822c34374d558a2
with:
name: wxWidgets ${{ inputs.version }}
body_path: checksums

6
Makefile.in
View File

@ -2215,7 +2215,7 @@ LOCALE_LINGUAS = ca cs da de el es fi fr hu id it ja nl pl ru sl sv tr uk zh zh_
@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
@COND_USE_PLUGINS_0@PLUGIN_ADV_EXTRALIBS = $(EXTRALIBS_SDL)
@COND_PLATFORM_MACOSX_1@WXMACVERSION_CMD = \
@COND_PLATFORM_MACOSX_1@ -compatibility_version 3.0 -current_version 3.0
@COND_PLATFORM_MACOSX_1@ -compatibility_version 3.0 -current_version 3.1
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@ -13976,9 +13976,9 @@ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1___htmldll_library_link_LIBR_0 \
@COND_USE_SOVERSION_0@dll___targetsuf2 = .$(SO_SUFFIX)
@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@dll___targetsuf3 \
@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ = \
@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).0.2.0
@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).0.2.1
@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@dll___targetsuf3 \
@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.2.0.$(SO_SUFFIX)
@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.2.1.$(SO_SUFFIX)
@COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@dll___targetsuf3 = -0.$(SO_SUFFIX)
@COND_USE_SOVERSION_0@dll___targetsuf3 = .$(SO_SUFFIX)
@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).0

2
build/bakefiles/version.bkl
View File

@ -23,7 +23,7 @@
changes, change C:R:A to C:R+1:A
-->
<set var="WX_CURRENT">2</set>
<set var="WX_REVISION">0</set>
<set var="WX_REVISION">1</set>
<set var="WX_AGE">2</set>

2
build/cmake/config.cmake
View File

@ -145,7 +145,7 @@ function(wx_write_config)
set(WX_RELEASE ${wxMAJOR_VERSION}.${wxMINOR_VERSION})
set(WX_VERSION ${wxVERSION})
set(WX_SUBVERSION ${wxVERSION}.0)
set(WX_SUBVERSION ${wxVERSION}.1)
set(WX_FLAVOUR)
set(TOOLKIT_DIR ${wxBUILD_TOOLKIT})
set(TOOLKIT_VERSION)

2
build/tools/mingw/buildall.bat
View File

@ -11,7 +11,7 @@ rem Initialize the main log file with the current date and time
echo %date% %time% : wxWidgets-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER% build started > %MAINLOGFILE%
rem Loop through all versions of the compiler
for %%c in ( 730 810 1030 1210 ) do (
for %%c in ( 730 810 1030 1220 ) do (
rem For each version, create a 32 and a 64 bits build
for %%a in ( 32 64 ) do (
call officialbuild.bat %%c %%a

2
build/tools/mingw/parameters.bat
View File

@ -13,7 +13,7 @@ rem Check if architecture is present
if "%2" == "" goto :NOPARAMS
rem Define compiler's bin directory
if "%1" == "1210" (
if "%1" == "1220" (
set COMPBINDIR=G:\msys64\mingw%2\bin
) else (
set COMPBINDIR=G:\MinGW%1-%2\bin

20
configure vendored
View File

@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for wxWidgets 3.2.2.
# Generated by GNU Autoconf 2.69 for wxWidgets 3.2.2.1.
#
# Report bugs to <wx-dev@googlegroups.com>.
#
@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='wxWidgets'
PACKAGE_TARNAME='wxwidgets'
PACKAGE_VERSION='3.2.2'
PACKAGE_STRING='wxWidgets 3.2.2'
PACKAGE_VERSION='3.2.2.1'
PACKAGE_STRING='wxWidgets 3.2.2.1'
PACKAGE_BUGREPORT='wx-dev@googlegroups.com'
PACKAGE_URL=''
@ -2008,7 +2008,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 3.2.2 to adapt to many kinds of systems.
\`configure' configures wxWidgets 3.2.2.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@ -2078,7 +2078,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of wxWidgets 3.2.2:";;
short | recursive ) echo "Configuration of wxWidgets 3.2.2.1:";;
esac
cat <<\_ACEOF
@ -2580,7 +2580,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
wxWidgets configure 3.2.2
wxWidgets configure 3.2.2.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@ -3397,7 +3397,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 3.2.2, which was
It was created by wxWidgets $as_me 3.2.2.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@ -3861,7 +3861,7 @@ fi
wx_major_version_number=3
wx_minor_version_number=2
wx_release_number=2
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
@ -46428,7 +46428,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=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 3.2.2, which was
This file was extended by wxWidgets $as_me 3.2.2.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@ -46494,7 +46494,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
wxWidgets config.status 3.2.2
wxWidgets config.status 3.2.2.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"

4
configure.in
View File

@ -14,7 +14,7 @@ dnl ---------------------------------------------------------------------------
dnl initialization
dnl ---------------------------------------------------------------------------
AC_INIT([wxWidgets], [3.2.2], [wx-dev@googlegroups.com])
AC_INIT([wxWidgets], [3.2.2.1], [wx-dev@googlegroups.com])
dnl the file passed to AC_CONFIG_SRCDIR should be specific to our package
AC_CONFIG_SRCDIR([wx-config.in])
@ -41,7 +41,7 @@ dnl wx_release_number += 1
wx_major_version_number=3
wx_minor_version_number=2
wx_release_number=2
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

7
docs/changes.txt
View File

@ -232,6 +232,13 @@ Changes in behaviour which may result in build errors
minimum required version is now 2005.
3.2.2.1: (released 2023-02-13)
------------------------------
This hotfix corrects a regression in 3.2.2 which resulted in not drawing any
icons for the non-root item of wxGenericTreeCtrl in this release (see #23255).
3.2.2: (released 2023-02-08)
----------------------------

2
docs/publicity/announce.txt
View File

@ -24,7 +24,7 @@ and also improving locale-related code under Mac and Unix systems:
- wxUILocale::UseDefault() works for locales using different language and
region under Mac and fails when used for unsupported locale under Unix.
- New wxUILocale::GetSystemLocaleId() allows to retrive such locales IDs.
- New wxUILocale::GetSystemLocaleId() allows to retrieve such locales IDs.
- wxUILocale::GetCurrent() works currently for "C" locale under Mac.
Some other user-visible enhancements made in this release:

10
docs/readme.txt
View File

@ -1,5 +1,5 @@
wxWidgets 3.2.2 Release Notes
=============================
wxWidgets 3.2.2.1 Release Notes
===============================
Welcome to the new stable release of wxWidgets, a free and open source
cross-platform C++ framework for writing advanced GUI applications using
@ -25,7 +25,7 @@ download from:
or, for a more more permanent but less convenient to use link, from
* https://github.com/wxWidgets/wxWidgets/releases/tag/v3.2.2/
* https://github.com/wxWidgets/wxWidgets/releases/tag/v3.2.2.1/
Please see https://docs.wxwidgets.org/3.2.2/overview_install.html for full
installation instructions.
@ -48,7 +48,7 @@ and also improving locale-related code under Mac and Unix systems:
- wxUILocale::UseDefault() works for locales using different language and
region under Mac and fails when used for unsupported locale under Unix.
- New wxUILocale::GetSystemLocaleId() allows to retrive such locales IDs.
- New wxUILocale::GetSystemLocaleId() allows to retrieve such locales IDs.
- wxUILocale::GetCurrent() works currently for "C" locale under Mac.
Some other user-visible enhancements made in this release:
@ -74,7 +74,7 @@ There are also some important bug fixes:
All in all, this release includes ~150 fixes from 27 unique contributors,
please see the full change log for more details:
https://raw.githubusercontent.com/wxWidgets/wxWidgets/v3.2.2/docs/changes.txt
https://raw.githubusercontent.com/wxWidgets/wxWidgets/v3.2.2.1/docs/changes.txt
This release is API and ABI-compatible with the previous 3.2.x releases, so
the existing applications don't even need to be rebuilt to profit from all the

4
include/wx/osx/config_xcode.h
View File

@ -121,9 +121,9 @@
#define PACKAGE_BUGREPORT "wx-dev@googlegroups.com"
#define PACKAGE_NAME "wxWidgets"
#define PACKAGE_STRING "wxWidgets 3.2.2"
#define PACKAGE_STRING "wxWidgets 3.2.2.1"
#define PACKAGE_TARNAME "wxwidgets"
#define PACKAGE_VERSION "3.2.2"
#define PACKAGE_VERSION "3.2.2.1"
// for jpeg

4
src/generic/treectlg.cpp
View File

@ -2708,7 +2708,7 @@ void wxGenericTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc)
dc,
item->GetX(),
item->GetY() +
total_h > state_h ? (total_h-state_h)/2 : 0);
(total_h > state_h ? (total_h-state_h)/2 : 0));
}
if ( image != NO_IMAGE )
@ -2719,7 +2719,7 @@ void wxGenericTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc)
dc,
item->GetX() + state_w,
item->GetY() +
total_h > image_h ? (total_h-image_h)/2 : 0);
(total_h > image_h ? (total_h-image_h)/2 : 0));
}
dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT);