Remove SetPageTitle and GetPageTitle and make GetCurrentTitle actually return the...

[wxWidgets.git] / include / wx / msw / webview_ie.h

diff --git a/include/wx/msw/webview_ie.h b/include/wx/msw/webview_ie.h
index 83e2b6c14bef74856e689a3e1c04dc8c8697eda0..aec06fc0d14df849c5bfc2e19865bceca5c76421 100644 (file)
--- a/include/wx/msw/webview_ie.h
+++ b/include/wx/msw/webview_ie.h
@@ -3,7 +3,7 @@
 // Purpose:     wxMSW IE wxWebView backend
 // Author:      Marianne Gagnon
 // Id:          $Id$
 // Purpose:     wxMSW IE wxWebView backend
 // 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
 /////////////////////////////////////////////////////////////////////////////
 


@@ -12,7 +12,7 @@
 
 #include "wx/setup.h"
 
 
 #include "wx/setup.h"
 

-#if wxUSE_WEBVIEW_IE
+#if wxUSE_WEBVIEW_IE && defined(__WXMSW__)

 
 #include "wx/control.h"
 #include "wx/webview.h"
 
 #include "wx/control.h"
 #include "wx/webview.h"


@@ -22,9 +22,7 @@
 #include "wx/vector.h"
 
 struct IHTMLDocument2;
 #include "wx/vector.h"
 
 struct IHTMLDocument2;

-

 class wxFSFile;
 class wxFSFile;

-class wxFileSystem;

 
 class WXDLLIMPEXP_WEB wxWebViewIE : public wxWebView
 {
 
 class WXDLLIMPEXP_WEB wxWebViewIE : public wxWebView
 {


@@ -111,6 +109,9 @@ public:
 
     virtual void RunScript(const wxString& javascript);
 
 
     virtual void RunScript(const wxString& javascript);
 

+    //Virtual Filesystem Support
+    virtual void RegisterHandler(wxWebHandler* handler);
+

     // ---- IE-specific methods
 
     // FIXME: I seem to be able to access remote webpages even in offline mode...
     // ---- IE-specific methods
 
     // FIXME: I seem to be able to access remote webpages even in offline mode...


@@ -133,8 +134,6 @@ private:
     wxAutomationObject m_ie;
     IWebBrowser2* m_webBrowser;
     DWORD m_dwCookie;
     wxAutomationObject m_ie;
     IWebBrowser2* m_webBrowser;
     DWORD m_dwCookie;

-    bool m_canNavigateBack;
-    bool m_canNavigateForward;

 
     //We store the current zoom type;
     wxWebViewZoomType m_zoomType;
 
     //We store the current zoom type;
     wxWebViewZoomType m_zoomType;


@@ -158,6 +157,7 @@ private:
     void ExecCommand(wxString command);
     IHTMLDocument2* GetDocument();
 
     void ExecCommand(wxString command);
     IHTMLDocument2* GetDocument();
 

+    wxDECLARE_DYNAMIC_CLASS(wxWebViewIE);

 };
 
 class VirtualProtocol : public IInternetProtocol
 };
 
 class VirtualProtocol : public IInternetProtocol


@@ -169,10 +169,10 @@ protected:
     VOID * fileP;
 
     wxFSFile* m_file;
     VOID * fileP;
 
     wxFSFile* m_file;

-    wxFileSystem* m_fileSys;
+    wxWebHandler* m_handler;

 
 public:
 
 public:

-    VirtualProtocol();
+    VirtualProtocol(wxWebHandler *handler);

     ~VirtualProtocol();
 
     //IUnknown
     ~VirtualProtocol();
 
     //IUnknown


@@ -181,9 +181,10 @@ public:
     ULONG STDMETHODCALLTYPE Release();
 
     //IInternetProtocolRoot
     ULONG STDMETHODCALLTYPE Release();
 
     //IInternetProtocolRoot

-    HRESULT STDMETHODCALLTYPE Abort(HRESULT hrReason, DWORD dwOptions)
+    HRESULT STDMETHODCALLTYPE Abort(HRESULT WXUNUSED(hrReason), 
+                                    DWORD WXUNUSED(dwOptions))

                                    { return E_NOTIMPL; }
                                    { return E_NOTIMPL; }

