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
src/html/htmltag.cpp
View File

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