Fixed GetIcon to keep up with return type change on all other platforms.

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

diff --git a/src/html/htmlpars.cpp b/src/html/htmlpars.cpp
index 035cb90dbca1255740a65ef7645fab9b4de5e216..d6b6ab4c3230b96678f2e3c588c9405e6bc5c450 100644 (file)
--- a/src/html/htmlpars.cpp
+++ b/src/html/htmlpars.cpp
@@ -4,14 +4,9 @@
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik

-// Licence:     wxWidgets Licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "htmlpars.h"
-#endif
-

 #include "wx/wxprec.h"
 
 #include "wx/defs.h"
 #include "wx/wxprec.h"
 
 #include "wx/defs.h"


@@ -43,6 +38,8 @@
 #include "wx/app.h"
 WX_CHECK_BUILD_OPTIONS("wxHTML")
 
 #include "wx/app.h"
 WX_CHECK_BUILD_OPTIONS("wxHTML")
 

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

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


@@ -55,7 +52,7 @@ public:
 };
 
 WX_DECLARE_OBJARRAY(wxHtmlTextPiece, wxHtmlTextPieces);
 };
 
 WX_DECLARE_OBJARRAY(wxHtmlTextPiece, wxHtmlTextPieces);

-WX_DEFINE_OBJARRAY(wxHtmlTextPieces);
+WX_DEFINE_OBJARRAY(wxHtmlTextPieces)

 
 class wxHtmlParserState
 {
 
 class wxHtmlParserState
 {


@@ -117,7 +114,7 @@ wxObject* wxHtmlParser::Parse(const wxString& source)
 void wxHtmlParser::InitParser(const wxString& source)
 {
     SetSource(source);
 void wxHtmlParser::InitParser(const wxString& source)
 {
     SetSource(source);

-    m_stopParsing = FALSE;
+    m_stopParsing = false;

 }
 
 void wxHtmlParser::DoneParser()
 }
 
 void wxHtmlParser::DoneParser()


@@ -202,7 +199,7 @@ void wxHtmlParser::CreateDOMSubTree(wxHtmlTag *cur,
 
             // add another tag to the tree:
             else if (i < end_pos-1 && m_Source.GetChar(i+1) != wxT('/'))
 
             // add another tag to the tree:
             else if (i < end_pos-1 && m_Source.GetChar(i+1) != wxT('/'))

-               {
+            {

                 wxHtmlTag *chd;
                 if (cur)
                     chd = new wxHtmlTag(cur, m_Source,
                 wxHtmlTag *chd;
                 if (cur)
                     chd = new wxHtmlTag(cur, m_Source,


@@ -235,7 +232,7 @@ void wxHtmlParser::CreateDOMSubTree(wxHtmlTag *cur,
                 }
                 else
                     i = chd->GetBeginPos();
                 }
                 else
                     i = chd->GetBeginPos();

-                
+

                 textBeginning = i;
             }
 
                 textBeginning = i;
             }
 


@@ -307,14 +304,10 @@ void wxHtmlParser::DoParsing(int begin_pos, int end_pos)
         }
         else if (m_CurTag)
         {
         }
         else if (m_CurTag)
         {

-            // Add tag:
-            if (m_CurTag)
-            {
-                if (m_CurTag->HasEnding())
-                    begin_pos = m_CurTag->GetEndPos2();
-                else
-                    begin_pos = m_CurTag->GetBeginPos();
-            }
+            if (m_CurTag->HasEnding())
+                begin_pos = m_CurTag->GetEndPos2();
+            else
+                begin_pos = m_CurTag->GetBeginPos();

             wxHtmlTag *t = m_CurTag;
             m_CurTag = m_CurTag->GetNextTag();
             AddTag(*t);
             wxHtmlTag *t = m_CurTag;
             m_CurTag = m_CurTag->GetNextTag();
             AddTag(*t);


@@ -328,7 +321,7 @@ void wxHtmlParser::DoParsing(int begin_pos, int end_pos)
 void wxHtmlParser::AddTag(const wxHtmlTag& tag)
 {
     wxHtmlTagHandler *h;
 void wxHtmlParser::AddTag(const wxHtmlTag& tag)
 {
     wxHtmlTagHandler *h;

-    bool inner = FALSE;
+    bool inner = false;

 
     h = (wxHtmlTagHandler*) m_HandlersHash.Get(tag.GetName());
     if (h)
 
     h = (wxHtmlTagHandler*) m_HandlersHash.Get(tag.GetName());
     if (h)


@@ -358,7 +351,7 @@ void wxHtmlParser::AddTagHandler(wxHtmlTagHandler *handler)
     handler->SetParser(this);
 }
 
     handler->SetParser(this);
 }
 

-void wxHtmlParser::PushTagHandler(wxHtmlTagHandler *handler, wxString tags)
+void wxHtmlParser::PushTagHandler(wxHtmlTagHandler *handler, const wxString& tags)

 {
     wxStringTokenizer tokenizer(tags, wxT(", "));
     wxString key;
 {
     wxStringTokenizer tokenizer(tags, wxT(", "));
     wxString key;


@@ -422,7 +415,7 @@ void wxHtmlParser::SetSourceAndSaveState(const wxString& src)
 
 bool wxHtmlParser::RestoreState()
 {
 
 bool wxHtmlParser::RestoreState()
 {

-    if (!m_SavedStates) return FALSE;
+    if (!m_SavedStates) return false;

 
     DestroyDOMTree();
 
 
     DestroyDOMTree();
 


@@ -436,7 +429,7 @@ bool wxHtmlParser::RestoreState()
     m_Source = s->m_source;
 
     delete s;
     m_Source = s->m_source;
 
     delete s;

-    return TRUE;
+    return true;

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -489,7 +482,7 @@ wxString wxHtmlEntitiesParser::Parse(const wxString& input)
     const wxChar *c, *last;
     const wxChar *in_str = input.c_str();
     wxString output;
     const wxChar *c, *last;
     const wxChar *in_str = input.c_str();
     wxString output;

-    
+

     output.reserve(input.length());
 
     for (c = in_str, last = in_str; *c != wxT('\0'); c++)
     output.reserve(input.length());
 
     for (c = in_str, last = in_str; *c != wxT('\0'); c++)


@@ -499,11 +492,11 @@ wxString wxHtmlEntitiesParser::Parse(const wxString& input)
             if (c - last > 0)
                 output.append(last, c - last);
             if (++c == wxT('\0')) break;
             if (c - last > 0)
                 output.append(last, c - last);
             if (++c == wxT('\0')) break;

-        
+

             wxString entity;
             const wxChar *ent_s = c;
             wxChar entity_char;
             wxString entity;
             const wxChar *ent_s = c;
             wxChar entity_char;

-        
+

             for (; (*c >= wxT('a') && *c <= wxT('z')) ||
                    (*c >= wxT('A') && *c <= wxT('Z')) ||
                    (*c >= wxT('0') && *c <= wxT('9')) ||
             for (; (*c >= wxT('a') && *c <= wxT('z')) ||
                    (*c >= wxT('A') && *c <= wxT('Z')) ||
                    (*c >= wxT('0') && *c <= wxT('9')) ||


@@ -517,7 +510,9 @@ wxString wxHtmlEntitiesParser::Parse(const wxString& input)
             else
             {
                 output.append(ent_s-1, c-ent_s+2);
             else
             {
                 output.append(ent_s-1, c-ent_s+2);

-                wxLogDebug(wxT("Unrecognized HTML entity: '%s'"), entity.c_str());
+                wxLogTrace(wxTRACE_HTML_DEBUG,
+                           wxT("Unrecognized HTML entity: '%s'"),
+                           entity.c_str());

             }
         }
     }
             }
         }
     }


@@ -853,11 +848,11 @@ wxChar wxHtmlEntitiesParser::GetEntityChar(const wxString& entity)
         return GetCharForCode(code);
 }
 
         return GetCharForCode(code);
 }
 

-wxFSFile *wxHtmlParser::OpenURL(wxHtmlURLType WXUNUSED(type), 
+wxFSFile *wxHtmlParser::OpenURL(wxHtmlURLType WXUNUSED(type),

                                 const wxString& url) const
 {
     return m_FS ? m_FS->OpenFile(url) : NULL;
                                 const wxString& url) const
 {
     return m_FS ? m_FS->OpenFile(url) : NULL;

-    
+

 }
 
 
 }
 
 


@@ -896,7 +891,7 @@ bool wxMetaTagHandler::HandleTag(const wxHtmlTag& tag)
     if (tag.GetName() == _T("BODY"))
     {
         m_Parser->StopParsing();
     if (tag.GetName() == _T("BODY"))
     {
         m_Parser->StopParsing();

-        return FALSE;
+        return false;

     }
 
     if (tag.HasParam(_T("HTTP-EQUIV")) &&
     }
 
     if (tag.HasParam(_T("HTTP-EQUIV")) &&


@@ -910,7 +905,7 @@ bool wxMetaTagHandler::HandleTag(const wxHtmlTag& tag)
             m_Parser->StopParsing();
         }
     }
             m_Parser->StopParsing();
         }
     }

-    return FALSE;
+    return false;

 }
 
 
 }
 
 


@@ -918,9 +913,13 @@ bool wxMetaTagHandler::HandleTag(const wxHtmlTag& tag)
 wxString wxHtmlParser::ExtractCharsetInformation(const wxString& markup)
 {
     wxString charset;
 wxString wxHtmlParser::ExtractCharsetInformation(const wxString& markup)
 {
     wxString charset;

-    wxMetaTagParser parser;
-    parser.AddTagHandler(new wxMetaTagHandler(&charset));
-    parser.Parse(markup);
+    wxMetaTagParser *parser = new wxMetaTagParser();
+    if(parser)
+    {
+        parser->AddTagHandler(new wxMetaTagHandler(&charset));
+        parser->Parse(markup);
+        delete parser;
+    }

     return charset;
 }
 
     return charset;
 }