Adjust testing for non-visible controls in wxActiveXContainer.

[wxWidgets.git] / src / msw / webview_ie.cpp

diff --git a/src/msw/webview_ie.cpp b/src/msw/webview_ie.cpp
index d2f66d434a4f21751ab628f6bac4e4695dbf727b..76c4583333961fbd2a3e84066911e85ecc79cca8 100644 (file)
--- a/src/msw/webview_ie.cpp
+++ b/src/msw/webview_ie.cpp
@@ -3,7 +3,7 @@
 // Purpose:     wxMSW wxWebViewIE class implementation for web view component
 // Author:      Marianne Gagnon
 // Id:          $Id$
 // Purpose:     wxMSW wxWebViewIE class implementation for web view component
 // Author:      Marianne Gagnon
 // Id:          $Id$

-// Copyright:   (c) 2010 Marianne Gagnon, Steven Lamerton
+// Copyright:   (c) 2010 Marianne Gagnon, 2011 Steven Lamerton

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -16,7 +16,7 @@
 
 #include "wx/msw/webview_ie.h"
 
 
 #include "wx/msw/webview_ie.h"
 

-#if wxUSE_WEBVIEW_IE
+#if wxUSE_WEBVIEW && wxUSE_WEBVIEW_IE

 
 #include <olectl.h>
 #include <oleidl.h>
 
 #include <olectl.h>
 #include <oleidl.h>


@@ -26,32 +26,22 @@
 #include "wx/msw/registry.h"
 #include "wx/msw/missing.h"
 #include "wx/filesys.h"
 #include "wx/msw/registry.h"
 #include "wx/msw/missing.h"
 #include "wx/filesys.h"

+#include "wx/dynlib.h"
+#include <initguid.h>

 
 

-//Taken from wx/filesys.cpp
-static wxString EscapeFileNameCharsInURL(const char *in)
-{
-    wxString s;
+/* These GUID definitions are our own implementation to support interfaces
+ * normally in urlmon.h. See include/wx/msw/webview_ie.h
+ */

 
 

-    for ( const unsigned char *p = (const unsigned char*)in; *p; ++p )
-    {
-        const unsigned char c = *p;
+namespace {

 
 

-        if ( c == '/' || c == '-' || c == '.' || c == '_' || c == '~' ||
-             (c >= '0' && c <= '9') ||
-             (c >= 'a' && c <= 'z') ||
-             (c >= 'A' && c <= 'Z') )
-        {
-            s << c;
-        }
-        else
-        {
-            s << wxString::Format("%%%02x", c);
-        }
-    }
+DEFINE_GUID(wxIID_IInternetProtocolRoot,0x79eac9e3,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb);
+DEFINE_GUID(wxIID_IInternetProtocol,0x79eac9e4,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb);

 
 

-    return s;

 }
 
 }
 

+wxIMPLEMENT_DYNAMIC_CLASS(wxWebViewIE, wxWebView);
+

 BEGIN_EVENT_TABLE(wxWebViewIE, wxControl)
     EVT_ACTIVEX(wxID_ANY, wxWebViewIE::onActiveXEvent)
     EVT_ERASE_BACKGROUND(wxWebViewIE::onEraseBg)
 BEGIN_EVENT_TABLE(wxWebViewIE, wxControl)
     EVT_ACTIVEX(wxID_ANY, wxWebViewIE::onActiveXEvent)
     EVT_ERASE_BACKGROUND(wxWebViewIE::onEraseBg)


@@ -90,30 +80,26 @@ bool wxWebViewIE::Create(wxWindow* parent,
 
     m_webBrowser->put_RegisterAsBrowser(VARIANT_TRUE);
     m_webBrowser->put_RegisterAsDropTarget(VARIANT_TRUE);
 
     m_webBrowser->put_RegisterAsBrowser(VARIANT_TRUE);
     m_webBrowser->put_RegisterAsDropTarget(VARIANT_TRUE);

-    //m_webBrowser->put_Silent(VARIANT_FALSE);
-
-    //We register a custom handler for the file protocol so we can handle
-    //Virtual file systems
-    ClassFactory* cf = new ClassFactory;
-    IInternetSession* session;
-    if(CoInternetGetSession(0, &session, 0) != S_OK)
-        return false;
-    HRESULT hr = session->RegisterNameSpace(cf, CLSID_FileProtocol, L"file", 0, NULL, 0);
-    if(FAILED(hr))
-        return false; 

 
     m_container = new wxActiveXContainer(this, IID_IWebBrowser2, m_webBrowser);
 
     SetBackgroundStyle(wxBG_STYLE_PAINT);
     SetDoubleBuffered(true);
 
     m_container = new wxActiveXContainer(this, IID_IWebBrowser2, m_webBrowser);
 
     SetBackgroundStyle(wxBG_STYLE_PAINT);
     SetDoubleBuffered(true);

-    LoadUrl(url);
+    LoadURL(url);

     return true;
 }
 
     return true;
 }
 

