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

Replace wxT() with wxS() in image options definitions.

Browse Source 
The optimal way of creating a literal strings consisting of only ASCII
characters is to use wxS() as this avoids the need for run-time conversion in
all builds while wxT() requires a conversion from wchar_t to UTF-8 in UTF-8
builds. So replace wxT() with wxS() in wxImage options definitions.

Also remove wxT() from the options documentation, it's just useless there.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69760 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2011-11-14 13:35:52 +00:00
parent b6963858fb
commit 31fb3cfe02
2 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
include/wx/image.h
View File

@@ -28,20 +28,20 @@
// which breaks the compilation below
#undef index
#define wxIMAGE_OPTION_QUALITY wxString(wxT("quality"))
#define wxIMAGE_OPTION_FILENAME wxString(wxT("FileName"))
#define wxIMAGE_OPTION_QUALITY wxString(wxS("quality"))
#define wxIMAGE_OPTION_FILENAME wxString(wxS("FileName"))
#define wxIMAGE_OPTION_RESOLUTION wxString(wxT("Resolution"))
#define wxIMAGE_OPTION_RESOLUTIONX wxString(wxT("ResolutionX"))
#define wxIMAGE_OPTION_RESOLUTIONY wxString(wxT("ResolutionY"))
#define wxIMAGE_OPTION_RESOLUTION wxString(wxS("Resolution"))
#define wxIMAGE_OPTION_RESOLUTIONX wxString(wxS("ResolutionX"))
#define wxIMAGE_OPTION_RESOLUTIONY wxString(wxS("ResolutionY"))
#define wxIMAGE_OPTION_RESOLUTIONUNIT wxString(wxT("ResolutionUnit"))
#define wxIMAGE_OPTION_RESOLUTIONUNIT wxString(wxS("ResolutionUnit"))
#define wxIMAGE_OPTION_MAX_WIDTH wxString(wxT("MaxWidth"))
#define wxIMAGE_OPTION_MAX_HEIGHT wxString(wxT("MaxHeight"))
#define wxIMAGE_OPTION_MAX_WIDTH wxString(wxS("MaxWidth"))
#define wxIMAGE_OPTION_MAX_HEIGHT wxString(wxS("MaxHeight"))
#define wxIMAGE_OPTION_ORIGINAL_WIDTH wxString(wxT("OriginalWidth"))
#define wxIMAGE_OPTION_ORIGINAL_HEIGHT wxString(wxT("OriginalHeight"))
#define wxIMAGE_OPTION_ORIGINAL_WIDTH wxString(wxS("OriginalWidth"))
#define wxIMAGE_OPTION_ORIGINAL_HEIGHT wxString(wxS("OriginalHeight"))
// constants used with wxIMAGE_OPTION_RESOLUTIONUNIT
//