[Git][wxwidgets/wxwidgets][master] 8 commits: Update Tamil translations

[Vadim Zeitlin (@_VZ_)]

Vadim Zeitlin pushed to branch master at wxWidgets / wxWidgets

Commits:

• fede413e
  by DINAKAR T.D at 2025-08-29T02:45:26+02:00

  Update Tamil translations
  
  Grammar corrections.
  

• ea4c83dc
  by Vadim Zeitlin at 2025-08-30T15:00:27+02:00

  Ignore failure of wxGrid column width test with wxQt5
  
  This keeps happening in the CI runs, so ignore the failure for now to
  prevent it from breaking all the unrelated PRs.
  

• 0d0d2a8f
  by Vadim Zeitlin at 2025-08-30T15:01:49+02:00

  Simplify and make more precise wxAppConsole description
  
  Don't speak about "hybrid apps" without defining what they are.
  
  Closes #25741.
  

• 807aeb25
  by Lauri Nurmi at 2025-08-30T15:05:40+02:00

  Move Christmas to December from the 13th month
  

• ab967cac
  by Lauri Nurmi at 2025-08-30T15:05:40+02:00

  Remove meaningless continue statements
  

• 9bbb2dfb
  by Lauri Nurmi at 2025-08-30T15:05:40+02:00

  Test only one wxDateTimeHolidayAuthority at a time
  
  wxDateTimeChristianHolidays was tested with a wxDateTimeUSCatholicFeasts
  already existing and taking precedence. I.e. the tests for Christmas in
  ChristianHolidays actually tested (again) the USCatholicFeasts
  implementation.
  
  This reveals an off-by-one bug in wxDateTimeChristianHolidays::DoIsHoliday(),
  which doesn't use the enum symbol for month, and declares Christmas to be
  on the 25th day of the 13th month.
  
  Further, this raises the question whether it is a bad idea to have the
  authority implementations in a header. Fixing bugs like this would
  require recompiling the application, instead of simply updating the
  DLL/dylib.
  

• ae6fd756
  by Vadim Zeitlin at 2025-08-30T15:05:49+02:00

  Merge branch 'datetime-holiday-fixes' og github.com:lanurmi:test-single-authority
  
  Fix Christmas date and fix tests for wxDateTime holidays which prevented
  it from being found earlier.
  
  See #25729.
  

• fd0c23ee
  by Vadim Zeitlin at 2025-08-30T16:33:39+02:00

  Add wxString::AssignFromUTF8() function
  
  This can be used to optimize repeated conversions from UTF-8 by reusing
  the string buffer.
  
  See #25740.
  

9 changed files:

• include/wx/datetime.h
• include/wx/string.h
• interface/wx/app.h
• interface/wx/string.h
• locale/ta.po
• src/common/datetime.cpp
• tests/controls/gridtest.cpp
• tests/datetime/datetimetest.cpp
• tests/strings/strings.cpp

Changes:

• include/wx/datetime.h

  ---

  ...	...	@@ -1689,7 +1689,7 @@ protected:
  1689	1689	bool DoIsHoliday(const wxDateTime& dt) const override
  1690	1690	{
  1691	1691	if (dt.IsSameDate(GetEaster(dt.GetYear())) ||
  1692		- (dt.GetMonth() == 12 && dt.GetDay() == 25))
  	1692	+ (dt.GetMonth() == wxDateTime::Month::Dec && dt.GetDay() == 25))
  1693	1693	{
  1694	1694	return true;
  1695	1695	}

  
  
