]> git.saurik.com Git - wxWidgets.git/blobdiff - src/msw/webview_ie.cpp
fixing osx_cocoa
[wxWidgets.git] / src / msw / webview_ie.cpp
index d87ec525b6f3df35b5dd00c96837e195ceb3084b..868877c9ef330a6d664702b16ebc3ccbf0bed6b5 100644 (file)
@@ -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
 /////////////////////////////////////////////////////////////////////////////
 
 #include <exdispid.h>
 #include <exdisp.h>
 #include <mshtml.h>
 #include <exdispid.h>
 #include <exdisp.h>
 #include <mshtml.h>
+#include "wx/msw/registry.h"
+#include "wx/msw/missing.h"
+#include "wx/filesys.h"
 
 
-// Various definitions are missing from mingw
-#ifdef __MINGW32__
-typedef enum CommandStateChangeConstants {
-    CSC_UPDATECOMMANDS = (int) 0xFFFFFFFF,
-    CSC_NAVIGATEFORWARD = 0x1,
-    CSC_NAVIGATEBACK = 0x2
-} CommandStateChangeConstants;
-
-#define DISPID_COMMANDSTATECHANGE 105
-#define DISPID_NAVIGATECOMPLETE2 252
-#define DISPID_NAVIGATEERROR 271
-#define DISPID_NEWWINDOW3 273
-#define OLECMDID_OPTICAL_ZOOM 63
-#define INET_E_ERROR_FIRST 0x800C0002L
-#define INET_E_INVALID_URL 0x800C0002L
-#define INET_E_NO_SESSION 0x800C0003L
-#define INET_E_CANNOT_CONNECT 0x800C0004L
-#define INET_E_RESOURCE_NOT_FOUND 0x800C0005L
-#define INET_E_OBJECT_NOT_FOUND 0x800C0006L
-#define INET_E_DATA_NOT_AVAILABLE 0x800C0007L
-#define INET_E_DOWNLOAD_FAILURE 0x800C0008L
-#define INET_E_AUTHENTICATION_REQUIRED 0x800C0009L
-#define INET_E_NO_VALID_MEDIA 0x800C000AL
-#define INET_E_CONNECTION_TIMEOUT 0x800C000BL
-#define INET_E_INVALID_REQUEST 0x800C000CL
-#define INET_E_UNKNOWN_PROTOCOL 0x800C000DL
-#define INET_E_SECURITY_PROBLEM 0x800C000EL
-#define INET_E_CANNOT_LOAD_DATA 0x800C000FL
-#define INET_E_CANNOT_INSTANTIATE_OBJECT 0x800C0010L
-#define INET_E_QUERYOPTION_UNKNOWN 0x800C0013L
-#define INET_E_REDIRECT_FAILED 0x800C0014L
-#define INET_E_REDIRECT_TO_DIR 0x800C0015L
-#define INET_E_CANNOT_LOCK_REQUEST 0x800C0016L
-#define INET_E_USE_EXTEND_BINDING 0x800C0017L
-#define INET_E_TERMINATED_BIND 0x800C0018L
-#define INET_E_INVALID_CERTIFICATE 0x800C0019L
-#define INET_E_CODE_DOWNLOAD_DECLINED 0x800C0100L
-#define INET_E_RESULT_DISPATCHED 0x800C0200L
-#define INET_E_CANNOT_REPLACE_SFP_FILE 0x800C0300L
-#define INET_E_CODE_INSTALL_BLOCKED_BY_HASH_POLICY 0x800C0500L
-#define INET_E_CODE_INSTALL_SUPPRESSED 0x800C0400L
-
-#define REFRESH_NORMAL 0
-#define REFRESH_COMPLETELY 3
-#endif
+wxIMPLEMENT_DYNAMIC_CLASS(wxWebViewIE, wxWebView);
+
+//We link to urlmon as it is required for CoInternetGetSession
+#pragma comment(lib, "urlmon")
 
 BEGIN_EVENT_TABLE(wxWebViewIE, wxControl)
     EVT_ACTIVEX(wxID_ANY, wxWebViewIE::onActiveXEvent)
 
 BEGIN_EVENT_TABLE(wxWebViewIE, wxControl)
     EVT_ACTIVEX(wxID_ANY, wxWebViewIE::onActiveXEvent)
@@ -90,12 +52,11 @@ bool wxWebViewIE::Create(wxWindow* parent,
     }
 
     m_webBrowser = NULL;
     }
 
     m_webBrowser = NULL;
-    m_canNavigateBack = false;
-    m_canNavigateForward = false;
     m_isBusy = false;
     m_historyLoadingFromList = false;
     m_historyEnabled = true;
     m_historyPosition = -1;
     m_isBusy = false;
     m_historyLoadingFromList = false;
     m_historyEnabled = true;
     m_historyPosition = -1;
