slight optimization for wxHtmlEntitiesParser::GetEntityChar() in UTF-8 build: use...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48317 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/html/htmlpars.cpp b/src/html/htmlpars.cpp
index 4d7342ec30292df62da60161d2ad75d625221a29..1ea5e979ed529422635e0c96494ea670e85ba5a1 100644 (file)
--- a/src/html/htmlpars.cpp
+++ b/src/html/htmlpars.cpp
@@ -558,16 +558,18 @@ wxChar wxHtmlEntitiesParser::GetEntityChar(const wxString& entity) const
 
     if (entity[0] == wxT('#'))
     {
 
     if (entity[0] == wxT('#'))
     {

-        const wxChar *ent_s = entity.c_str();
-        const wxChar *format;
+        // NB: parsed value is a number, so it's OK to use wx_str(), internal
+        //     representation is the same for numbers
+        const wxStringCharType *ent_s = entity.wx_str();
+        const wxStringCharType *format;

 
 

-        if (ent_s[1] == wxT('x') || ent_s[1] == wxT('X'))
+        if (ent_s[1] == wxSTRING_TEXT('x') || ent_s[1] == wxSTRING_TEXT('X'))

         {
         {

-            format = wxT("%x");
+            format = wxSTRING_TEXT("%x");

             ent_s++;
         }
         else
             ent_s++;
         }
         else

-            format = wxT("%u");
+            format = wxSTRING_TEXT("%u");

         ent_s++;
 
         if (wxSscanf(ent_s, format, &code) != 1)
         ent_s++;
 
         if (wxSscanf(ent_s, format, &code) != 1)