Only declare wxDialog::SetWindowStyleFlag() when wxUSE_DIALOG_SIZEGRIP.

[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 d7c9a7d636815a28923edcef043a9af31a2600d5..364d8670155440ee1516fd44a5cfffb9de72ca85 100644 (file)
--- a/include/wx/msw/webview_ie.h
+++ b/include/wx/msw/webview_ie.h
@@ -18,6 +18,7 @@
 #include "wx/webview.h"
 #include "wx/msw/ole/automtn.h"
 #include "wx/msw/ole/activex.h"
 #include "wx/webview.h"
 #include "wx/msw/ole/automtn.h"
 #include "wx/msw/ole/activex.h"

+#include "wx/msw/ole/oleutils.h"

 #include "wx/msw/wrapwin.h"
 #include "wx/msw/missing.h"
 #include "wx/sharedptr.h"
 #include "wx/msw/wrapwin.h"
 #include "wx/msw/missing.h"
 #include "wx/sharedptr.h"


@@ -274,7 +275,7 @@ private:
      *  Busy property is false but should be true.
      */
     bool m_isBusy;
      *  Busy property is false but should be true.
      */
     bool m_isBusy;

-    //We manage our own history, the history list contains the history items 
+    //We manage our own history, the history list contains the history items

     //which are added as documentcomplete events arrive, unless we are loading
     //an item from the history. The position is stored as an int, and reflects
     //where we are in the history list.
     //which are added as documentcomplete events arrive, unless we are loading
     //an item from the history. The position is stored as an int, and reflects
     //where we are in the history list.


@@ -295,7 +296,6 @@ private:
 class VirtualProtocol : public wxIInternetProtocol
 {
 protected:
 class VirtualProtocol : public wxIInternetProtocol
 {
 protected:

-    ULONG m_refCount;

     wxIInternetProtocolSink* m_protocolSink;
     wxString m_html;
     VOID * fileP;
     wxIInternetProtocolSink* m_protocolSink;
     wxString m_html;
     VOID * fileP;


@@ -305,35 +305,33 @@ protected:
 
 public:
     VirtualProtocol(wxSharedPtr<wxWebViewHandler> handler);
 
 public:
     VirtualProtocol(wxSharedPtr<wxWebViewHandler> handler);

-    ~VirtualProtocol();
+    ~VirtualProtocol() {}

 
     //IUnknown
 
     //IUnknown

-    ULONG STDMETHODCALLTYPE AddRef();
-    HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void **ppvObject);
-    ULONG STDMETHODCALLTYPE Release();
+    DECLARE_IUNKNOWN_METHODS;

 
     //IInternetProtocolRoot
 
     //IInternetProtocolRoot

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

                                     DWORD WXUNUSED(dwOptions))
                                    { return E_NOTIMPL; }
     HRESULT STDMETHODCALLTYPE Continue(wxPROTOCOLDATA *WXUNUSED(pProtocolData))
                                        { return S_OK; }
     HRESULT STDMETHODCALLTYPE Resume() { return S_OK; }
                                     DWORD WXUNUSED(dwOptions))
                                    { return E_NOTIMPL; }
     HRESULT STDMETHODCALLTYPE Continue(wxPROTOCOLDATA *WXUNUSED(pProtocolData))
                                        { return S_OK; }
     HRESULT STDMETHODCALLTYPE Resume() { return S_OK; }

-    HRESULT STDMETHODCALLTYPE Start(LPCWSTR szUrl, 
+    HRESULT STDMETHODCALLTYPE Start(LPCWSTR szUrl,

                                     wxIInternetProtocolSink *pOIProtSink,
                                     wxIInternetBindInfo *pOIBindInfo,
                                     wxIInternetProtocolSink *pOIProtSink,
                                     wxIInternetBindInfo *pOIBindInfo,

-                                    DWORD grfPI, 
+                                    DWORD grfPI,

                                     HANDLE_PTR dwReserved);
     HRESULT STDMETHODCALLTYPE Suspend() { return S_OK; }
     HRESULT STDMETHODCALLTYPE Terminate(DWORD WXUNUSED(dwOptions)) { return S_OK; }
 
     //IInternetProtocol
                                     HANDLE_PTR dwReserved);
     HRESULT STDMETHODCALLTYPE Suspend() { return S_OK; }
     HRESULT STDMETHODCALLTYPE Terminate(DWORD WXUNUSED(dwOptions)) { return S_OK; }
 
     //IInternetProtocol

-    HRESULT STDMETHODCALLTYPE LockRequest(DWORD WXUNUSED(dwOptions)) 
+    HRESULT STDMETHODCALLTYPE LockRequest(DWORD WXUNUSED(dwOptions))

                                           { return S_OK; }
     HRESULT STDMETHODCALLTYPE Read(void *pv, ULONG cb, ULONG *pcbRead);
                                           { return S_OK; }
     HRESULT STDMETHODCALLTYPE Read(void *pv, ULONG cb, ULONG *pcbRead);

-    HRESULT STDMETHODCALLTYPE Seek(LARGE_INTEGER WXUNUSED(dlibMove), 
-                                   DWORD WXUNUSED(dwOrigin), 
-                                   ULARGE_INTEGER* WXUNUSED(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; }
 };


@@ -341,18 +339,17 @@ public:
 class ClassFactory : public IClassFactory
 {
 public:
 class ClassFactory : public IClassFactory
 {
 public:

-    ClassFactory(wxSharedPtr<wxWebViewHandler> handler) : m_refCount(0), m_handler(handler) {}
-    //IUnknown
-    ULONG STDMETHODCALLTYPE AddRef();
-    HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void **ppvObject);
-    ULONG STDMETHODCALLTYPE Release();
+    ClassFactory(wxSharedPtr<wxWebViewHandler> handler) : m_handler(handler) {}

 
     //IClassFactory
 
     //IClassFactory

-    HRESULT STDMETHODCALLTYPE CreateInstance(IUnknown* pUnkOuter, 
+    HRESULT STDMETHODCALLTYPE CreateInstance(IUnknown* pUnkOuter,

                                              REFIID riid, void** ppvObject);
     HRESULT STDMETHODCALLTYPE LockServer(BOOL fLock);
                                              REFIID riid, void** ppvObject);
     HRESULT STDMETHODCALLTYPE LockServer(BOOL fLock);

+
+    //IUnknown
+    DECLARE_IUNKNOWN_METHODS;
+

 private:
 private:

-    ULONG m_refCount;

     wxSharedPtr<wxWebViewHandler> m_handler;
 };
 
     wxSharedPtr<wxWebViewHandler> m_handler;
 };