+wxWebViewIE::~wxWebViewIE()
+{
+    for(unsigned int i = 0; i < m_factories.size(); i++)
+    {
+        m_factories[i]->Release();
+    }
+}

 
 

-void wxWebViewIE::LoadUrl(const wxString& url)
+void wxWebViewIE::LoadURL(const wxString& url)

 {
 {

-    m_ie.CallMethod("Navigate", (BSTR) url.wc_str(), NULL, NULL, NULL, NULL);
+    m_ie.CallMethod("Navigate", wxConvertStringToOle(url));

 }
 
 void wxWebViewIE::SetPage(const wxString& html, const wxString& baseUrl)
 }
 
 void wxWebViewIE::SetPage(const wxString& html, const wxString& baseUrl)


@@ -140,8 +126,8 @@ void wxWebViewIE::SetPage(const wxString& html, const wxString& baseUrl)
 
         //We send the events when we are done to mimic webkit
         //Navigated event
 
         //We send the events when we are done to mimic webkit
         //Navigated event

-        wxWebNavigationEvent event(wxEVT_COMMAND_WEB_VIEW_NAVIGATED,
-                                   GetId(), baseUrl, "", false);
+        wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_NAVIGATED,
+                             GetId(), baseUrl, "");

         event.SetEventObject(this);
         HandleWindowEvent(event);
 
         event.SetEventObject(this);
         HandleWindowEvent(event);
 


@@ -157,7 +143,7 @@ void wxWebViewIE::SetPage(const wxString& html, const wxString& baseUrl)
 
 }
 
 
 }
 

-wxString wxWebViewIE::GetPageSource()
+wxString wxWebViewIE::GetPageSource() const

 {
     IHTMLDocument2* document = GetDocument();
     IHTMLElement *bodyTag = NULL;
 {
     IHTMLDocument2* document = GetDocument();
     IHTMLElement *bodyTag = NULL;


@@ -181,14 +167,17 @@ wxString wxWebViewIE::GetPageSource()
     return source;
 }
 
     return source;
 }
 

-wxWebViewZoom wxWebViewIE::GetZoom()
+wxWebViewZoom wxWebViewIE::GetZoom() const

 {
 {

-    if(m_zoomType == wxWEB_VIEW_ZOOM_TYPE_LAYOUT)
-        return GetIEOpticalZoom();
-    else if(m_zoomType == wxWEB_VIEW_ZOOM_TYPE_TEXT)
-        return GetIETextZoom();
-    else
-        wxFAIL;
+    switch( m_zoomType )
+    {
+        case wxWEB_VIEW_ZOOM_TYPE_LAYOUT:
+            return GetIEOpticalZoom();
+        case wxWEB_VIEW_ZOOM_TYPE_TEXT:
+            return GetIETextZoom();
+        default:
+            wxFAIL;
+    }

 
     //Dummy return to stop compiler warnings
     return wxWEB_VIEW_ZOOM_MEDIUM;
 
     //Dummy return to stop compiler warnings
     return wxWEB_VIEW_ZOOM_MEDIUM;


@@ -197,12 +186,17 @@ wxWebViewZoom wxWebViewIE::GetZoom()
 
 void wxWebViewIE::SetZoom(wxWebViewZoom zoom)
 {
 
 void wxWebViewIE::SetZoom(wxWebViewZoom zoom)
 {

-    if(m_zoomType == wxWEB_VIEW_ZOOM_TYPE_LAYOUT)
-        SetIEOpticalZoom(zoom);
-    else if(m_zoomType == wxWEB_VIEW_ZOOM_TYPE_TEXT)
-        SetIETextZoom(zoom);
-    else
-        wxFAIL;
+    switch( m_zoomType )
+    {
+        case wxWEB_VIEW_ZOOM_TYPE_LAYOUT:
+            SetIEOpticalZoom(zoom);
+            break;
+        case wxWEB_VIEW_ZOOM_TYPE_TEXT:
+            SetIETextZoom(zoom);
+            break;
+        default:
+            wxFAIL;
+    }

 }
 
 void wxWebViewIE::SetIETextZoom(wxWebViewZoom level)
 }
 
 void wxWebViewIE::SetIETextZoom(wxWebViewZoom level)


@@ -215,21 +209,27 @@ void wxWebViewIE::SetIETextZoom(wxWebViewZoom level)
     V_VT(&zoomVariant) = VT_I4;
     V_I4(&zoomVariant) = level;
 
     V_VT(&zoomVariant) = VT_I4;
     V_I4(&zoomVariant) = level;
 

-    HRESULT result = m_webBrowser->ExecWB(OLECMDID_ZOOM,
-                                          OLECMDEXECOPT_DONTPROMPTUSER,
-                                          &zoomVariant, NULL);
+#if wxDEBUG_LEVEL
+    HRESULT result =
+#endif
+            m_webBrowser->ExecWB(OLECMDID_ZOOM,
+                                 OLECMDEXECOPT_DONTPROMPTUSER,
+                                 &zoomVariant, NULL);

     wxASSERT(result == S_OK);
 }
 
     wxASSERT(result == S_OK);
 }
 

