diff options
| author | Leon Clarke <leonclarke@google.com> | 2010-06-03 14:33:32 +0100 |
|---|---|---|
| committer | Leon Clarke <leonclarke@google.com> | 2010-06-08 12:24:51 +0100 |
| commit | 5af96e2c7b73ebc627c6894727826a7576d31758 (patch) | |
| tree | f9d5e6f6175ccd7e3d14de9b290f08937a0d17ba /WebKit/wx/WebView.cpp | |
| parent | 8cc4fcf4f6adcbc0e0aebfc24fbad9a4cddf2cfb (diff) | |
| download | external_webkit-5af96e2c7b73ebc627c6894727826a7576d31758.zip external_webkit-5af96e2c7b73ebc627c6894727826a7576d31758.tar.gz external_webkit-5af96e2c7b73ebc627c6894727826a7576d31758.tar.bz2 | |
Merge webkit.org at r60469 : Initial merge by git.
Change-Id: I66a0047aa2af802f66bb0c7f2a8b02247a596234
Diffstat (limited to 'WebKit/wx/WebView.cpp')
| -rw-r--r-- | WebKit/wx/WebView.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/WebKit/wx/WebView.cpp b/WebKit/wx/WebView.cpp index 2c5087c..d9a22cb 100644 --- a/WebKit/wx/WebView.cpp +++ b/WebKit/wx/WebView.cpp @@ -56,6 +56,9 @@ #include "Settings.h" #include "SubstituteData.h" #include "Threading.h" +#if __WXMSW__ +#include "WebCoreInstanceHandle.h" +#endif #include "ChromeClientWx.h" #include "ContextMenuClientWx.h" @@ -319,7 +322,7 @@ bool wxWebView::Create(wxWindow* parent, int id, const wxPoint& position, // due to a problem with exceptions getting eaten when using the callback // approach to timers (which wx itself uses). #if __WXMSW__ - WebCore::Page::setInstanceHandle(wxGetInstance()); + WebCore::setInstanceHandle(wxGetInstance()); #endif // this helps reduce flicker on platforms like MSW @@ -331,7 +334,11 @@ bool wxWebView::Create(wxWindow* parent, int id, const wxPoint& position, WebCore::HTMLFrameOwnerElement* parentFrame = 0; WebCore::EditorClientWx* editorClient = new WebCore::EditorClientWx(); - m_impl->page = new WebCore::Page(new WebCore::ChromeClientWx(this), new WebCore::ContextMenuClientWx(), editorClient, new WebCore::DragClientWx(), new WebCore::InspectorClientWx(), 0, 0); + m_impl->page = new WebCore::Page(new WebCore::ChromeClientWx(this), + new WebCore::ContextMenuClientWx(), + editorClient, + new WebCore::DragClientWx(), + new WebCore::InspectorClientWx(), 0, 0, 0); editorClient->setPage(m_impl->page); m_mainFrame = new wxWebFrame(this); |