• include/wx/string.h

  ---

  ...	...	@@ -1745,6 +1745,20 @@ public:
  1745	1745	return FromImpl(std::move(utf8));
  1746	1746	}
  1747	1747
  	1748	+ void AssignFromUTF8Unchecked(const char *utf8, size_t len = npos)
  	1749	+ {
  	1750	+ m_impl.assign(utf8, len == npos ? strlen(utf8) : len);
  	1751	+ }
  	1752	+ void AssignFromUTF8(const char *utf8, size_t len = npos)
  	1753	+ {
  	1754	+ if ( !utf8 || !wxStringOperations::IsValidUtf8String(utf8) )
  	1755	+ {
  	1756	+ clear();
  	1757	+ return;
  	1758	+ }
  	1759	+ AssignFromUTF8Unchecked(utf8, len);
  	1760	+ }
  	1761	+
  1748	1762	std::string utf8_string() const { return m_impl; }
  1749	1763
  1750	1764	const wxScopedCharBuffer utf8_str() const
  ...	...	@@ -1768,6 +1782,56 @@ public:
  1768	1782	static wxString FromUTF8Unchecked(const std::string& utf8)
  1769	1783	{ return FromUTF8Unchecked(utf8.c_str(), utf8.length()); }
  1770	1784
  	1785	+ void AssignFromUTF8Unchecked(const char *utf8, size_t len = npos)
  	1786	+ {
  	1787	+ if ( len == npos )
  	1788	+ len = strlen(utf8);
  	1789	+
  	1790	+ wxMBConvStrictUTF8 conv;
  	1791	+ if ( m_impl.size() > len )
  	1792	+ {
  	1793	+ // We can be sure that the conversion result fits into the
  	1794	+ // existing buffer, so use it directly.
  	1795	+ m_impl.resize(conv.ToWChar(ImplData(), m_impl.size(), utf8, len));
  	1796	+ }
  	1797	+ else
  	1798	+ {
  	1799	+ // We can't be sure that the conversion result fits into the
  	1800	+ // existing buffer, so compute the length we need.
  	1801	+ m_impl.resize(conv.ToWChar(nullptr, 0, utf8, len));
  	1802	+ conv.ToWChar(ImplData(), m_impl.size(), utf8, len);
  	1803	+ }
  	1804	+ }
  	1805	+ void AssignFromUTF8(const char *utf8, size_t len = npos)
  	1806	+ {
  	1807	+ if ( !utf8 )
  	1808	+ {
  	1809	+ clear();
  	1810	+ return;
  	1811	+ }
  	1812	+
  	1813	+ if ( len == npos )
  	1814	+ len = strlen(utf8);
  	1815	+
  	1816	+ wxMBConvStrictUTF8 conv;
  	1817	+ if ( m_impl.size() > len )
  	1818	+ {
  	1819	+ m_impl.resize(conv.ToWChar(ImplData(), m_impl.size(), utf8, len));
  	1820	+ }
  	1821	+ else
  	1822	+ {
  	1823	+ const auto needed = conv.ToWChar(nullptr, 0, utf8, len);
  	1824	+ if ( needed == wxCONV_FAILED )
  	1825	+ {
  	1826	+ clear();
  	1827	+ return;
  	1828	+ }
  	1829	+
  	1830	+ m_impl.resize(needed);
  	1831	+ conv.ToWChar(ImplData(), m_impl.size(), utf8, len);
  	1832	+ }
  	1833	+ }
  	1834	+
  1771	1835	std::string utf8_string() const { return ToStdString(wxMBConvUTF8()); }
  1772	1836	const wxScopedCharBuffer utf8_str() const { return mb_str(wxMBConvUTF8()); }
  1773	1837	#endif // wxUSE_UNICODE_UTF8/wxUSE_UNICODE_WCHAR
  ...	...	@@ -3656,6 +3720,14 @@ private:
  3656	3720	private:
  3657	3721	wxStringImpl m_impl;
  3658	3722
  	3723	+ // Get access to the string buffer: we assume that we can always rely on
  	3724	+ // C++17 semantics of data(), even when not using C++17, which seems
  	3725	+ // reasonable as C++17 mostly standardized existing practice.
  	3726	+ wxStringCharType* ImplData()
  	3727	+ {
  	3728	+ return const_cast<wxStringCharType*>(m_impl.data());
  	3729	+ }
  	3730	+
  3659	3731	// buffers for compatibility conversion from (char*)c_str() and
  3660	3732	// (wchar_t*)c_str(): the pointers returned by these functions should remain
  3661	3733	// valid until the string itself is modified for compatibility with the

  
  