-wxWebViewZoom wxWebViewIE::GetIETextZoom()
+wxWebViewZoom wxWebViewIE::GetIETextZoom() const

 {
     VARIANT zoomVariant;
     VariantInit (&zoomVariant);
     V_VT(&zoomVariant) = VT_I4;
 
 {
     VARIANT zoomVariant;
     VariantInit (&zoomVariant);
     V_VT(&zoomVariant) = VT_I4;
 

-    HRESULT result = m_webBrowser->ExecWB(OLECMDID_ZOOM,
-                                          OLECMDEXECOPT_DONTPROMPTUSER,
-                                          NULL, &zoomVariant);
+#if wxDEBUG_LEVEL
+    HRESULT result =
+#endif
+            m_webBrowser->ExecWB(OLECMDID_ZOOM,
+                                 OLECMDEXECOPT_DONTPROMPTUSER,
+                                 NULL, &zoomVariant);

     wxASSERT(result == S_OK);
 
     //We can safely cast here as we know that the range matches our enum
     wxASSERT(result == S_OK);
 
     //We can safely cast here as we know that the range matches our enum


@@ -266,22 +266,28 @@ void wxWebViewIE::SetIEOpticalZoom(wxWebViewZoom level)
             wxFAIL;
     }
 
             wxFAIL;
     }
 

-    HRESULT result = m_webBrowser->ExecWB((OLECMDID)OLECMDID_OPTICAL_ZOOM,
-                                          OLECMDEXECOPT_DODEFAULT,
-                                          &zoomVariant,
-                                          NULL);
+#if wxDEBUG_LEVEL
+    HRESULT result =
+#endif
+            m_webBrowser->ExecWB((OLECMDID)63 /*OLECMDID_OPTICAL_ZOOM*/,
+                                 OLECMDEXECOPT_DODEFAULT,
+                                 &zoomVariant,
+                                 NULL);

     wxASSERT(result == S_OK);
 }
 
     wxASSERT(result == S_OK);
 }
 

-wxWebViewZoom wxWebViewIE::GetIEOpticalZoom()
+wxWebViewZoom wxWebViewIE::GetIEOpticalZoom() const

 {
     VARIANT zoomVariant;
     VariantInit (&zoomVariant);
     V_VT(&zoomVariant) = VT_I4;
 
 {
     VARIANT zoomVariant;
     VariantInit (&zoomVariant);
     V_VT(&zoomVariant) = VT_I4;
 

-    HRESULT result = m_webBrowser->ExecWB((OLECMDID)OLECMDID_OPTICAL_ZOOM,
-                                          OLECMDEXECOPT_DODEFAULT, NULL,
-                                          &zoomVariant);
+#if wxDEBUG_LEVEL
+    HRESULT result =
+#endif
+            m_webBrowser->ExecWB((OLECMDID)63 /*OLECMDID_OPTICAL_ZOOM*/,
+                                 OLECMDEXECOPT_DODEFAULT, NULL,
+                                 &zoomVariant);

     wxASSERT(result == S_OK);
 
     const int zoom = V_I4(&zoomVariant);
     wxASSERT(result == S_OK);
 
     const int zoom = V_I4(&zoomVariant);


@@ -340,7 +346,7 @@ void wxWebViewIE::Print()
                          OLECMDEXECOPT_DODEFAULT, NULL, NULL);
 }
 
                          OLECMDEXECOPT_DODEFAULT, NULL, NULL);
 }
 

-bool wxWebViewIE::CanGoBack()
+bool wxWebViewIE::CanGoBack() const

 {
     if(m_historyEnabled)
         return m_historyPosition > 0;
 {
     if(m_historyEnabled)
         return m_historyPosition > 0;


@@ -348,7 +354,7 @@ bool wxWebViewIE::CanGoBack()
         return false;
 }
 
         return false;
 }
 

-bool wxWebViewIE::CanGoForward()
+bool wxWebViewIE::CanGoForward() const

 {
     if(m_historyEnabled)
         return m_historyPosition != static_cast<int>(m_historyList.size()) - 1;
 {
     if(m_historyEnabled)
         return m_historyPosition != static_cast<int>(m_historyList.size()) - 1;


@@ -356,7 +362,7 @@ bool wxWebViewIE::CanGoForward()
         return false;
 }
 
         return false;
 }
 

