Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use shared pointers to hold wxWebHandlers throughout.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68605 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Steve Lamerton
2011-08-08 15:12:33 +00:00
parent fea281f428
commit 3baf235f60
8 changed files with 23 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/wx/msw/webview_ie.h
View File

@@ -110,7 +110,7 @@ public:
virtual void RunScript(const wxString& javascript);
//Virtual Filesystem Support
virtual void RegisterHandler(wxWebHandler* handler);
virtual void RegisterHandler(wxSharedPtr<wxWebHandler> handler);
// ---- IE-specific methods
@@ -169,10 +169,10 @@ protected:
VOID * fileP;
wxFSFile* m_file;
wxWebHandler* m_handler;
wxSharedPtr<wxWebHandler> m_handler;
public:
VirtualProtocol(wxWebHandler *handler);
VirtualProtocol(wxSharedPtr<wxWebHandler> handler);
~VirtualProtocol();
//IUnknown
@@ -211,7 +211,7 @@ class ClassFactory : public IClassFactory
private:
ULONG m_refCount;
public:
ClassFactory(wxWebHandler* handler) : m_handler(handler) {}
ClassFactory(wxSharedPtr<wxWebHandler> handler) : m_handler(handler) {}
//IUnknown
ULONG STDMETHODCALLTYPE AddRef();
HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void **ppvObject);
@@ -222,7 +222,7 @@ public:
REFIID riid, void** ppvObject);
HRESULT STDMETHODCALLTYPE LockServer(BOOL fLock);
private:
wxWebHandler* m_handler;
wxSharedPtr<wxWebHandler> m_handler;
};
#endif // wxUSE_WEBVIEW_IE && defined(__WXMSW__)