Don't do the wx cleanup if wxPython didn't do the initialization.

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

diff --git a/src/html/winpars.cpp b/src/html/winpars.cpp
index fc5ddff8153634f12edaadc755411a5117b42b5b..877341fc05cc57c89510d5d164dac2e75df3a7c0 100644 (file)
--- a/src/html/winpars.cpp
+++ b/src/html/winpars.cpp
@@ -40,7 +40,7 @@
 
 wxList wxHtmlWinParser::m_Modules;
 
 
 wxList wxHtmlWinParser::m_Modules;
 

-wxHtmlWinParser::wxHtmlWinParser(wxWindow *wnd) : wxHtmlParser()
+wxHtmlWinParser::wxHtmlWinParser(wxHtmlWindow *wnd) : wxHtmlParser()

 {
     m_tmpStrBuf = NULL;
     m_tmpStrBufSize = 0;
 {
     m_tmpStrBuf = NULL;
     m_tmpStrBufSize = 0;


@@ -84,7 +84,6 @@ wxHtmlWinParser::wxHtmlWinParser(wxWindow *wnd) : wxHtmlParser()
     }
 }
 
     }
 }
 

-

 wxHtmlWinParser::~wxHtmlWinParser()
 {
     int i, j, k, l, m;
 wxHtmlWinParser::~wxHtmlWinParser()
 {
     int i, j, k, l, m;


@@ -102,21 +101,16 @@ wxHtmlWinParser::~wxHtmlWinParser()
     delete[] m_tmpStrBuf;
 }
 
     delete[] m_tmpStrBuf;
 }
 

-

 void wxHtmlWinParser::AddModule(wxHtmlTagsModule *module)
 {
     m_Modules.Append(module);
 }
 
 void wxHtmlWinParser::AddModule(wxHtmlTagsModule *module)
 {
     m_Modules.Append(module);
 }
 

-
-

 void wxHtmlWinParser::RemoveModule(wxHtmlTagsModule *module)
 {
     m_Modules.DeleteObject(module);
 }
 
 void wxHtmlWinParser::RemoveModule(wxHtmlTagsModule *module)
 {
     m_Modules.DeleteObject(module);
 }
 

-
-

 void wxHtmlWinParser::SetFonts(wxString normal_face, wxString fixed_face, const int *sizes)
 {
     int i, j, k, l, m;
 void wxHtmlWinParser::SetFonts(wxString normal_face, wxString fixed_face, const int *sizes)
 {
     int i, j, k, l, m;


@@ -140,8 +134,6 @@ void wxHtmlWinParser::SetFonts(wxString normal_face, wxString fixed_face, const
                     }
 }
 
                     }
 }
 

-
-

 void wxHtmlWinParser::InitParser(const wxString& source)
 {
     wxHtmlParser::InitParser(source);
 void wxHtmlWinParser::InitParser(const wxString& source)
 {
     wxHtmlParser::InitParser(source);


@@ -169,8 +161,6 @@ void wxHtmlWinParser::InitParser(const wxString& source)
     m_Container->InsertCell(new wxHtmlFontCell(CreateCurrentFont()));
 }
 
     m_Container->InsertCell(new wxHtmlFontCell(CreateCurrentFont()));
 }
 

-
-

 void wxHtmlWinParser::DoneParser()
 {
     m_Container = NULL;
 void wxHtmlWinParser::DoneParser()
 {
     m_Container = NULL;


@@ -178,8 +168,6 @@ void wxHtmlWinParser::DoneParser()
     wxHtmlParser::DoneParser();
 }
 
     wxHtmlParser::DoneParser();
 }
 

-
-

 wxObject* wxHtmlWinParser::GetProduct()
 {
     wxHtmlContainerCell *top;
 wxObject* wxHtmlWinParser::GetProduct()
 {
     wxHtmlContainerCell *top;


@@ -192,6 +180,33 @@ wxObject* wxHtmlWinParser::GetProduct()
     return top;
 }
 
     return top;
 }
 

+wxFSFile *wxHtmlWinParser::OpenURL(wxHtmlURLType type,
+                                   const wxString& url) const
+{
+    // FIXME - normalize the URL to full path before passing to
+    //         OnOpeningURL!!
+    if ( m_Window )
+    {
+        wxString myurl(url);
+        wxHtmlOpeningStatus status;
+        for (;;)
+        {
+            wxString redirect;
+            status = m_Window->OnOpeningURL(type, myurl, &redirect);
+            if ( status != wxHTML_REDIRECT )
+                break;
+
+            myurl = redirect;
+        }
+
+        if ( status == wxHTML_BLOCK )
+            return NULL;
+
+        return GetFS()->OpenFile(myurl);
+    }
+
+    return wxHtmlParser::OpenURL(type, url);
+}

 
 void wxHtmlWinParser::AddText(const wxChar* txt)
 {
 
 void wxHtmlWinParser::AddText(const wxChar* txt)
 {


@@ -234,32 +249,32 @@ void wxHtmlWinParser::AddText(const wxChar* txt)
         {
             temp[templen-1] = wxT(' ');
             temp[templen] = 0;
         {
             temp[templen-1] = wxT(' ');
             temp[templen] = 0;

+            if (templen == 1) continue;

             templen = 0;
             if (m_EncConv)
                 m_EncConv->Convert(temp);
             templen = 0;
             if (m_EncConv)
                 m_EncConv->Convert(temp);

-            wxString str = GetEntitiesParser()->Parse(temp);
-            size_t len = str.Len();
+            size_t len = wxStrlen(temp);

             for (size_t j = 0; j < len; j++)
             for (size_t j = 0; j < len; j++)

-                if (str.GetChar(j) == nbsp)
-                    str[j] = wxT(' ');
-            c = new wxHtmlWordCell(str, *(GetDC()));
+                if (temp[j] == nbsp)
+                    temp[j] = wxT(' ');
+            c = new wxHtmlWordCell(temp, *(GetDC()));

             if (m_UseLink)
                 c->SetLink(m_Link);
             m_Container->InsertCell(c);
             m_tmpLastWasSpace = TRUE;
         }
     }
             if (m_UseLink)
                 c->SetLink(m_Link);
             m_Container->InsertCell(c);
             m_tmpLastWasSpace = TRUE;
         }
     }