• interface/wx/app.h

  ---

  ...	...	@@ -9,8 +9,7 @@
  9	9	/**
  10	10	@class wxAppConsole
  11	11
  12		- This class is essential for writing console-only or hybrid apps without
  13		- having to define @c wxUSE_GUI=0.
  	12	+ This class us used instead of wxApp for console applications.
  14	13
  15	14	It is used to:
  16	15	@li set and get application-wide properties (see wxAppConsole::CreateTraits
  ...	...	@@ -31,6 +30,8 @@
  31	30	(which returns a reference to your application object) to be visible to other
  32	31	files.
  33	32
  	33	+ Note that setting @c wxUSE_GUI=0 makes wxApp identical to this class.
  	34	+
  34	35	@library{wxbase}
  35	36	@category{appmanagement}
  36	37

  
  
• interface/wx/string.h

  ---

  ...	...	@@ -527,6 +527,34 @@ public:
  527	527	*/
  528	528	wxString operator =(wxUniChar c);
  529	529
  	530	+ /**
  	531	+ Assignment from UTF-8 string.
  	532	+
  	533	+ Calling `s.AssignFromUTF8(utf8, len) is equivalent to doing
  	534	+ `s = wxString::FromUTF8(utf8, len)` but may be more efficient as it can
  	535	+ reuse the existing string buffer instead of always having to allocate a
  	536	+ new one.
  	537	+
  	538	+ This function can be useful in performance-sensitive loops or with
  	539	+ static variables (retaining their buffer between calls) in often called
  	540	+ functions.
  	541	+
  	542	+ @since 3.3.2
  	543	+ */
  	544	+ void AssignFromUTF8(const char *utf8, size_t len = npos);
  	545	+
  	546	+ /**
  	547	+ Assignment from UTF-8 string.
  	548	+
  	549	+ This function is the same as AssignFromUTF8() but doesn't check that
  	550	+ @a utf8 is a valid pointer to a valid UTF-8 string. It must not be
  	551	+ called if @a utf8 is @NULL or its contents is not already known to be
  	552	+ correct UTF-8.
  	553	+
  	554	+ @since 3.3.2
  	555	+ */
  	556	+ void AssignFromUTF8Unchecked(const char *utf8, size_t len = npos);
  	557	+
  530	558	///@}
  531	559
  532	560
  ...	...	@@ -2018,6 +2046,8 @@ public:
  2018	2046	The overload taking @c std::string_view is only available starting with
  2019	2047	wxWidgets 3.3.0 and requires the consumer application to use C++17.
  2020	2048
  	2049	+ @see AssignFromUTF8()
  	2050	+
  2021	2051	@since 2.8.4
  2022	2052	*/
  2023	2053	static wxString FromUTF8(const char* s);
  ...	...	@@ -2046,6 +2076,8 @@ public:
  2046	2076	The overload taking @c std::string_view is only available starting with
  2047	2077	wxWidgets 3.3.0 and requires the consumer application to use C++17.
  2048	2078
  	2079	+ @see AssignFromUTF8Unchecked()
  	2080	+
  2049	2081	@since 2.8.9
  2050	2082	*/
  2051	2083	static wxString FromUTF8Unchecked(const char* s);

  
  
• locale/ta.po The diff for this file was not included because it is too large.
  
• src/common/datetime.cpp

  ---

  ...	...	@@ -2383,7 +2383,6 @@ size_t wxDateTimeUSCatholicFeasts::DoGetHolidaysInRange(const wxDateTime& dtStar
  2383	2383	if (DoIsHoliday(dt) )
  2384	2384	{
  2385	2385	holidays.Add(dt);
  2386		- continue;
  2387	2386	}
  2388	2387	}
  2389	2388
  ...	...	@@ -2405,7 +2404,6 @@ size_t wxDateTimeChristianHolidays::DoGetHolidaysInRange(const wxDateTime& dtSta
  2405	2404	if (DoIsHoliday(dt) )
  2406	2405	{
  2407	2406	holidays.Add(dt);
  2408		- continue;
  2409	2407	}
  2410	2408	}
  2411	2409

  
  
• tests/controls/gridtest.cpp

  ---

  ...	...	@@ -1720,6 +1720,18 @@ TEST_CASE_METHOD(GridTestCase, "Grid::ColumnMinWidth", "[grid]")
  1720	1720	sim.MouseUp();
  1721	1721	wxYield();
  1722	1722
  	1723	+#ifdef __WXQT__
  	1724	+ #if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
  	1725	+ if (m_grid->GetColSize(0) != newminwidth)
  	1726	+ {
  	1727	+ WARN("Ignoring known test failure under Qt5: column width is "
  	1728	+ << m_grid->GetColSize(0) << " instead of expected "
  	1729	+ << newminwidth);
  	1730	+ return;
  	1731	+ }
  	1732	+ #endif // QT < 6
  	1733	+#endif // __WXQT__
  	1734	+
  1723	1735	CHECK(m_grid->GetColSize(0) == newminwidth);
  1724	1736	#endif
  1725	1737	}

  
  