-void wxWebViewIE::LoadHistoryItem(wxSharedPtr<wxWebHistoryItem> item)
+void wxWebViewIE::LoadHistoryItem(wxSharedPtr<wxWebViewHistoryItem> item)

 {
     int pos = -1;
     for(unsigned int i = 0; i < m_historyList.size(); i++)
 {
     int pos = -1;
     for(unsigned int i = 0; i < m_historyList.size(); i++)


@@ -368,13 +374,13 @@ void wxWebViewIE::LoadHistoryItem(wxSharedPtr<wxWebHistoryItem> item)
     wxASSERT_MSG(pos != static_cast<int>(m_historyList.size()),
                  "invalid history item");
     m_historyLoadingFromList = true;
     wxASSERT_MSG(pos != static_cast<int>(m_historyList.size()),
                  "invalid history item");
     m_historyLoadingFromList = true;

-    LoadUrl(item->GetUrl());
+    LoadURL(item->GetUrl());

     m_historyPosition = pos;
 }
 
     m_historyPosition = pos;
 }
 

-wxVector<wxSharedPtr<wxWebHistoryItem> > wxWebViewIE::GetBackwardHistory()
+wxVector<wxSharedPtr<wxWebViewHistoryItem> > wxWebViewIE::GetBackwardHistory()

 {
 {

-    wxVector<wxSharedPtr<wxWebHistoryItem> > backhist;
+    wxVector<wxSharedPtr<wxWebViewHistoryItem> > backhist;

     //As we don't have std::copy or an iterator constructor in the wxwidgets
     //native vector we construct it by hand
     for(int i = 0; i < m_historyPosition; i++)
     //As we don't have std::copy or an iterator constructor in the wxwidgets
     //native vector we construct it by hand
     for(int i = 0; i < m_historyPosition; i++)


@@ -384,9 +390,9 @@ wxVector<wxSharedPtr<wxWebHistoryItem> > wxWebViewIE::GetBackwardHistory()
     return backhist;
 }
 
     return backhist;
 }
 

-wxVector<wxSharedPtr<wxWebHistoryItem> > wxWebViewIE::GetForwardHistory()
+wxVector<wxSharedPtr<wxWebViewHistoryItem> > wxWebViewIE::GetForwardHistory()

 {
 {

-    wxVector<wxSharedPtr<wxWebHistoryItem> > forwardhist;
+    wxVector<wxSharedPtr<wxWebViewHistoryItem> > forwardhist;

     //As we don't have std::copy or an iterator constructor in the wxwidgets
     //native vector we construct it by hand
     for(int i = m_historyPosition + 1; i < static_cast<int>(m_historyList.size()); i++)
     //As we don't have std::copy or an iterator constructor in the wxwidgets
     //native vector we construct it by hand
     for(int i = m_historyPosition + 1; i < static_cast<int>(m_historyList.size()); i++)


@@ -458,14 +464,17 @@ void wxWebViewIE::SetOfflineMode(bool offline)
 {
     // FIXME: the wxWidgets docs do not really document what the return
     //        parameter of PutProperty is
 {
     // FIXME: the wxWidgets docs do not really document what the return
     //        parameter of PutProperty is

-    const bool success = m_ie.PutProperty("Offline", (offline ?
-                                                      VARIANT_TRUE :
-                                                      VARIANT_FALSE));
+#if wxDEBUG_LEVEL
+    const bool success =
+#endif
+            m_ie.PutProperty("Offline", (offline ?
+                                         VARIANT_TRUE :
+                                         VARIANT_FALSE));

     wxASSERT(success);
 }
 
     wxASSERT(success);
 }
 

-bool wxWebViewIE::IsBusy()
-{
+bool wxWebViewIE::IsBusy() const
+{ 

     if (m_isBusy) return true;
 
     wxVariant out = m_ie.GetProperty("Busy");
     if (m_isBusy) return true;
 
     wxVariant out = m_ie.GetProperty("Busy");


@@ -475,7 +484,7 @@ bool wxWebViewIE::IsBusy()
     return out.GetBool();
 }
 
     return out.GetBool();
 }
 

-wxString wxWebViewIE::GetCurrentURL()
+wxString wxWebViewIE::GetCurrentURL() const

 {
     wxVariant out = m_ie.GetProperty("LocationURL");
 
 {
     wxVariant out = m_ie.GetProperty("LocationURL");
 


@@ -483,7 +492,7 @@ wxString wxWebViewIE::GetCurrentURL()
     return out.GetString();
 }
 
     return out.GetString();
 }
 

-wxString wxWebViewIE::GetCurrentTitle()
+wxString wxWebViewIE::GetCurrentTitle() const

 {
     IHTMLDocument2* document = GetDocument();
     BSTR title;
 {
     IHTMLDocument2* document = GetDocument();
     BSTR title;


@@ -493,16 +502,16 @@ wxString wxWebViewIE::GetCurrentTitle()
     return wxString(title);
 }
 
     return wxString(title);
 }
 

-bool wxWebViewIE::CanCut()
+bool wxWebViewIE::CanCut() const

 {
     return CanExecCommand("Cut");
 }
 
 {
     return CanExecCommand("Cut");
 }
 

-bool wxWebViewIE::CanCopy()
+bool wxWebViewIE::CanCopy() const

 {
     return CanExecCommand("Copy");
 }
 {
     return CanExecCommand("Copy");
 }

-bool wxWebViewIE::CanPaste()
+bool wxWebViewIE::CanPaste() const

 {
     return CanExecCommand("Paste");
 }
 {
     return CanExecCommand("Paste");
 }


@@ -522,11 +531,11 @@ void wxWebViewIE::Paste()
     ExecCommand("Paste");
 }
 
     ExecCommand("Paste");
 }
 

