Applied patch [ 597398 ] Generic MDI, wxNotebook based.

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

diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp
index 0eef9744f0119d171fbfc857bc4e5797f4d4c4e9..835b1d48ba7f30b7c585269c6683193d10804779 100644 (file)
--- a/src/html/htmlwin.cpp
+++ b/src/html/htmlwin.cpp
@@ -41,7 +41,7 @@
 //-----------------------------------------------------------------------------
 
 // item of history list
 //-----------------------------------------------------------------------------
 
 // item of history list

-class WXDLLEXPORT wxHtmlHistoryItem : public wxObject
+class WXDLLEXPORT wxHtmlHistoryItem

 {
 public:
     wxHtmlHistoryItem(const wxString& p, const wxString& a) {m_Page = p, m_Anchor = a, m_Pos = 0;}
 {
 public:
     wxHtmlHistoryItem(const wxString& p, const wxString& a) {m_Page = p, m_Anchor = a, m_Pos = 0;}


@@ -262,8 +262,8 @@ bool wxHtmlWindow::LoadPage(const wxString& location)
             m_RelatedFrame->SetStatusText(_("Connecting..."), m_RelatedStatusBar);
             Refresh(FALSE);
         }
             m_RelatedFrame->SetStatusText(_("Connecting..."), m_RelatedStatusBar);
             Refresh(FALSE);
         }

-
-        f = m_FS->OpenFile(location);
+        
+        f = m_Parser->OpenURL(wxHTML_URL_PAGE, location);

 
         if (f == NULL)
         {
 
         if (f == NULL)
         {