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 ff0500cb231f41e68e51ab90e6ca14a9bf7e8c63..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"


@@ -110,7 +110,7 @@ public:
     virtual void RunScript(const wxString& javascript);
 
     //Virtual Filesystem Support
     virtual void RunScript(const wxString& javascript);
 
     //Virtual Filesystem Support

-    virtual void RegisterProtocol(wxWebProtocolHandler* hanlder);
+    virtual void RegisterHandler(wxWebHandler* handler);

 
     // ---- IE-specific methods
 
 
     // ---- IE-specific methods
 


@@ -157,9 +157,10 @@ private:
     void ExecCommand(wxString command);
     IHTMLDocument2* GetDocument();
 
     void ExecCommand(wxString command);
     IHTMLDocument2* GetDocument();
 

+    wxDECLARE_DYNAMIC_CLASS(wxWebViewIE);

 };
 
 };
 

-class VirtualProtocol : public IInternetProtocol, public IInternetProtocolInfo
+class VirtualProtocol : public IInternetProtocol

 {
 protected:
     ULONG m_refCount;
 {
 protected:
     ULONG m_refCount;


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

-    wxWebProtocolHandler* m_handler;
+    wxWebHandler* m_handler;

 
 public:
 
 public:

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

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


@@ -203,25 +204,6 @@ public:
                                    ULARGE_INTEGER* WXUNUSED(plibNewPosition)) 
                                    { return E_FAIL; }
     HRESULT STDMETHODCALLTYPE UnlockRequest() { return S_OK; }
                                    ULARGE_INTEGER* WXUNUSED(plibNewPosition)) 
                                    { return E_FAIL; }
     HRESULT STDMETHODCALLTYPE UnlockRequest() { return S_OK; }

-
-    //IInternetProtocolInfo
-    HRESULT STDMETHODCALLTYPE CombineUrl(LPCWSTR pwzBaseUrl, 
-                                         LPCWSTR pwzRelativeUrl, 
-                                         DWORD dwCombineFlags, 
-                                         LPWSTR pwzResult, DWORD cchResult,
-                                         DWORD *pcchResult, DWORD dwReserved);
-    HRESULT STDMETHODCALLTYPE CompareUrl(LPCWSTR pwzUrl1, LPCWSTR pwzUrl2,
-                                         DWORD dwCompareFlags)
-                                         { return INET_E_DEFAULT_ACTION; }
-    HRESULT STDMETHODCALLTYPE ParseUrl(LPCWSTR pwzUrl, PARSEACTION ParseAction,
-                                       DWORD dwParseFlags, LPWSTR pwzResult,
-                                       DWORD cchResult, DWORD *pcchResult,
-                                       DWORD dwReserved);
-    HRESULT STDMETHODCALLTYPE QueryInfo(LPCWSTR pwzUrl, 
-                                        QUERYOPTION OueryOption, 
-                                        DWORD dwQueryFlags, LPVOID pBuffer,
-                                        DWORD cbBuffer, DWORD *pcbBuf, 
-                                        DWORD dwReserved);

 };
 
 class ClassFactory : public IClassFactory
 };
 
 class ClassFactory : public IClassFactory


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

-    ClassFactory(wxWebProtocolHandler* handler) : m_handler(handler) {}
+    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);


@@ -240,9 +222,9 @@ public:
                                              REFIID riid, void** ppvObject);
     HRESULT STDMETHODCALLTYPE LockServer(BOOL fLock);
 private:
                                              REFIID riid, void** ppvObject);
     HRESULT STDMETHODCALLTYPE LockServer(BOOL fLock);
 private:

-    wxWebProtocolHandler* m_handler;
+    wxWebHandler* m_handler;

 };
 
 };
 

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

 
 #endif // wxWebViewIE_H
 
 #endif // wxWebViewIE_H