-bool wxWebViewIE::CanUndo()
+bool wxWebViewIE::CanUndo() const

 {
     return CanExecCommand("Undo");
 }
 {
     return CanExecCommand("Undo");
 }

-bool wxWebViewIE::CanRedo()
+bool wxWebViewIE::CanRedo() const

 {
     return CanExecCommand("Redo");
 }
 {
     return CanExecCommand("Redo");
 }


@@ -552,7 +561,7 @@ void wxWebViewIE::SetEditable(bool enable)
     document->Release();
 }
 
     document->Release();
 }
 

-bool wxWebViewIE::IsEditable()
+bool wxWebViewIE::IsEditable() const

 {
     IHTMLDocument2* document = GetDocument();
     BSTR mode;
 {
     IHTMLDocument2* document = GetDocument();
     BSTR mode;


@@ -569,7 +578,7 @@ void wxWebViewIE::SelectAll()
     ExecCommand("SelectAll");
 }
 
     ExecCommand("SelectAll");
 }
 

-bool wxWebViewIE::HasSelection()
+bool wxWebViewIE::HasSelection() const

 {
     IHTMLDocument2* document = GetDocument();
     IHTMLSelectionObject* selection;
 {
     IHTMLDocument2* document = GetDocument();
     IHTMLSelectionObject* selection;


@@ -591,7 +600,7 @@ void wxWebViewIE::DeleteSelection()
     ExecCommand("Delete");
 }
 
     ExecCommand("Delete");
 }
 

-wxString wxWebViewIE::GetSelectedText()
+wxString wxWebViewIE::GetSelectedText() const

 {
     IHTMLDocument2* document = GetDocument();
     IHTMLSelectionObject* selection;
 {
     IHTMLDocument2* document = GetDocument();
     IHTMLSelectionObject* selection;


@@ -620,7 +629,7 @@ wxString wxWebViewIE::GetSelectedText()
     return selected;
 }
 
     return selected;
 }
 

-wxString wxWebViewIE::GetSelectedSource()
+wxString wxWebViewIE::GetSelectedSource() const

 {
     IHTMLDocument2* document = GetDocument();
     IHTMLSelectionObject* selection;
 {
     IHTMLDocument2* document = GetDocument();
     IHTMLSelectionObject* selection;


@@ -663,7 +672,7 @@ void wxWebViewIE::ClearSelection()
     document->Release();
 }
 
     document->Release();
 }
 

-wxString wxWebViewIE::GetPageText()
+wxString wxWebViewIE::GetPageText() const

 {
     IHTMLDocument2* document = GetDocument();
     wxString text;
 {
     IHTMLDocument2* document = GetDocument();
     wxString text;


@@ -696,7 +705,36 @@ void wxWebViewIE::RunScript(const wxString& javascript)
     document->Release();
 }
 
     document->Release();
 }
 

-bool wxWebViewIE::CanExecCommand(wxString command)
+void wxWebViewIE::RegisterHandler(wxSharedPtr<wxWebViewHandler> handler)
+{
+    wxDynamicLibrary urlMon(wxT("urlmon.dll"));
+    if(urlMon.HasSymbol(wxT("CoInternetGetSession")))
+    {
+        typedef HRESULT (WINAPI *CoInternetGetSession_t)(DWORD, wxIInternetSession**, DWORD);
+        wxDYNLIB_FUNCTION(CoInternetGetSession_t, CoInternetGetSession, urlMon);
+
+        ClassFactory* cf = new ClassFactory(handler);
+        wxIInternetSession* session;
+        HRESULT res = (*pfnCoInternetGetSession)(0, &session, 0);
+        if(FAILED(res))
+        {
+            wxFAIL_MSG("Could not retrive internet session");
+        }
+
+        HRESULT hr = session->RegisterNameSpace(cf, CLSID_FileProtocol, handler->GetName(), 0, NULL, 0);
+        if(FAILED(hr))
+        {
+            wxFAIL_MSG("Could not register protocol");
+        }
+        m_factories.push_back(cf);
+    }
+    else
+    {
+        wxFAIL_MSG("urlmon does not contain CoInternetGetSession");
+    }
+}
+
+bool wxWebViewIE::CanExecCommand(wxString command) const

 {
     IHTMLDocument2* document = GetDocument();
     VARIANT_BOOL enabled;
 {
     IHTMLDocument2* document = GetDocument();
     VARIANT_BOOL enabled;


@@ -714,7 +752,7 @@ void wxWebViewIE::ExecCommand(wxString command)
     document->Release();
 }
 
     document->Release();
 }
 