-    HRESULT STDMETHODCALLTYPE Continue(PROTOCOLDATA *pProtocolData)
+    HRESULT STDMETHODCALLTYPE Continue(PROTOCOLDATA *WXUNUSED(pProtocolData))

                                        { return S_OK; }
     HRESULT STDMETHODCALLTYPE Resume() { return S_OK; }
     HRESULT STDMETHODCALLTYPE Start(LPCWSTR szUrl, 
                                        { return S_OK; }
     HRESULT STDMETHODCALLTYPE Resume() { return S_OK; }
     HRESULT STDMETHODCALLTYPE Start(LPCWSTR szUrl, 


@@ -192,13 +193,15 @@ public:
                                     DWORD grfPI, 
                                     HANDLE_PTR dwReserved);
     HRESULT STDMETHODCALLTYPE Suspend() { return S_OK; }
                                     DWORD grfPI, 
                                     HANDLE_PTR dwReserved);
     HRESULT STDMETHODCALLTYPE Suspend() { return S_OK; }

-    HRESULT STDMETHODCALLTYPE Terminate(DWORD dwOptions) { return S_OK; }
+    HRESULT STDMETHODCALLTYPE Terminate(DWORD WXUNUSED(dwOptions)) { return S_OK; }

 
     //IInternetProtocol
 
     //IInternetProtocol

-    HRESULT STDMETHODCALLTYPE LockRequest(DWORD dwOptions) { return S_OK; }
+    HRESULT STDMETHODCALLTYPE LockRequest(DWORD WXUNUSED(dwOptions)) 
+                                          { return S_OK; }

     HRESULT STDMETHODCALLTYPE Read(void *pv, ULONG cb, ULONG *pcbRead);
     HRESULT STDMETHODCALLTYPE Read(void *pv, ULONG cb, ULONG *pcbRead);

-    HRESULT STDMETHODCALLTYPE Seek(LARGE_INTEGER dlibMove, DWORD dwOrigin, 
-                                   ULARGE_INTEGER* plibNewPosition) 
+    HRESULT STDMETHODCALLTYPE Seek(LARGE_INTEGER WXUNUSED(dlibMove), 
+                                   DWORD WXUNUSED(dwOrigin), 
+                                   ULARGE_INTEGER* WXUNUSED(plibNewPosition)) 

                                    { return E_FAIL; }
     HRESULT STDMETHODCALLTYPE UnlockRequest() { return S_OK; }
 };
                                    { return E_FAIL; }
     HRESULT STDMETHODCALLTYPE UnlockRequest() { return S_OK; }
 };


@@ -208,6 +211,7 @@ class ClassFactory : public IClassFactory
 private:
     ULONG m_refCount;
 public:
 private:
     ULONG m_refCount;
 public:

+    ClassFactory(wxWebHandler* handler) : m_handler(handler) {}

     //IUnknown
     ULONG STDMETHODCALLTYPE AddRef();
     HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void **ppvObject);
     //IUnknown
     ULONG STDMETHODCALLTYPE AddRef();
     HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void **ppvObject);


@@ -217,8 +221,10 @@ public:
     HRESULT STDMETHODCALLTYPE CreateInstance(IUnknown* pUnkOuter, 
                                              REFIID riid, void** ppvObject);
     HRESULT STDMETHODCALLTYPE LockServer(BOOL fLock);
     HRESULT STDMETHODCALLTYPE CreateInstance(IUnknown* pUnkOuter, 
                                              REFIID riid, void** ppvObject);
     HRESULT STDMETHODCALLTYPE LockServer(BOOL fLock);

+private:
+    wxWebHandler* m_handler;

 };
 
 };
 

-#endif // wxUSE_WEBVIEW_IE
+#endif // wxUSE_WEBVIEW_IE && defined(__WXMSW__)

 
 #endif // wxWebViewIE_H
 
 #endif // wxWebViewIE_H