added test for env var expansion

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

diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp
index 9625513f476cfb0807293bde4029163f23c6a752..ebb83bd452248f1761e3b995cb3f71202e5ee6c7 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;}
@@ -94,11 +94,11 @@ void wxHtmlWindow::Init()
     SetBorders(10);
 }
 
-bool wxHtmlWindow::Create(wxWindow *parent, wxWindowID id, 
+bool wxHtmlWindow::Create(wxWindow *parent, wxWindowID id,
                           const wxPoint& pos, const wxSize& size,
-                          long style, const wxString& name) 
+                          long style, const wxString& name)
 {
-    if (!wxScrolledWindow::Create(parent, id, pos, size, 
+    if (!wxScrolledWindow::Create(parent, id, pos, size,
                                   style | wxVSCROLL | wxHSCROLL, name))
         return FALSE;
 
@@ -215,7 +215,7 @@ bool wxHtmlWindow::AppendToPage(const wxString& source)
 bool wxHtmlWindow::LoadPage(const wxString& location)
 {
     wxBusyCursor busyCursor;
-    
+
     wxFSFile *f;
     bool rt_val;
     bool needs_refresh = FALSE;
@@ -262,14 +262,8 @@ bool wxHtmlWindow::LoadPage(const wxString& location)
             m_RelatedFrame->SetStatusText(_("Connecting..."), m_RelatedStatusBar);
             Refresh(FALSE);
         }
-        
-        if ( !m_Parser->CanOpenURL(location) )
-        {
-            wxLogError(_("Access denied to document '%s'!"), location.c_str());
-            return FALSE;
-        }
 
-        f = m_FS->OpenFile(location);
+        f = m_Parser->OpenURL(wxHTML_URL_PAGE, location);
 
         if (f == NULL)
         {
@@ -649,8 +643,8 @@ void wxHtmlWindow::OnDraw(wxDC& dc)
     dc.SetBackgroundMode(wxTRANSPARENT);
     GetViewStart(&x, &y);
 
-    m_Cell->Draw(dc, 0, 0, 
-                 y * wxHTML_SCROLL_STEP + rect.GetTop(), 
+    m_Cell->Draw(dc, 0, 0,
+                 y * wxHTML_SCROLL_STEP + rect.GetTop(),
                  y * wxHTML_SCROLL_STEP + rect.GetBottom());
 }
 
@@ -671,6 +665,7 @@ void wxHtmlWindow::OnMouseEvent(wxMouseEvent& event)
 
     if (event.ButtonDown())
     {
+        SetFocus();
         if ( m_Cell )
         {
             int sx, sy;