-IHTMLDocument2* wxWebViewIE::GetDocument()
+IHTMLDocument2* wxWebViewIE::GetDocument() const

 {
     wxVariant variant = m_ie.GetProperty("Document");
     IHTMLDocument2* document = (IHTMLDocument2*)variant.GetVoidPtr();
 {
     wxVariant variant = m_ie.GetProperty("Document");
     IHTMLDocument2* document = (IHTMLDocument2*)variant.GetVoidPtr();


@@ -737,12 +775,21 @@ void wxWebViewIE::onActiveXEvent(wxActiveXEvent& evt)
             wxString url = evt[1].GetString();
             wxString target = evt[3].GetString();
 
             wxString url = evt[1].GetString();
             wxString target = evt[3].GetString();
 

-            wxWebNavigationEvent event(wxEVT_COMMAND_WEB_VIEW_NAVIGATING,
-                                       GetId(), url, target, true);
-            event.SetEventObject(this);
-            HandleWindowEvent(event);
+            wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_NAVIGATING,
+                                 GetId(), url, target);
+
+            //skip empty javascript events.
+            if(url == "javascript:\"\"" && target.IsEmpty())
+            {
+                event.Veto();
+            }
+            else
+            {
+                event.SetEventObject(this);
+                HandleWindowEvent(event);
+            }

 
 

-            if (event.IsVetoed())
+            if (!event.IsAllowed())

             {
                 wxActiveXEventNativeMSW* nativeParams =
                     evt.GetNativeParameters();
             {
                 wxActiveXEventNativeMSW* nativeParams =
                     evt.GetNativeParameters();


@@ -763,8 +810,8 @@ void wxWebViewIE::onActiveXEvent(wxActiveXEvent& evt)
             wxString url = evt[1].GetString();
             // TODO: set target parameter if possible
             wxString target = wxEmptyString;
             wxString url = evt[1].GetString();
             // TODO: set target parameter if possible
             wxString target = wxEmptyString;

-            wxWebNavigationEvent event(wxEVT_COMMAND_WEB_VIEW_NAVIGATED,
-                                       GetId(), url, target, false);
+            wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_NAVIGATED,
+                                 GetId(), url, target);

             event.SetEventObject(this);
             HandleWindowEvent(event);
             break;
             event.SetEventObject(this);
             HandleWindowEvent(event);
             break;


@@ -789,7 +836,13 @@ void wxWebViewIE::onActiveXEvent(wxActiveXEvent& evt)
 
             //As we are complete we also add to the history list, but not if the
             //page is not the main page, ie it is a subframe
 
             //As we are complete we also add to the history list, but not if the
             //page is not the main page, ie it is a subframe

-            if(m_historyEnabled && !m_historyLoadingFromList && url == GetCurrentURL())
+            //We also have to check if we are loading a file:// url, if so we 
+            //need to change the comparison as ie passes back a different style
+            //of url
+            if(m_historyEnabled && !m_historyLoadingFromList && 
+              (url == GetCurrentURL() || 
+              (GetCurrentURL().substr(0, 4) == "file" && 
+               wxFileSystem::URLToFileName(GetCurrentURL()).GetFullPath() == url)))

             {
                 //If we are not at the end of the list, then erase everything
                 //between us and the end before adding the new page
             {
                 //If we are not at the end of the list, then erase everything
                 //between us and the end before adding the new page


@@ -798,7 +851,7 @@ void wxWebViewIE::onActiveXEvent(wxActiveXEvent& evt)
                     m_historyList.erase(m_historyList.begin() + m_historyPosition + 1,
                                         m_historyList.end());
                 }
                     m_historyList.erase(m_historyList.begin() + m_historyPosition + 1,
                                         m_historyList.end());
                 }

-                wxSharedPtr<wxWebHistoryItem> item(new wxWebHistoryItem(url, GetCurrentTitle()));
+                wxSharedPtr<wxWebViewHistoryItem> item(new wxWebViewHistoryItem(url, GetCurrentTitle()));

                 m_historyList.push_back(item);
                 m_historyPosition++;
             }
                 m_historyList.push_back(item);
                 m_historyPosition++;
             }


@@ -806,8 +859,8 @@ void wxWebViewIE::onActiveXEvent(wxActiveXEvent& evt)
             m_historyLoadingFromList = false;
             // TODO: set target parameter if possible
             wxString target = wxEmptyString;
             m_historyLoadingFromList = false;
             // TODO: set target parameter if possible
             wxString target = wxEmptyString;

