diff options
Diffstat (limited to 'Source/WebKit/wx/WebView.cpp')
| -rw-r--r-- | Source/WebKit/wx/WebView.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/Source/WebKit/wx/WebView.cpp b/Source/WebKit/wx/WebView.cpp index 0df3879..acfd0ee 100644 --- a/Source/WebKit/wx/WebView.cpp +++ b/Source/WebKit/wx/WebView.cpp @@ -71,6 +71,7 @@ #include "ScriptController.h" #include "JSDOMBinding.h" +#include <runtime/initializeThreading.h> #include <runtime/JSValue.h> #include <runtime/UString.h> #include <wtf/text/CString.h> @@ -327,7 +328,6 @@ const wxChar* wxWebViewNameStr = wxT("webView"); wxWebView::wxWebView() : m_textMagnifier(1.0), - m_isEditable(false), m_isInitialized(false), m_beingDestroyed(false), m_mouseWheelZooms(false), @@ -338,7 +338,6 @@ wxWebView::wxWebView() : wxWebView::wxWebView(wxWindow* parent, int id, const wxPoint& position, const wxSize& size, long style, const wxString& name) : m_textMagnifier(1.0), - m_isEditable(false), m_isInitialized(false), m_beingDestroyed(false), m_mouseWheelZooms(false), @@ -360,7 +359,7 @@ bool wxWebView::Create(wxWindow* parent, int id, const wxPoint& position, if (!wxWindow::Create(parent, id, position, size, style, name)) return false; - WTF::initializeThreading(); + JSC::initializeThreading(); WTF::initializeMainThread(); // This is necessary because we are using SharedTimerWin.cpp on Windows, @@ -704,8 +703,7 @@ void wxWebView::OnSize(wxSizeEvent& event) { if (m_isInitialized && m_mainFrame) { WebCore::Frame* frame = m_mainFrame->GetFrame(); - frame->view()->setFrameRect(wxRect(wxPoint(0,0), event.GetSize())); - frame->view()->forceLayout(); + frame->view()->resize(event.GetSize()); frame->view()->adjustViewSize(); } @@ -896,9 +894,6 @@ void wxWebView::OnKeyEvents(wxKeyEvent& event) if (!(frame && frame->view())) return; - if (event.GetKeyCode() == WXK_CAPITAL) - frame->eventHandler()->capsLockStateMayHaveChanged(); - WebCore::PlatformKeyboardEvent wkEvent(event); if (frame->eventHandler()->keyEvent(wkEvent)) |