Fixed bug with disappearing menus. They were

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

diff --git a/src/html/winpars.cpp b/src/html/winpars.cpp
index 479401d3924d6219bd6ed1a84cbff8295188d9a1..9d8209ddfb883e9c6b5c8c525f2579ce12473760 100644 (file)
--- a/src/html/winpars.cpp
+++ b/src/html/winpars.cpp
@@ -180,14 +180,32 @@ wxObject* wxHtmlWinParser::GetProduct()
     return top;
 }
 
     return top;
 }
 

-bool wxHtmlWinParser::CanOpenURL(const wxString& url) const
+wxFSFile *wxHtmlWinParser::OpenURL(wxHtmlURLType type,
+                                   const wxString& url) const

 {
     // FIXME - normalize the URL to full path before passing to
     //         OnOpeningURL!!
     if ( m_Window )
 {
     // FIXME - normalize the URL to full path before passing to
     //         OnOpeningURL!!
     if ( m_Window )

-        return m_Window->OnOpeningURL(url);
-    else
-        return TRUE;
+    {
+        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)


@@ -425,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