-            wxWebNavigationEvent event(wxEVT_COMMAND_WEB_VIEW_LOADED, GetId(),
-                                       url, target, false);
+            wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_LOADED, GetId(),
+                                 url, target);

             event.SetEventObject(this);
             HandleWindowEvent(event);
             break;
             event.SetEventObject(this);
             HandleWindowEvent(event);
             break;


@@ -820,12 +873,19 @@ void wxWebViewIE::onActiveXEvent(wxActiveXEvent& evt)
 
         case DISPID_TITLECHANGE:
         {
 
         case DISPID_TITLECHANGE:
         {

+            wxString title = evt[0].GetString();
+
+            wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_TITLE_CHANGED,
+                                 GetId(), GetCurrentURL(), "");
+            event.SetString(title);
+            event.SetEventObject(this);
+            HandleWindowEvent(event);

             break;
         }
 
         case DISPID_NAVIGATEERROR:
         {
             break;
         }
 
         case DISPID_NAVIGATEERROR:
         {

-            wxWebNavigationError errorType = wxWEB_NAV_ERR_OTHER;
+            wxWebViewNavigationError errorType = wxWEB_NAV_ERR_OTHER;

             wxString errorCode = "?";
             switch (evt[3].GetLong())
             {
             wxString errorCode = "?";
             switch (evt[3].GetLong())
             {


@@ -939,8 +999,8 @@ void wxWebViewIE::onActiveXEvent(wxActiveXEvent& evt)
 
             wxString url = evt[1].GetString();
             wxString target = evt[2].GetString();
 
             wxString url = evt[1].GetString();
             wxString target = evt[2].GetString();

-            wxWebNavigationEvent event(wxEVT_COMMAND_WEB_VIEW_ERROR, GetId(),
-                                       url, target, false);
+            wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_ERROR, GetId(),
+                                 url, target);

             event.SetEventObject(this);
             event.SetInt(errorType);
             event.SetString(errorCode);
             event.SetEventObject(this);
             event.SetInt(errorType);
             event.SetString(errorCode);


@@ -951,17 +1011,15 @@ void wxWebViewIE::onActiveXEvent(wxActiveXEvent& evt)
         {
             wxString url = evt[4].GetString();
 
         {
             wxString url = evt[4].GetString();
 

-            wxWebNavigationEvent event(wxEVT_COMMAND_WEB_VIEW_NEWWINDOW,
-                                       GetId(), url, wxEmptyString, true);
+            wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_NEWWINDOW,
+                                 GetId(), url, wxEmptyString);

             event.SetEventObject(this);
             HandleWindowEvent(event);
 
             event.SetEventObject(this);
             HandleWindowEvent(event);
 

-            //If we veto the event then we cancel the new window
-            if (event.IsVetoed())
-            {
-                wxActiveXEventNativeMSW* nativeParams = evt.GetNativeParameters();
-                *V_BOOLREF(&nativeParams->pDispParams->rgvarg[3]) = VARIANT_TRUE;
-            }
+            //We always cancel this event otherwise an Internet Exporer window
+            //is opened for the url
+            wxActiveXEventNativeMSW* nativeParams = evt.GetNativeParameters();
+            *V_BOOLREF(&nativeParams->pDispParams->rgvarg[3]) = VARIANT_TRUE;

             break;
         }
     }
             break;
         }
     }


@@ -969,16 +1027,15 @@ void wxWebViewIE::onActiveXEvent(wxActiveXEvent& evt)
     evt.Skip();
 }
 
     evt.Skip();
 }
 

-VirtualProtocol::VirtualProtocol()
+VirtualProtocol::VirtualProtocol(wxSharedPtr<wxWebViewHandler> handler)

 {
     m_refCount = 0;
     m_file = NULL;
 {
     m_refCount = 0;
     m_file = NULL;

-    m_fileSys = new wxFileSystem;
+    m_handler = handler;

 }
 
 VirtualProtocol::~VirtualProtocol()
 {
 }
 
 VirtualProtocol::~VirtualProtocol()
 {

-    wxDELETE(m_fileSys);

 }
 
 ULONG VirtualProtocol::AddRef()
 }
 
 ULONG VirtualProtocol::AddRef()


@@ -989,10 +1046,10 @@ ULONG VirtualProtocol::AddRef()
 
 HRESULT VirtualProtocol::QueryInterface(REFIID riid, void **ppvObject)
 {
 
 HRESULT VirtualProtocol::QueryInterface(REFIID riid, void **ppvObject)
 {

-    if ((riid == IID_IUnknown) || (riid == IID_IInternetProtocol)
-       || (riid == IID_IInternetProtocolRoot))
+    if(riid == IID_IUnknown || riid == wxIID_IInternetProtocolRoot ||
+       riid == wxIID_IInternetProtocol)

     {
     {

-        *ppvObject = this;
+        *ppvObject = (wxIInternetProtocol*)this;

         AddRef();
         return S_OK;
     }
         AddRef();
         return S_OK;
     }


@@ -1017,28 +1074,30 @@ ULONG VirtualProtocol::Release()
     }
 }
 
     }
 }
 

