implemented wxSS::GetMetric on wxGTK2 (patch 950618)

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

diff --git a/src/html/htmlpars.cpp b/src/html/htmlpars.cpp
index 9718c67ee37d7ee5e45979a1364e2e417e21c520..2d8a85df24518f5ddc94d68d4b7f2cd3ed75ec67 100644 (file)
--- a/src/html/htmlpars.cpp
+++ b/src/html/htmlpars.cpp
@@ -4,7 +4,7 @@
 // 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

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


@@ -35,6 +35,9 @@
 #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"
 
 // DLL options compatibility check:
 #include "wx/app.h"


@@ -853,7 +856,8 @@ wxChar wxHtmlEntitiesParser::GetEntityChar(const wxString& entity)
 wxFSFile *wxHtmlParser::OpenURL(wxHtmlURLType WXUNUSED(type), 
                                 const wxString& url) const
 {
 wxFSFile *wxHtmlParser::OpenURL(wxHtmlURLType WXUNUSED(type), 
                                 const wxString& url) const
 {

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

 }
 
 
 }
 
 


@@ -899,7 +903,7 @@ bool wxMetaTagHandler::HandleTag(const wxHtmlTag& tag)
         tag.GetParam(_T("HTTP-EQUIV")).IsSameAs(_T("Content-Type"), false) &&
         tag.HasParam(_T("CONTENT")))
     {
         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);
         if (content.Left(19) == _T("text/html; charset="))
         {
             *m_retval = content.Mid(19);