Removed hard-coded timer Id in wxAUI for the transparent hint fade functionality...

[wxWidgets.git] / src / html / htmlpars.cpp

diff --git a/src/html/htmlpars.cpp b/src/html/htmlpars.cpp
index ba8154d00dad9e6ef9524808538304e30149abc8..3f0d762d42433c2566d80862b0f2bf33d86fa7cc 100644 (file)
--- a/src/html/htmlpars.cpp
+++ b/src/html/htmlpars.cpp
@@ -38,7 +38,7 @@
 // DLL options compatibility check:
 WX_CHECK_BUILD_OPTIONS("wxHTML")
 
 // DLL options compatibility check:
 WX_CHECK_BUILD_OPTIONS("wxHTML")
 

-const wxChar *wxTRACE_HTML_DEBUG = _T("htmldebug");
+const wxChar *wxTRACE_HTML_DEBUG = wxT("htmldebug");

 
 //-----------------------------------------------------------------------------
 // wxHtmlParser helpers
 
 //-----------------------------------------------------------------------------
 // wxHtmlParser helpers


@@ -897,7 +897,7 @@ public:
 protected:
     virtual void AddText(const wxString& WXUNUSED(txt)) {}
 
 protected:
     virtual void AddText(const wxString& WXUNUSED(txt)) {}
 

-    DECLARE_NO_COPY_CLASS(wxMetaTagParser)
+    wxDECLARE_NO_COPY_CLASS(wxMetaTagParser);

 };
 
 class wxMetaTagHandler : public wxHtmlTagHandler
 };
 
 class wxMetaTagHandler : public wxHtmlTagHandler


@@ -910,23 +910,23 @@ public:
 private:
     wxString *m_retval;
 
 private:
     wxString *m_retval;
 

-    DECLARE_NO_COPY_CLASS(wxMetaTagHandler)
+    wxDECLARE_NO_COPY_CLASS(wxMetaTagHandler);

 };
 
 bool wxMetaTagHandler::HandleTag(const wxHtmlTag& tag)
 {
 };
 
 bool wxMetaTagHandler::HandleTag(const wxHtmlTag& tag)
 {

-    if (tag.GetName() == _T("BODY"))
+    if (tag.GetName() == wxT("BODY"))

     {
         m_Parser->StopParsing();
         return false;
     }
 
     {
         m_Parser->StopParsing();
         return false;
     }
 

-    if (tag.HasParam(_T("HTTP-EQUIV")) &&
-        tag.GetParam(_T("HTTP-EQUIV")).IsSameAs(_T("Content-Type"), false) &&
-        tag.HasParam(_T("CONTENT")))
+    if (tag.HasParam(wxT("HTTP-EQUIV")) &&
+        tag.GetParam(wxT("HTTP-EQUIV")).IsSameAs(wxT("Content-Type"), false) &&
+        tag.HasParam(wxT("CONTENT")))

     {
     {

-        wxString content = tag.GetParam(_T("CONTENT")).Lower();
-        if (content.Left(19) == _T("text/html; charset="))
+        wxString content = tag.GetParam(wxT("CONTENT")).Lower();
+        if (content.Left(19) == wxT("text/html; charset="))

         {
             *m_retval = content.Mid(19);
             m_Parser->StopParsing();
         {
             *m_retval = content.Mid(19);
             m_Parser->StopParsing();


@@ -955,7 +955,7 @@ bool
 wxHtmlParser::SkipCommentTag(wxString::const_iterator& start,
                              wxString::const_iterator end)
 {
 wxHtmlParser::SkipCommentTag(wxString::const_iterator& start,
                              wxString::const_iterator end)
 {

-    wxASSERT_MSG( *start == '<', _T("should be called on the tag start") );
+    wxASSERT_MSG( *start == '<', wxT("should be called on the tag start") );

 
     wxString::const_iterator p = start;
 
 
     wxString::const_iterator p = start;