-    if (templen)
+
+    if (templen && (templen > 1 || temp[0] != wxT(' ')))

     {
         temp[templen] = 0;
         if (m_EncConv)
             m_EncConv->Convert(temp);
     {
         temp[templen] = 0;
         if (m_EncConv)
             m_EncConv->Convert(temp);

-        wxString str = GetEntitiesParser()->Parse(temp);
-        size_t len = str.Len();
+        size_t len = wxStrlen(temp);

         for (size_t j = 0; j < len; j++)
         for (size_t j = 0; j < len; j++)

-            if (str.GetChar(j) == nbsp)
-                str[j] = wxT(' ');
-        c = new wxHtmlWordCell(str, *(GetDC()));
+            if (temp[j] == nbsp)
+                temp[j] = wxT(' ');
+        c = new wxHtmlWordCell(temp, *(GetDC()));

         if (m_UseLink)
             c->SetLink(m_Link);
         m_Container->InsertCell(c);
         if (m_UseLink)
             c->SetLink(m_Link);
         m_Container->InsertCell(c);


@@ -375,21 +390,21 @@ void wxHtmlWinParser::SetInputEncoding(wxFontEncoding enc)
     bool availfix, availnorm;
 
     // exact match?
     bool availfix, availnorm;
 
     // exact match?

-    availnorm = wxTheFontMapper->IsEncodingAvailable(enc, m_FontFaceNormal);
-    availfix = wxTheFontMapper->IsEncodingAvailable(enc, m_FontFaceFixed);
+    availnorm = wxFontMapper::Get()->IsEncodingAvailable(enc, m_FontFaceNormal);
+    availfix = wxFontMapper::Get()->IsEncodingAvailable(enc, m_FontFaceFixed);

     if (availnorm && availfix)
         m_OutputEnc = enc;
 
     // alternatives?
     if (availnorm && availfix)
         m_OutputEnc = enc;
 
     // alternatives?

-    else if (wxTheFontMapper->GetAltForEncoding(enc, &altnorm, m_FontFaceNormal, FALSE) &&
-             wxTheFontMapper->GetAltForEncoding(enc, &altfix, m_FontFaceFixed, FALSE) &&
+    else if (wxFontMapper::Get()->GetAltForEncoding(enc, &altnorm, m_FontFaceNormal, FALSE) &&
+             wxFontMapper::Get()->GetAltForEncoding(enc, &altfix, m_FontFaceFixed, FALSE) &&

              altnorm == altfix)
         m_OutputEnc = altnorm;
 
     // at least normal face?
     else if (availnorm)
         m_OutputEnc = enc;
              altnorm == altfix)
         m_OutputEnc = altnorm;
 
     // at least normal face?
     else if (availnorm)
         m_OutputEnc = enc;

-    else if (wxTheFontMapper->GetAltForEncoding(enc, &altnorm, m_FontFaceNormal, FALSE))
+    else if (wxFontMapper::Get()->GetAltForEncoding(enc, &altnorm, m_FontFaceNormal, FALSE))

         m_OutputEnc = altnorm;
 
     // okay, let convert to ISO_8859-1, available always
         m_OutputEnc = altnorm;
 
     // okay, let convert to ISO_8859-1, available always


@@ -428,27 +443,29 @@ void wxHtmlWinParser::SetInputEncoding(wxFontEncoding enc)
 
 IMPLEMENT_ABSTRACT_CLASS(wxHtmlWinTagHandler, wxHtmlTagHandler)
 
 
 IMPLEMENT_ABSTRACT_CLASS(wxHtmlWinTagHandler, wxHtmlTagHandler)
 

-
-

 //-----------------------------------------------------------------------------
 // wxHtmlTagsModule
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // wxHtmlTagsModule
 //-----------------------------------------------------------------------------
 

+// NB: This is *NOT* winpars.cpp's initialization and shutdown code!!
+//     This module is an ancestor for tag handlers modules defined
+//     in m_*.cpp files with TAGS_MODULE_BEGIN...TAGS_MODULE_END construct.
+//
+//     Do not add any winpars.cpp shutdown or initialization code to it,
+//     create a new module instead!

 
 IMPLEMENT_DYNAMIC_CLASS(wxHtmlTagsModule, wxModule)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxHtmlTagsModule, wxModule)
 

-

 bool wxHtmlTagsModule::OnInit()
 {
     wxHtmlWinParser::AddModule(this);
     return TRUE;
 }
 
 bool wxHtmlTagsModule::OnInit()
 {
     wxHtmlWinParser::AddModule(this);
     return TRUE;
 }
 

-
-

 void wxHtmlTagsModule::OnExit()
 {
     wxHtmlWinParser::RemoveModule(this);
 }
 void wxHtmlTagsModule::OnExit()
 {
     wxHtmlWinParser::RemoveModule(this);
 }

+

 #endif
 
 #endif