+    m_zoomType = wxWEB_VIEW_ZOOM_TYPE_TEXT;
 
     if (::CoCreateInstance(CLSID_WebBrowser, NULL,
                            CLSCTX_INPROC_SERVER, // CLSCTX_INPROC,
 
     if (::CoCreateInstance(CLSID_WebBrowser, NULL,
                            CLSCTX_INPROC_SERVER, // CLSCTX_INPROC,
@@ -109,7 +70,6 @@ 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);
 
     m_container = new wxActiveXContainer(this, IID_IWebBrowser2, m_webBrowser);
 
 
     m_container = new wxActiveXContainer(this, IID_IWebBrowser2, m_webBrowser);
 
@@ -122,29 +82,11 @@ bool wxWebViewIE::Create(wxWindow* parent,
 
 void wxWebViewIE::LoadUrl(const wxString& url)
 {
 
 void wxWebViewIE::LoadUrl(const wxString& url)
 {
-    wxVariant out = m_ie.CallMethod("Navigate", (BSTR) url.wc_str(),
-                                    NULL, NULL, NULL, NULL);
-
-    // FIXME: why is out value null??
-    //(HRESULT)(out.GetLong()) == S_OK;
+    m_ie.CallMethod("Navigate", (BSTR) url.wc_str(), NULL, NULL, NULL, NULL);
 }
 
 void wxWebViewIE::SetPage(const wxString& html, const wxString& baseUrl)
 {
 }
 
 void wxWebViewIE::SetPage(const wxString& html, const wxString& baseUrl)
 {
-    LoadUrl("about:blank");
-
-    // Let the wx events generated for navigation events be processed, so
-    // that the underlying IE component completes its Document object.
-    // FIXME: calling wxYield is not elegant nor very reliable probably
-    wxYield();
-
-    wxVariant documentVariant = m_ie.GetProperty("Document");
-    void* documentPtr = documentVariant.GetVoidPtr();
-
-    wxASSERT (documentPtr != NULL);
-
-    // TODO: consider the "baseUrl" parameter if possible
-    // TODO: consider encoding
     BSTR bstr = SysAllocString(html.wc_str());
 
     // Creates a new one-dimensional array
     BSTR bstr = SysAllocString(html.wc_str());
 
     // Creates a new one-dimensional array
@@ -152,17 +94,30 @@ void wxWebViewIE::SetPage(const wxString& html, const wxString& baseUrl)
     if (psaStrings != NULL)
     {
         VARIANT *param;
     if (psaStrings != NULL)
     {
         VARIANT *param;
+
         HRESULT hr = SafeArrayAccessData(psaStrings, (LPVOID*)&param);
         param->vt = VT_BSTR;
         param->bstrVal = bstr;
         HRESULT hr = SafeArrayAccessData(psaStrings, (LPVOID*)&param);
         param->vt = VT_BSTR;
         param->bstrVal = bstr;
-
         hr = SafeArrayUnaccessData(psaStrings);
 
         hr = SafeArrayUnaccessData(psaStrings);
 
-        IHTMLDocument2* document = (IHTMLDocument2*)documentPtr;
+        IHTMLDocument2* document = GetDocument();
         document->write(psaStrings);
         document->write(psaStrings);
+        document->Release();
 
         // SafeArrayDestroy calls SysFreeString for each BSTR
         SafeArrayDestroy(psaStrings);
 
         // SafeArrayDestroy calls SysFreeString for each BSTR
         SafeArrayDestroy(psaStrings);
+
+        //We send the events when we are done to mimic webkit
+        //Navigated event
+        wxWebNavigationEvent event(wxEVT_COMMAND_WEB_VIEW_NAVIGATED,
+                                   GetId(), baseUrl, "", false);
+        event.SetEventObject(this);
+        HandleWindowEvent(event);
+
+        //Document complete event
+        event.SetEventType(wxEVT_COMMAND_WEB_VIEW_LOADED);
+        event.SetEventObject(this);
+        HandleWindowEvent(event);
     }
     else
     {
     }
     else
     {
@@ -173,93 +128,57 @@ void wxWebViewIE::SetPage(const wxString& html, const wxString& baseUrl)
 
 wxString wxWebViewIE::GetPageSource()
 {
 
 wxString wxWebViewIE::GetPageSource()
 {
-    wxVariant documentVariant = m_ie.GetProperty("Document");
-    void* documentPtr = documentVariant.GetVoidPtr();
-
-    if (documentPtr == NULL)
-    {
-        return wxEmptyString;
-    }
-
-    IHTMLDocument2* document = (IHTMLDocument2*)documentPtr;
-
+    IHTMLDocument2* document = GetDocument();
     IHTMLElement *bodyTag = NULL;
     IHTMLElement *htmlTag = NULL;
     IHTMLElement *bodyTag = NULL;
     IHTMLElement *htmlTag = NULL;
-    document->get_body(&bodyTag);
-    wxASSERT(bodyTag != NULL);
+    wxString source;
+    HRESULT hr = document->get_body(&bodyTag);
+    if(SUCCEEDED(hr))
+    {
+        hr = bodyTag->get_parentElement(&htmlTag);
+        if(SUCCEEDED(hr))
+        {
+            BSTR bstr;
+            htmlTag->get_outerHTML(&bstr);
+            source = wxString(bstr);
+            htmlTag->Release();
+        }
+        bodyTag->Release();
+    }
 
     document->Release();
 
     document->Release();
-    bodyTag->get_parentElement(&htmlTag);
-    wxASSERT(htmlTag != NULL);
-
-    BSTR    bstr;
-    htmlTag->get_outerHTML(&bstr);
-
-    bodyTag->Release();
-    htmlTag->Release();
-
-    //wxMessageBox(wxString(bstr));
-
-    // TODO: check encoding
-    return wxString(bstr);
+    return source;
 }
 
 }
 
-// FIXME? retrieve OLECMDID_GETZOOMRANGE instead of hardcoding range 0-4
 wxWebViewZoom wxWebViewIE::GetZoom()
 {
 wxWebViewZoom wxWebViewIE::GetZoom()
 {
-    const int zoom = GetIETextZoom();
+    if(m_zoomType == wxWEB_VIEW_ZOOM_TYPE_LAYOUT)
+        return GetIEOpticalZoom();
+    else if(m_zoomType == wxWEB_VIEW_ZOOM_TYPE_TEXT)
+        return GetIETextZoom();
+    else
+        wxFAIL;
+
+    //Dummy return to stop compiler warnings
+    return wxWEB_VIEW_ZOOM_MEDIUM;
 
 
-    switch (zoom)
-    {
-        case 0:
-            return wxWEB_VIEW_ZOOM_TINY;
-            break;
-        case 1:
-            return wxWEB_VIEW_ZOOM_SMALL;
-            break;
-        case 2:
-            return wxWEB_VIEW_ZOOM_MEDIUM;
-            break;
-        case 3:
-            return wxWEB_VIEW_ZOOM_LARGE;
-            break;
-        case 4:
-            return wxWEB_VIEW_ZOOM_LARGEST;
-            break;
-        default:
-            wxASSERT(false);
-            return wxWEB_VIEW_ZOOM_MEDIUM;
-    }
 }
 }
+
 void wxWebViewIE::SetZoom(wxWebViewZoom zoom)
 {
 void wxWebViewIE::SetZoom(wxWebViewZoom zoom)
 {
-    // I know I could cast from enum to int since wxWebViewZoom happens to
-    // match with IE's zoom levels, but I don't like doing that, what if enum
-    // values change...
-    switch (zoom)
-    {
-        case wxWEB_VIEW_ZOOM_TINY:
-            SetIETextZoom(0);
-            break;
-        case wxWEB_VIEW_ZOOM_SMALL:
-            SetIETextZoom(1);
-            break;
-        case wxWEB_VIEW_ZOOM_MEDIUM:
-            SetIETextZoom(2);
-            break;
-        case wxWEB_VIEW_ZOOM_LARGE:
-            SetIETextZoom(3);
-            break;
-        case wxWEB_VIEW_ZOOM_LARGEST:
-            SetIETextZoom(4);
-            break;
-        default:
-            wxASSERT(false);
-    }
+    if(m_zoomType == wxWEB_VIEW_ZOOM_TYPE_LAYOUT)
+        SetIEOpticalZoom(zoom);
+    else if(m_zoomType == wxWEB_VIEW_ZOOM_TYPE_TEXT)
+        SetIETextZoom(zoom);
+    else
+        wxFAIL;
 }
 
 }
 
-void wxWebViewIE::SetIETextZoom(int level)
+void wxWebViewIE::SetIETextZoom(wxWebViewZoom level)
 {
 {
+    //We do not use OLECMDID_OPTICAL_GETZOOMRANGE as the docs say the range
+    //is 0 to 4 so the check is unnecessary, these match exactly with the
+    //enum values
     VARIANT zoomVariant;
     VariantInit (&zoomVariant);
     V_VT(&zoomVariant) = VT_I4;
     VARIANT zoomVariant;
     VariantInit (&zoomVariant);
     V_VT(&zoomVariant) = VT_I4;
@@ -268,87 +187,120 @@ void wxWebViewIE::SetIETextZoom(int level)
     HRESULT result = m_webBrowser->ExecWB(OLECMDID_ZOOM,
                                           OLECMDEXECOPT_DONTPROMPTUSER,
                                           &zoomVariant, NULL);
     HRESULT result = m_webBrowser->ExecWB(OLECMDID_ZOOM,
                                           OLECMDEXECOPT_DONTPROMPTUSER,
                                           &zoomVariant, NULL);
-    wxASSERT (result == S_OK);
-
-    VariantClear (&zoomVariant);
+    wxASSERT(result == S_OK);
 }
 
 }
 
-int wxWebViewIE::GetIETextZoom()
+wxWebViewZoom wxWebViewIE::GetIETextZoom()
 {
     VARIANT zoomVariant;
     VariantInit (&zoomVariant);
     V_VT(&zoomVariant) = VT_I4;
 {
     VARIANT zoomVariant;
     VariantInit (&zoomVariant);
     V_VT(&zoomVariant) = VT_I4;
-    V_I4(&zoomVariant) = 4;
 
     HRESULT result = m_webBrowser->ExecWB(OLECMDID_ZOOM,
                                           OLECMDEXECOPT_DONTPROMPTUSER,
                                           NULL, &zoomVariant);
 
     HRESULT result = m_webBrowser->ExecWB(OLECMDID_ZOOM,
                                           OLECMDEXECOPT_DONTPROMPTUSER,
                                           NULL, &zoomVariant);
-    wxASSERT (result == S_OK);
+    wxASSERT(result == S_OK);
 
 
-    int zoom = V_I4(&zoomVariant);
-   // wxMessageBox(wxString::Format("Zoom : %i", zoom));
-    VariantClear (&zoomVariant);
-
-    return zoom;
+    //We can safely cast here as we know that the range matches our enum
+    return static_cast<wxWebViewZoom>(V_I4(&zoomVariant));
 }
 
 }
 
-void wxWebViewIE::SetIEOpticalZoom(float zoom)
+void wxWebViewIE::SetIEOpticalZoom(wxWebViewZoom level)
 {
 {
-    // TODO: add support for optical zoom (IE7+ only)
-
-    // TODO: get range from OLECMDID_OPTICAL_GETZOOMRANGE instead of hardcoding?
-    wxASSERT(zoom >= 10.0f);
-    wxASSERT(zoom <= 1000.0f);
-
+    //We do not use OLECMDID_OPTICAL_GETZOOMRANGE as the docs say the range
+    //is 10 to 1000 so the check is unnecessary
     VARIANT zoomVariant;
     VariantInit (&zoomVariant);
     V_VT(&zoomVariant) = VT_I4;
     VARIANT zoomVariant;
     VariantInit (&zoomVariant);
     V_VT(&zoomVariant) = VT_I4;
-    V_I4(&zoomVariant) = (zoom * 100.0f);
+
+    //We make a somewhat arbitray map here, taken from values used by webkit
+    switch(level)
+    {
+        case wxWEB_VIEW_ZOOM_TINY:
+            V_I4(&zoomVariant) = 60;
+            break;
+        case wxWEB_VIEW_ZOOM_SMALL:
+            V_I4(&zoomVariant) = 80;
+            break;
+        case wxWEB_VIEW_ZOOM_MEDIUM:
+            V_I4(&zoomVariant) = 100;
+            break;
+        case wxWEB_VIEW_ZOOM_LARGE:
+            V_I4(&zoomVariant) = 130;
+            break;
+        case wxWEB_VIEW_ZOOM_LARGEST:
+            V_I4(&zoomVariant) = 160;
+            break;
+        default:
+            wxFAIL;
+    }
 
     HRESULT result = m_webBrowser->ExecWB((OLECMDID)OLECMDID_OPTICAL_ZOOM,
                                           OLECMDEXECOPT_DODEFAULT,
                                           &zoomVariant,
                                           NULL);
 
     HRESULT result = m_webBrowser->ExecWB((OLECMDID)OLECMDID_OPTICAL_ZOOM,
                                           OLECMDEXECOPT_DODEFAULT,
                                           &zoomVariant,
                                           NULL);
-    wxASSERT (result == S_OK);
+    wxASSERT(result == S_OK);
 }
 
 }
 
-float wxWebViewIE::GetIEOpticalZoom()
+wxWebViewZoom wxWebViewIE::GetIEOpticalZoom()
 {
 {
-    // TODO: add support for optical zoom (IE7+ only)
-
     VARIANT zoomVariant;
     VariantInit (&zoomVariant);
     V_VT(&zoomVariant) = VT_I4;
     VARIANT zoomVariant;
     VariantInit (&zoomVariant);
     V_VT(&zoomVariant) = VT_I4;
-    V_I4(&zoomVariant) = -1;
 
     HRESULT result = m_webBrowser->ExecWB((OLECMDID)OLECMDID_OPTICAL_ZOOM,
                                           OLECMDEXECOPT_DODEFAULT, NULL,
                                           &zoomVariant);
 
     HRESULT result = m_webBrowser->ExecWB((OLECMDID)OLECMDID_OPTICAL_ZOOM,
                                           OLECMDEXECOPT_DODEFAULT, NULL,
                                           &zoomVariant);
-    wxASSERT (result == S_OK);
+    wxASSERT(result == S_OK);
 
     const int zoom = V_I4(&zoomVariant);
 
     const int zoom = V_I4(&zoomVariant);
-    VariantClear (&zoomVariant);
 
 
-    return zoom / 100.0f;
+    //We make a somewhat arbitray map here, taken from values used by webkit
+    if (zoom <= 65)
+    {
+        return wxWEB_VIEW_ZOOM_TINY;
+    }
+    else if (zoom > 65 && zoom <= 90)
+    {
+        return wxWEB_VIEW_ZOOM_SMALL;
+    }
+    else if (zoom > 90 && zoom <= 115)
+    {
+        return wxWEB_VIEW_ZOOM_MEDIUM;
+    }
+    else if (zoom > 115 && zoom <= 145)
+    {
+        return wxWEB_VIEW_ZOOM_LARGE;
+    }
+    else /*if (zoom > 145) */ //Using else removes a compiler warning
+    {
+        return wxWEB_VIEW_ZOOM_LARGEST;
+    }
 }
 
 }
 
-void wxWebViewIE::SetZoomType(wxWebViewZoomType)
+void wxWebViewIE::SetZoomType(wxWebViewZoomType type)
 {
 {
-    // TODO: add support for optical zoom (IE7+ only)
-    wxASSERT(false);
+    m_zoomType = type;
 }
 
 wxWebViewZoomType wxWebViewIE::GetZoomType() const
 {
 }
 
 wxWebViewZoomType wxWebViewIE::GetZoomType() const
 {
-    // TODO: add support for optical zoom (IE7+ only)
-    return wxWEB_VIEW_ZOOM_TYPE_TEXT;
+    return m_zoomType;
 }
 
 }
 
-bool wxWebViewIE::CanSetZoomType(wxWebViewZoomType) const
+bool wxWebViewIE::CanSetZoomType(wxWebViewZoomType type) const
 {
 {
-    // both are supported
-    // TODO: IE6 only supports text zoom, check if it's IE6 first
-    return true;
+    //IE 6 and below only support text zoom, so check the registry to see what
+    //version we actually have
+    wxRegKey key(wxRegKey::HKLM, "Software\\Microsoft\\Internet Explorer");
+    wxString value;
+    key.QueryValue("Version", value);
+
+    long version = wxAtoi(value.Left(1));
+    if(version <= 6 && type == wxWEB_VIEW_ZOOM_TYPE_LAYOUT)
+        return false;
+    else
+        return true;
 }
 
 void wxWebViewIE::Print()
 }
 
 void wxWebViewIE::Print()
@@ -368,40 +320,64 @@ bool wxWebViewIE::CanGoBack()
 bool wxWebViewIE::CanGoForward()
 {
     if(m_historyEnabled)
 bool wxWebViewIE::CanGoForward()
 {
     if(m_historyEnabled)
-        return m_historyPosition != m_historyList.size() - 1;
+        return m_historyPosition != static_cast<int>(m_historyList.size()) - 1;
     else
         return false;
 }
 
     else
         return false;
 }
 
-void wxWebViewIE::LoadHistoryItem(wxWebHistoryItem* item)
+void wxWebViewIE::LoadHistoryItem(wxSharedPtr<wxWebHistoryItem> 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++)
     {
-        if(m_historyList[i].get() == item)
+        //We compare the actual pointers to find the correct item
+        if(m_historyList[i].get() == item.get())
             pos = i;
     }
             pos = i;
     }
+    wxASSERT_MSG(pos != static_cast<int>(m_historyList.size()),
+                 "invalid history item");
     m_historyLoadingFromList = true;
     LoadUrl(item->GetUrl());
     m_historyPosition = pos;
 }
 
     m_historyLoadingFromList = true;
     LoadUrl(item->GetUrl());
     m_historyPosition = pos;
 }
 
+wxVector<wxSharedPtr<wxWebHistoryItem> > wxWebViewIE::GetBackwardHistory()
+{
+    wxVector<wxSharedPtr<wxWebHistoryItem> > 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++)
+    {
+        backhist.push_back(m_historyList[i]);
+    }
+    return backhist;
+}
+
+wxVector<wxSharedPtr<wxWebHistoryItem> > wxWebViewIE::GetForwardHistory()
+{
+    wxVector<wxSharedPtr<wxWebHistoryItem> > 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++)
+    {
+        forwardhist.push_back(m_historyList[i]);
+    }
+    return forwardhist;
+}
+
 void wxWebViewIE::GoBack()
 {
 void wxWebViewIE::GoBack()
 {
-    LoadHistoryItem(m_historyList[m_historyPosition - 1].get());
+    LoadHistoryItem(m_historyList[m_historyPosition - 1]);
 }
 
 void wxWebViewIE::GoForward()
 {
 }
 
 void wxWebViewIE::GoForward()
 {
-    LoadHistoryItem(m_historyList[m_historyPosition + 1].get());
+    LoadHistoryItem(m_historyList[m_historyPosition + 1]);
 }
 
 void wxWebViewIE::Stop()
 {
 }
 
 void wxWebViewIE::Stop()
 {
-    wxVariant out = m_ie.CallMethod("Stop");
-
-    // FIXME: why is out value null??
-    //return (HRESULT)(out.GetLong()) == S_OK;
+    m_ie.CallMethod("Stop");
 }
 
 void wxWebViewIE::ClearHistory()
 }
 
 void wxWebViewIE::ClearHistory()
@@ -478,10 +454,259 @@ wxString wxWebViewIE::GetCurrentURL()
 
 wxString wxWebViewIE::GetCurrentTitle()
 {
 
 wxString wxWebViewIE::GetCurrentTitle()
 {
-    wxVariant out = m_ie.GetProperty("LocationName");
+    IHTMLDocument2* document = GetDocument();
+    BSTR title;
 
 
-    wxASSERT(out.GetType() == "string");
-    return out.GetString();
+    document->get_nameProp(&title);
+    document->Release();
+    return wxString(title);
+}
+
+bool wxWebViewIE::CanCut()
+{
+    return CanExecCommand("Cut");
+}
+
+bool wxWebViewIE::CanCopy()
+{
+    return CanExecCommand("Copy");
+}
+bool wxWebViewIE::CanPaste()
+{
+    return CanExecCommand("Paste");
+}
+
+void wxWebViewIE::Cut()
+{
+    ExecCommand("Cut");
+}
+
+void wxWebViewIE::Copy()
+{
+    ExecCommand("Copy");
+}
+
+void wxWebViewIE::Paste()
+{
+    ExecCommand("Paste");
+}
+
+bool wxWebViewIE::CanUndo()
+{
+    return CanExecCommand("Undo");
+}
+bool wxWebViewIE::CanRedo()
+{
+    return CanExecCommand("Redo");
+}
+
+void wxWebViewIE::Undo()
+{
+    ExecCommand("Undo");
+}
+
+void wxWebViewIE::Redo()
+{
+    ExecCommand("Redo");
+}
+
+void wxWebViewIE::SetEditable(bool enable)
+{
+    IHTMLDocument2* document = GetDocument();
+    if( enable )
+        document->put_designMode(SysAllocString(L"On"));
+    else
+        document->put_designMode(SysAllocString(L"Off"));
+
+    document->Release();
+}
+
+bool wxWebViewIE::IsEditable()
+{
+    IHTMLDocument2* document = GetDocument();
+    BSTR mode;
+    document->get_designMode(&mode);
+    document->Release();
+    if(wxString(mode) == "On")
+        return true;
+    else
+        return false;
+}
+
+void wxWebViewIE::SelectAll()
+{
+    ExecCommand("SelectAll");
+}
+
+bool wxWebViewIE::HasSelection()
+{
+    IHTMLDocument2* document = GetDocument();
+    IHTMLSelectionObject* selection;
+    wxString sel;
+    HRESULT hr = document->get_selection(&selection);
+    if(SUCCEEDED(hr))
+    {
+        BSTR type;
+        selection->get_type(&type);
+        sel = wxString(type);
+        selection->Release();
+    }
+    document->Release();
+    return sel != "None";
+}
+
+void wxWebViewIE::DeleteSelection()
+{
+    ExecCommand("Delete");
+}
+
+wxString wxWebViewIE::GetSelectedText()
+{
+    IHTMLDocument2* document = GetDocument();
+    IHTMLSelectionObject* selection;
+    wxString selected;
+    HRESULT hr = document->get_selection(&selection);
+    if(SUCCEEDED(hr))
+    {
+        IDispatch* disrange;
+        hr = selection->createRange(&disrange);
+        if(SUCCEEDED(hr))
+        {
+            IHTMLTxtRange* range;
+            hr = disrange->QueryInterface(IID_IHTMLTxtRange, (void**)&range);
+            if(SUCCEEDED(hr))
+            {
+                BSTR text;
+                range->get_text(&text);
+                selected = wxString(text);
+                range->Release();
+            }
+            disrange->Release();
+        }
+        selection->Release();
+    }
+    document->Release();
+    return selected;
+}
+
+wxString wxWebViewIE::GetSelectedSource()
+{
+    IHTMLDocument2* document = GetDocument();
+    IHTMLSelectionObject* selection;
+    wxString selected;
+    HRESULT hr = document->get_selection(&selection);
+    if(SUCCEEDED(hr))
+    {
+        IDispatch* disrange;
+        hr = selection->createRange(&disrange);
+        if(SUCCEEDED(hr))
+        {
+            IHTMLTxtRange* range;
+            hr = disrange->QueryInterface(IID_IHTMLTxtRange, (void**)&range);
+            if(SUCCEEDED(hr))
+            {
+                BSTR text;
+                range->get_htmlText(&text);
+                selected = wxString(text);
+                range->Release();
+            }
+            disrange->Release();
+        }
+        selection->Release();
+    }
+    document->Release();
+    return selected;
+}
+
+void wxWebViewIE::ClearSelection()
+{
+    IHTMLDocument2* document = GetDocument();
+    IHTMLSelectionObject* selection;
+    wxString selected;
+    HRESULT hr = document->get_selection(&selection);
+    if(SUCCEEDED(hr))
+    {
+        selection->empty();
+        selection->Release();
+    }
+    document->Release();
+}
+
+wxString wxWebViewIE::GetPageText()
+{
+    IHTMLDocument2* document = GetDocument();
+    wxString text;
+    IHTMLElement* body;
+    HRESULT hr = document->get_body(&body);
+    if(SUCCEEDED(hr))
+    {
+        BSTR out;
+        body->get_innerText(&out);
+        text = wxString(out);
+        body->Release();
+    }
+    document->Release();
+    return text;
+}
+
+void wxWebViewIE::RunScript(const wxString& javascript)
+{
+    IHTMLDocument2* document = GetDocument();
+    IHTMLWindow2* window;
+    wxString language = "javascript";
+    HRESULT hr = document->get_parentWindow(&window);
+    if(SUCCEEDED(hr))
+    {
+        VARIANT level;
+        VariantInit(&level);
+        V_VT(&level) = VT_EMPTY;
+        window->execScript(SysAllocString(javascript), SysAllocString(language), &level);
+    }
+    document->Release();
+}
+
+void wxWebViewIE::RegisterHandler(wxSharedPtr<wxWebHandler> handler)
+{
+    ClassFactory* cf = new ClassFactory(handler);
+    IInternetSession* session;
+    if(FAILED(CoInternetGetSession(0, &session, 0)))
+    {
+        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");
+    }
+}
+
+bool wxWebViewIE::CanExecCommand(wxString command)
+{
+    IHTMLDocument2* document = GetDocument();
+    VARIANT_BOOL enabled;
+
+    document->queryCommandEnabled(SysAllocString(command.wc_str()), &enabled);
+    document->Release();
+
+    return (enabled == VARIANT_TRUE);
+}
+
+void wxWebViewIE::ExecCommand(wxString command)
+{
+    IHTMLDocument2* document = GetDocument();
+    document->execCommand(SysAllocString(command.wc_str()), VARIANT_FALSE, VARIANT(), NULL);
+    document->Release();
+}
+
+IHTMLDocument2* wxWebViewIE::GetDocument()
+{
+    wxVariant variant = m_ie.GetProperty("Document");
+    IHTMLDocument2* document = (IHTMLDocument2*)variant.GetVoidPtr();
+
+    wxASSERT(document);
+
+    return document;
 }
 
 void wxWebViewIE::onActiveXEvent(wxActiveXEvent& evt)
 }
 
 void wxWebViewIE::onActiveXEvent(wxActiveXEvent& evt)
@@ -546,12 +771,14 @@ void wxWebViewIE::onActiveXEvent(wxActiveXEvent& evt)
                 break;
 
             wxString url = evt[1].GetString();
                 break;
 
             wxString url = evt[1].GetString();
-            //As we are complete we also add to the history list
-            if(m_historyEnabled && !m_historyLoadingFromList)
+
+            //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())
             {
                 //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
-                if(m_historyPosition != m_historyList.size() - 1)
+                if(m_historyPosition != static_cast<int>(m_historyList.size()) - 1)
                 {
                     m_historyList.erase(m_historyList.begin() + m_historyPosition + 1,
                                         m_historyList.end());
                 {
                     m_historyList.erase(m_historyList.begin() + m_historyPosition + 1,
                                         m_historyList.end());
@@ -578,6 +805,13 @@ void wxWebViewIE::onActiveXEvent(wxActiveXEvent& evt)
 
         case DISPID_TITLECHANGE:
         {
 
         case DISPID_TITLECHANGE:
         {
+            wxString title = evt[0].GetString();
+
+            wxWebNavigationEvent event(wxEVT_COMMAND_WEB_VIEW_TITLE_CHANGED,
+                                       GetId(), GetCurrentURL(), wxEmptyString, true);
+            event.SetString(title);
+            event.SetEventObject(this);
+            HandleWindowEvent(event);
             break;
         }
 
             break;
         }
 
@@ -705,21 +939,6 @@ void wxWebViewIE::onActiveXEvent(wxActiveXEvent& evt)
             HandleWindowEvent(event);
             break;
         }
             HandleWindowEvent(event);
             break;
         }
-
-        case DISPID_COMMANDSTATECHANGE:
-        {
-            long commandId = evt[0].GetLong();
-            bool enable = evt[1].GetBool();
-            if (commandId == CSC_NAVIGATEBACK)
-            {
-                m_canNavigateBack = enable;
-            }
-            else if (commandId == CSC_NAVIGATEFORWARD)
-            {
-                m_canNavigateForward = enable;
-            }
-            break;
-        }
         case DISPID_NEWWINDOW3:
         {
             wxString url = evt[4].GetString();
         case DISPID_NEWWINDOW3:
         {
             wxString url = evt[4].GetString();
@@ -729,12 +948,10 @@ void wxWebViewIE::onActiveXEvent(wxActiveXEvent& evt)
             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;
         }
     }
@@ -742,4 +959,173 @@ void wxWebViewIE::onActiveXEvent(wxActiveXEvent& evt)
     evt.Skip();
 }
 
     evt.Skip();
 }
 
+VirtualProtocol::VirtualProtocol(wxSharedPtr<wxWebHandler> handler)
+{
+    m_refCount = 0;
+    m_file = NULL;
+    m_handler = handler;
+}
+
+VirtualProtocol::~VirtualProtocol()
+{
+}
+
+ULONG VirtualProtocol::AddRef()
+{
+    m_refCount++;
+    return m_refCount;
+}
+
+HRESULT VirtualProtocol::QueryInterface(REFIID riid, void **ppvObject)
+{
+    if(riid == IID_IUnknown || riid == IID_IInternetProtocolRoot || 
+       riid == IID_IInternetProtocol)
+    {
+        *ppvObject = (IInternetProtocol*)this;
+        AddRef();
+        return S_OK;
+    }
+    else
+    {
+        *ppvObject = NULL;
+        return E_POINTER;
+    }
+}
+
+ULONG VirtualProtocol::Release()
+{
+    m_refCount--;
+    if (m_refCount > 0)
+    {
+        return m_refCount;
+    }
+    else
+    {
+        delete this;
+        return 0;
+    }
+}
+
+HRESULT VirtualProtocol::Start(LPCWSTR szUrl, IInternetProtocolSink *pOIProtSink,
+                               IInternetBindInfo *pOIBindInfo, DWORD grfPI, 
+                               HANDLE_PTR dwReserved)
+{
+    wxUnusedVar(szUrl);
+    wxUnusedVar(pOIBindInfo);
+    wxUnusedVar(grfPI);
+    wxUnusedVar(dwReserved);
+    m_protocolSink = pOIProtSink;
+    
+    //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
+    wxFileOffset length = m_file->GetStream()->GetLength();
+    m_protocolSink->ReportData(BSCF_FIRSTDATANOTIFICATION | 
+                               BSCF_DATAFULLYAVAILABLE |
+                               BSCF_LASTDATANOTIFICATION,
+                               length, length);
+    return S_OK; 
+}
+
+HRESULT VirtualProtocol::Read(void *pv, ULONG cb, ULONG *pcbRead)
+{
+    //If the file is null we return false to indicte it is finished
+    if(!m_file) 
+        return S_FALSE;
+
+    wxStreamError err = m_file->GetStream()->Read(pv, cb).GetLastError();
+    *pcbRead = m_file->GetStream()->LastRead();
+
+    if(err == wxSTREAM_NO_ERROR)
+    {
+        if(*pcbRead < cb)
+        {
+            wxDELETE(m_file);
+            m_protocolSink->ReportResult(S_OK, 0, NULL);
+        }
+        //As we are not eof there is more data
+        return S_OK;
+    }
+    else if(err == wxSTREAM_EOF)
+    {
+        wxDELETE(m_file);
+        m_protocolSink->ReportResult(S_OK, 0, NULL);
+        //We are eof and so finished
+        return S_OK;
+    }
+    else if(err ==  wxSTREAM_READ_ERROR)
+    {
+        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,
+                                     void ** ppvObject)
+{
+    if (pUnkOuter) 
+        return CLASS_E_NOAGGREGATION;
+    VirtualProtocol* vp = new VirtualProtocol(m_handler);
+    vp->AddRef();
+    HRESULT hr = vp->QueryInterface(riid, ppvObject);
+    vp->Release();
+    return hr;
+
+} 
+
+STDMETHODIMP ClassFactory::LockServer(BOOL fLock)
+{
+    wxUnusedVar(fLock);
+    return S_OK;
+}
+
+ULONG ClassFactory::AddRef(void)
+{
+    m_refCount++;
+    return m_refCount;
+}
+
+HRESULT ClassFactory::QueryInterface(REFIID riid, void **ppvObject)
+{
+    if ((riid == IID_IUnknown) || (riid == IID_IClassFactory))
+    {
+        *ppvObject = this;
+        AddRef();
+        return S_OK;
+    }
+    else
+    {
+        *ppvObject = NULL;
+        return E_POINTER;
+    }
+
+}
+
+ULONG ClassFactory::Release(void)
+{
+    m_refCount--;
+    if (m_refCount > 0)
+    {
+        return m_refCount;
+    }
+    else
+    {
+        delete this;
+        return 0;
+    }
+
+} 
+
 #endif
 #endif