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

removed wxSTRING_TEXT() macro in favour of wxS()

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50991 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2008-01-02 17:33:31 +00:00
parent efc5f7eb98
commit d9359369af
3 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/string.h
View File

@@ -78,14 +78,6 @@ class WXDLLIMPEXP_FWD_BASE wxString;
#define wxMBSTRINGCAST (char *)(const char *) #define wxMBSTRINGCAST (char *)(const char *)
#define wxWCSTRINGCAST (wchar_t *)(const wchar_t *) #define wxWCSTRINGCAST (wchar_t *)(const wchar_t *)
// like _T(), but for literals in wxString's internal representation, i.e.
// char* in UTF-8 build and wxChar* otherwise:
#if wxUSE_UNICODE_UTF8
#define wxSTRING_TEXT(str) str
#else
#define wxSTRING_TEXT(str) _T(str)
#endif
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// constants // constants
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

8
src/html/htmlpars.cpp
View File

@@ -564,13 +564,13 @@ wxChar wxHtmlEntitiesParser::GetEntityChar(const wxString& entity) const
const wxStringCharType *ent_s = entity.wx_str(); const wxStringCharType *ent_s = entity.wx_str();
const wxStringCharType *format; const wxStringCharType *format;
if (ent_s[1] == wxSTRING_TEXT('x') || ent_s[1] == wxSTRING_TEXT('X')) if (ent_s[1] == wxS('x') || ent_s[1] == wxS('X'))
{ {
format = wxSTRING_TEXT("%x"); format = wxS("%x");
ent_s++; ent_s++;
} }
else else
format = wxSTRING_TEXT("%u"); format = wxS("%u");
ent_s++; ent_s++;
if (wxSscanf(ent_s, format, &code) != 1) if (wxSscanf(ent_s, format, &code) != 1)
@@ -580,7 +580,7 @@ wxChar wxHtmlEntitiesParser::GetEntityChar(const wxString& entity) const
{ {
// store the literals in wx's internal representation (either char* // store the literals in wx's internal representation (either char*
// in UTF-8 or wchar_t*) for best performance: // in UTF-8 or wchar_t*) for best performance:
#define ENTITY(name, code) { wxSTRING_TEXT(name), code } #define ENTITY(name, code) { wxS(name), code }
static wxHtmlEntityInfo substitutions[] = { static wxHtmlEntityInfo substitutions[] = {
ENTITY("AElig", 198), ENTITY("AElig", 198),

6
src/html/htmltag.cpp
View File

@@ -69,8 +69,8 @@ bool wxIsCDATAElement(const wxChar *tag)
bool wxIsCDATAElement(const wxString& tag) bool wxIsCDATAElement(const wxString& tag)
{ {
return (wxStrcmp(tag.wx_str(), wxSTRING_TEXT("SCRIPT")) == 0) || return (wxStrcmp(tag.wx_str(), wxS("SCRIPT")) == 0) ||
(wxStrcmp(tag.wx_str(), wxSTRING_TEXT("STYLE")) == 0); (wxStrcmp(tag.wx_str(), wxS("STYLE")) == 0);
} }
wxHtmlTagsCache::wxHtmlTagsCache(const wxString& source) wxHtmlTagsCache::wxHtmlTagsCache(const wxString& source)
@@ -473,7 +473,7 @@ bool wxHtmlTag::GetParamAsColour(const wxString& par, wxColour *clr) const
if (str.length() > 1 && str[0] != _T('#')) if (str.length() > 1 && str[0] != _T('#'))
{ {
#define HTML_COLOUR(name, r, g, b) \ #define HTML_COLOUR(name, r, g, b) \
if (str.IsSameAs(wxSTRING_TEXT(name), false)) \ if (str.IsSameAs(wxS(name), false)) \
{ clr->Set(r, g, b); return true; } { clr->Set(r, g, b); return true; }
HTML_COLOUR("black", 0x00,0x00,0x00) HTML_COLOUR("black", 0x00,0x00,0x00)
HTML_COLOUR("silver", 0xC0,0xC0,0xC0) HTML_COLOUR("silver", 0xC0,0xC0,0xC0)