corrected event type for standalone scrollbars (patch 1240385)

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

diff --git a/src/html/htmlpars.cpp b/src/html/htmlpars.cpp
index c9c59ab6008f55aa4fdf4dde917a2d7d096f4f8b..3b14f68f30bff7910df556bad62ea08959565bfe 100644 (file)
--- a/src/html/htmlpars.cpp
+++ b/src/html/htmlpars.cpp
@@ -4,11 +4,11 @@
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik

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

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

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "htmlpars.h"
 #endif
 
 #pragma implementation "htmlpars.h"
 #endif
 


@@ -35,11 +35,15 @@
 #include "wx/dynarray.h"
 #include "wx/arrimpl.cpp"
 
 #include "wx/dynarray.h"
 #include "wx/arrimpl.cpp"
 

+#ifdef __WXWINCE__
+    #include "wx/msw/wince/missing.h"       // for bsearch()
+#endif

 
 // DLL options compatibility check:
 #include "wx/app.h"
 WX_CHECK_BUILD_OPTIONS("wxHTML")
 
 // DLL options compatibility check:
 #include "wx/app.h"
 WX_CHECK_BUILD_OPTIONS("wxHTML")

-//static wxBuildOptionsChecker gs_optionsChecker;
+
+const wxChar *wxTRACE_HTML_DEBUG = _T("htmldebug");

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


@@ -115,7 +119,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()


@@ -200,7 +204,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,


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

-                
+

                 textBeginning = i;
             }
 
                 textBeginning = i;
             }
 


@@ -305,14 +309,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);


@@ -326,7 +326,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)


@@ -420,7 +420,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();
 


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

-    return TRUE;
+    return true;

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


@@ -487,7 +487,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++)


@@ -497,11 +497,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')) ||


@@ -515,7 +515,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());

             }
         }
     }
             }
         }
     }


@@ -851,10 +853,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
 {
                                 const wxString& url) const
 {

-    return GetFS()->OpenFile(url);
+    return m_FS ? m_FS->OpenFile(url) : NULL;
+

 }
 
 
 }
 
 


@@ -893,21 +896,21 @@ 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")) &&
         tag.GetParam(_T("HTTP-EQUIV")).IsSameAs(_T("Content-Type"), false) &&
         tag.HasParam(_T("CONTENT")))
     {
     }
 
     if (tag.HasParam(_T("HTTP-EQUIV")) &&
         tag.GetParam(_T("HTTP-EQUIV")).IsSameAs(_T("Content-Type"), false) &&
         tag.HasParam(_T("CONTENT")))
     {

-        wxString content = tag.GetParam(_T("CONTENT"));
+        wxString content = tag.GetParam(_T("CONTENT")).Lower();

         if (content.Left(19) == _T("text/html; charset="))
         {
             *m_retval = content.Mid(19);
             m_Parser->StopParsing();
         }
     }
         if (content.Left(19) == _T("text/html; charset="))
         {
             *m_retval = content.Mid(19);
             m_Parser->StopParsing();
         }
     }

-    return FALSE;
+    return false;

 }
 
 
 }
 
 


@@ -915,9 +918,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;
 }