-HRESULT VirtualProtocol::Start(LPCWSTR szUrl, IInternetProtocolSink *pOIProtSink,
-                            IInternetBindInfo *pOIBindInfo, DWORD grfPI, 
-                            HANDLE_PTR dwReserved)
+HRESULT VirtualProtocol::Start(LPCWSTR szUrl, wxIInternetProtocolSink *pOIProtSink,
+                               wxIInternetBindInfo *pOIBindInfo, DWORD grfPI,
+                               HANDLE_PTR dwReserved)

 {
 {

+    wxUnusedVar(szUrl);
+    wxUnusedVar(pOIBindInfo);
+    wxUnusedVar(grfPI);
+    wxUnusedVar(dwReserved);

     m_protocolSink = pOIProtSink;
     m_protocolSink = pOIProtSink;

-    //We have to clean up incoming paths from the webview control as they are
-    //not properly escaped, see also the comment in filesys.cpp line 668
-    wxString path = wxString(szUrl).BeforeFirst(':') +  ":" + 
-                    EscapeFileNameCharsInURL(wxString(szUrl).AfterFirst(':'));
-    path.Replace("///", "/");
-    m_file = m_fileSys->OpenFile(path);
+    
+    //We get the file itself from the protocol handler
+    m_file = m_handler->GetFile(szUrl);
+

 
     if(!m_file)
         return INET_E_RESOURCE_NOT_FOUND;
 
     //We return the stream length for current and total size as we can always
     //read the whole file from the stream
 
     if(!m_file)
         return INET_E_RESOURCE_NOT_FOUND;
 
     //We return the stream length for current and total size as we can always
     //read the whole file from the stream

-    m_protocolSink->ReportData(BSCF_FIRSTDATANOTIFICATION | 
-                               BSCF_DATAFULLYAVAILABLE |
-                               BSCF_LASTDATANOTIFICATION,
-                               m_file->GetStream()->GetLength(),
-                               m_file->GetStream()->GetLength());
+    wxFileOffset length = m_file->GetStream()->GetLength();
+    m_protocolSink->ReportData(wxBSCF_FIRSTDATANOTIFICATION |
+                               wxBSCF_DATAFULLYAVAILABLE |
+                               wxBSCF_LASTDATANOTIFICATION,
+                               length, length);

     return S_OK; 
 }
 
     return S_OK; 
 }
 


@@ -1073,6 +1132,12 @@ HRESULT VirtualProtocol::Read(void *pv, ULONG cb, ULONG *pcbRead)
         wxDELETE(m_file);
         return INET_E_DOWNLOAD_FAILURE;
     }
         wxDELETE(m_file);
         return INET_E_DOWNLOAD_FAILURE;
     }

+    else
+    {
+        //Dummy return to surpress a compiler warning
+        wxFAIL;
+        return INET_E_DOWNLOAD_FAILURE;
+    }

 }
 
 HRESULT ClassFactory::CreateInstance(IUnknown* pUnkOuter, REFIID riid,
 }
 
 HRESULT ClassFactory::CreateInstance(IUnknown* pUnkOuter, REFIID riid,


@@ -1080,7 +1145,7 @@ HRESULT ClassFactory::CreateInstance(IUnknown* pUnkOuter, REFIID riid,
 {
     if (pUnkOuter) 
         return CLASS_E_NOAGGREGATION;
 {
     if (pUnkOuter) 
         return CLASS_E_NOAGGREGATION;

-    VirtualProtocol* vp = new VirtualProtocol;
+    VirtualProtocol* vp = new VirtualProtocol(m_handler);

     vp->AddRef();
     HRESULT hr = vp->QueryInterface(riid, ppvObject);
     vp->Release();
     vp->AddRef();
     HRESULT hr = vp->QueryInterface(riid, ppvObject);
     vp->Release();


@@ -1090,8 +1155,8 @@ HRESULT ClassFactory::CreateInstance(IUnknown* pUnkOuter, REFIID riid,
 
 STDMETHODIMP ClassFactory::LockServer(BOOL fLock)
 {
 
 STDMETHODIMP ClassFactory::LockServer(BOOL fLock)
 {

-     return S_OK;
-
+    wxUnusedVar(fLock);
+    return S_OK;

 }
 
 ULONG ClassFactory::AddRef(void)
 }
 
 ULONG ClassFactory::AddRef(void)


@@ -1131,4 +1196,4 @@ ULONG ClassFactory::Release(void)
 
 } 
 
 
 } 
 

-#endif
+#endif // wxUSE_WEBVIEW && wxUSE_WEBVIEW_IE