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

9
include/wx/gtk/webview_webkit.h
View File

@@ -122,8 +122,8 @@ public:
virtual void RunScript(const wxString& javascript);
//Virtual Filesystem Support
virtual void RegisterHandler(wxWebHandler* handler);
virtual wxVector<wxWebHandler*> GetHandlers() { return m_handlerList; }
virtual void RegisterHandler(wxSharedPtr<wxWebHandler> handler);
virtual wxVector<wxSharedPtr<wxWebHandler> > GetHandlers() { return m_handlerList; }
/** FIXME: hack to work around signals being received too early */
bool m_ready;
@@ -136,8 +136,7 @@ public:
* user)
*/
bool m_busy;
bool m_guard;
wxString m_vfsurl;
//We use this flag to stop recursion when we load a page from the navigation
@@ -156,7 +155,7 @@ private:
GtkWidget *web_view;
gint m_historyLimit;
wxVector<wxWebHandler*> m_handlerList;
wxVector<wxSharedPtr<wxWebHandler> > m_handlerList;
wxDECLARE_DYNAMIC_CLASS(wxWebViewWebKit);
};