• tests/datetime/datetimetest.cpp

  ---

  ...	...	@@ -21,6 +21,7 @@
  21	21	#endif // WX_PRECOMP
  22	22
  23	23	#include "wx/wxcrt.h" // for wxStrstr()
  	24	+#include "wx/scopeguard.h"
  24	25
  25	26	#include "wx/private/localeset.h"
  26	27
  ...	...	@@ -2538,6 +2539,12 @@ TEST_CASE("Easter", "[datetime][holiday][easter]")
  2538	2539
  2539	2540	TEST_CASE("US Catholic Holidays", "[datetime][holiday]")
  2540	2541	{
  	2542	+ // Clear the wxDateTimeWorkDays that exists by default, and restore it at the end,
  	2543	+ // after cleaning up the authority tested here.
  	2544	+ wxDateTimeHolidayAuthority::ClearAllAuthorities();
  	2545	+ wxON_BLOCK_EXIT0(wxDateTimeHolidayAuthority::ClearAllAuthorities);
  	2546	+ wxON_BLOCK_EXIT1(wxDateTimeHolidayAuthority::AddAuthority, new wxDateTimeWorkDays);
  	2547	+
  2541	2548	SECTION("Ascension")
  2542	2549	{
  2543	2550	wxDateTime ascension = wxDateTimeUSCatholicFeasts::GetThursdayAscension(2023);
  ...	...	@@ -2565,6 +2572,12 @@ TEST_CASE("US Catholic Holidays", "[datetime][holiday]")
  2565	2572
  2566	2573	TEST_CASE("Christian Holidays", "[datetime][holiday][christian]")
  2567	2574	{
  	2575	+ // Clear the wxDateTimeWorkDays that exists by default, and restore it at the end,
  	2576	+ // after cleaning up the authority tested here.
  	2577	+ wxDateTimeHolidayAuthority::ClearAllAuthorities();
  	2578	+ wxON_BLOCK_EXIT0(wxDateTimeHolidayAuthority::ClearAllAuthorities);
  	2579	+ wxON_BLOCK_EXIT1(wxDateTimeHolidayAuthority::AddAuthority, new wxDateTimeWorkDays);
  	2580	+
  2568	2581	SECTION("Easter")
  2569	2582	{
  2570	2583	wxDateTime easter = wxDateTimeChristianHolidays::GetEaster(2023);

  
  
• tests/strings/strings.cpp

  ---

  ...	...	@@ -192,6 +192,22 @@ TEST_CASE("StringStaticConstructors", "[wxString]")
  192	192	//CHECK( wxString::FromUTF8("", 1).length() == 1 );
  193	193	}
  194	194
  	195	+TEST_CASE("StringAssignUTF8", "[wxString]")
  	196	+{
  	197	+ wxString s;
  	198	+ s.AssignFromUTF8("Oberfläche");
  	199	+ CHECK( s == wxString::FromUTF8("Oberfläche") );
  	200	+
  	201	+ s.AssignFromUTF8("fläche");
  	202	+ CHECK( s == wxString::FromUTF8("fläche") );
  	203	+
  	204	+ s.AssignFromUTF8("Even longer than Oberfläche");
  	205	+ CHECK( s == wxString::FromUTF8("Even longer than Oberfläche") );
  	206	+
  	207	+ s.AssignFromUTF8(nullptr);
  	208	+ CHECK( s == wxString() );
  	209	+}
  	210	+
  195	211	TEST_CASE("StringExtraction", "[wxString]")
  196	212	{
  197	213	wxString s(wxT("Hello, world!"));

  
  

—
View it on GitLab.
You're receiving this email because of your account on gitlab.com. Manage all notifications · Help Notification message regarding https://gitlab.com/wxwidgets/wxwidgets/-/compare/73ce975e1842cf1ae93a7ef57a774d62c4d6c989...fd0c23ee24c37035a4f87c963e4844b1e0bdb231 at 1756564648