Remove most occurrences of wxT() from the docs (PR #23436)

PB

unread,

Apr 9, 2023, 2:50:34 PM4/9/23

to wx-...@googlegroups.com, Subscribed

I have removed wxT() in most cases, leaving it only in:

Where a string literal is used in wxChar* arrays in wxPropertyGrid overview (e.g., here).
In wxIMAGE_OPTION_* defines.

BTW, I think the current description of wxT() may be incorrect:

wxWidgets/interface/wx/chartype.h

Lines 17 to 23 in d0e892a

	@code
	#ifdef UNICODE
	# define wxT(x) L##x
	#else // !Unicode
	# define wxT(x) x
	#endif
	@endcode

wxWidgets removed non-UNICODE build option in 3.3 and wxChar is always defined as wchar_t (i.e., regardless of the underlying wxString char type, so even in the UTF-8 build), therefore wxT() now always adds L (unlike wxS() which adds it only if wxUSE_UNICODE_WCHAR):

wxWidgets/include/wx/chartype.h

Lines 168 to 178 in d0e892a

	wxT ("wx text") macro turns a literal string constant into a wide char
	constant. It is mostly unnecessary with wx 2.9 but defined for
	compatibility.
	*/
	#ifndef wxT
	/*
	Notice that we use an intermediate macro to allow x to be expanded
	if it's a macro itself.
	*/
	#define wxT(x) wxCONCAT_HELPER(L, x)
	#endif /* !defined(wxT) */

BTW2, is it not high time to deprecate or even remove wxT_2() macro, its code comment says "wxT_2 exists only for compatibility with wx 2.x"?

You can view, comment on, or merge this pull request online at:

https://github.com/wxWidgets/wxWidgets/pull/23436

Commit Summary

d378444 Remove most occurrences of wxT() from the docs

File Changes

(12 files)

M docs/doxygen/overviews/mbconvclasses.h (2)
M docs/doxygen/overviews/nonenglish.h (2)
M docs/doxygen/overviews/richtextctrl.h (50)
M docs/doxygen/overviews/validator.h (2)
M docs/doxygen/overviews/xrc.h (16)
M interface/wx/aboutdlg.h (2)
M interface/wx/archive.h (4)
M interface/wx/html/helpwnd.h (2)
M interface/wx/richtext/richtextbuffer.h (20)
M interface/wx/spinctrl.h (2)
M interface/wx/stream.h (4)
M interface/wx/string.h (4)

Patch Links:

—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.

VZ

unread,

Apr 10, 2023, 8:28:53 AM4/10/23

to wx-...@googlegroups.com, Subscribed

Thanks, I've updated wxT() documentation and pushed it here, please let me know if you have any comments. As for wxT_2(), it seems to be used in a few projects, so we shouldn't remove it and so I've left its documentation as well, but made it even more clear that it is obsolete now.

—
Reply to this email directly, view it on GitHub, or unsubscribe.

You are receiving this because you are subscribed to this thread.

VZ

unread,

Apr 10, 2023, 8:28:56 AM4/10/23

to wx-...@googlegroups.com, Push

@vadz pushed 2 commits.

41d0313 Update wxT() documentation after ASCII build removal
60dacae Make it more clear that wxT_2() is obsolete

—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.

VZ

unread,

Apr 10, 2023, 10:23:38 AM4/10/23

to wx-...@googlegroups.com, Subscribed

Merged #23436 into master.

—
Reply to this email directly, view it on GitHub, or unsubscribe.

You are receiving this because you are subscribed to this thread.

PB

unread,

Apr 10, 2023, 10:23:44 AM4/10/23

to wx-...@googlegroups.com, Subscribed

Thanks, I have no comments.

—
Reply to this email directly, view it on GitHub, or unsubscribe.

You are receiving this because you are subscribed to this thread.

Reply all

Reply to author

Forward