fixing osx_cocoa

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

diff --git a/src/msw/webview_ie.cpp b/src/msw/webview_ie.cpp
index f8e01432e6e06d4dd7e5c0387eb53bfaf699c27c..868877c9ef330a6d664702b16ebc3ccbf0bed6b5 100644 (file)
--- a/src/msw/webview_ie.cpp
+++ b/src/msw/webview_ie.cpp
@@ -27,6 +27,8 @@
 #include "wx/msw/missing.h"
 #include "wx/filesys.h"
 
 #include "wx/msw/missing.h"
 #include "wx/filesys.h"
 

+wxIMPLEMENT_DYNAMIC_CLASS(wxWebViewIE, wxWebView);
+

 //We link to urlmon as it is required for CoInternetGetSession
 #pragma comment(lib, "urlmon")
 
 //We link to urlmon as it is required for CoInternetGetSession
 #pragma comment(lib, "urlmon")
 


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

-void wxWebViewIE::RegisterHandler(wxWebHandler* handler)
+void wxWebViewIE::RegisterHandler(wxSharedPtr<wxWebHandler> handler)

 {
     ClassFactory* cf = new ClassFactory(handler);
     IInternetSession* session;
 {
     ClassFactory* cf = new ClassFactory(handler);
     IInternetSession* session;


@@ -957,7 +959,7 @@ void wxWebViewIE::onActiveXEvent(wxActiveXEvent& evt)
     evt.Skip();
 }
 
     evt.Skip();
 }
 

-VirtualProtocol::VirtualProtocol(wxWebHandler *handler)
+VirtualProtocol::VirtualProtocol(wxSharedPtr<wxWebHandler> handler)

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


@@ -983,12 +985,6 @@ HRESULT VirtualProtocol::QueryInterface(REFIID riid, void **ppvObject)
         AddRef();
         return S_OK;
     }
         AddRef();
         return S_OK;
     }

-    else if(riid == IID_IInternetProtocolInfo)
-    {
-        *ppvObject = (IInternetProtocolInfo*)this;
-        AddRef();
-        return S_OK;
-    }

     else
     {
         *ppvObject = NULL;
     else
     {
         *ppvObject = NULL;


@@ -1076,40 +1072,6 @@ HRESULT VirtualProtocol::Read(void *pv, ULONG cb, ULONG *pcbRead)
     }
 }
 
     }
 }
 

-HRESULT VirtualProtocol::CombineUrl(LPCWSTR pwzBaseUrl, LPCWSTR pwzRelativeUrl,
-                                    DWORD dwCombineFlags, LPWSTR pwzResult, 
-                                    DWORD cchResult, DWORD *pcchResult, 
-                                    DWORD dwReserved)
-{
-    wxString newuri = m_handler->CombineURIs(pwzBaseUrl, pwzRelativeUrl);
-    //Check the buffer we are given can hold the new urll
-    if(wxStrlen(newuri) > cchResult)
-        return S_FALSE;
-
-    wxStrcpy(pwzResult, newuri.c_str());
-    *pcchResult = wxStrlen(newuri);
-    return S_OK;
-}
-
-HRESULT VirtualProtocol::ParseUrl(LPCWSTR pwzUrl, PARSEACTION ParseAction,
-                                  DWORD dwParseFlags, LPWSTR pwzResult,
-                                  DWORD cchResult, DWORD *pcchResult,
-                                  DWORD dwReserved)
-{
-    //return INET_E_DEFAULT_ACTION;
-    wxStrcpy(pwzResult, pwzUrl);
-    *pcchResult = wxStrlen(pwzResult);
-    return S_OK;
-}
-    
-HRESULT VirtualProtocol::QueryInfo(LPCWSTR pwzUrl, QUERYOPTION OueryOption, 
-                                   DWORD dwQueryFlags, LPVOID pBuffer,
-                                   DWORD cbBuffer, DWORD *pcbBuf,  
-                                   DWORD dwReserved)
-{
-    return INET_E_DEFAULT_ACTION;
-}
-

 HRESULT ClassFactory::CreateInstance(IUnknown* pUnkOuter, REFIID riid,
                                      void ** ppvObject)
 {
 HRESULT ClassFactory::CreateInstance(IUnknown* pUnkOuter, REFIID riid,
                                      void ** ppvObject)
 {