added missing include file

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

diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp
index 5166612f44650595026ba56968568a05175526b2..835b1d48ba7f30b7c585269c6683193d10804779 100644 (file)
--- a/src/html/htmlwin.cpp
+++ b/src/html/htmlwin.cpp
@@ -41,7 +41,7 @@
 //-----------------------------------------------------------------------------
 
 // 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;}
@@ -262,8 +262,8 @@ bool wxHtmlWindow::LoadPage(const wxString& location)
             m_RelatedFrame->SetStatusText(_("Connecting..."), m_RelatedStatusBar);
             Refresh(FALSE);
         }
-
-        f = m_FS->OpenFile(location);
+        
+        f = m_Parser->OpenURL(wxHTML_URL_PAGE, location);
 
         if (f == NULL)
         {
@@ -306,7 +306,6 @@ bool wxHtmlWindow::LoadPage(const wxString& location)
             m_OpenedPage = f->GetLocation();
             if (f->GetAnchor() != wxEmptyString)
             {
-                wxYield();
                 ScrollToAnchor(f->GetAnchor());
             }
 
@@ -336,7 +335,6 @@ bool wxHtmlWindow::LoadPage(const wxString& location)
 
     if (needs_refresh)
     {
-        wxYield();
         m_tmpCanDrawLocks--;
         Refresh();
     }
@@ -494,7 +492,6 @@ bool wxHtmlWindow::HistoryBack()
     if (a == wxEmptyString) LoadPage(l);
     else LoadPage(l + wxT("#") + a);
     m_HistoryOn = TRUE;
-    wxYield();
     m_tmpCanDrawLocks--;
     Scroll(0, (*m_History)[m_HistoryPos].GetPos());
     Refresh();
@@ -525,7 +522,6 @@ bool wxHtmlWindow::HistoryForward()
     if (a == wxEmptyString) LoadPage(l);
     else LoadPage(l + wxT("#") + a);
     m_HistoryOn = TRUE;
-    wxYield();
     m_tmpCanDrawLocks--;
     Scroll(0, (*m_History)[m_HistoryPos].GetPos());
     Refresh();