diff options
Diffstat (limited to 'WebKit/wx')
| -rw-r--r-- | WebKit/wx/ChangeLog | 29 | ||||
| -rw-r--r-- | WebKit/wx/WebFrame.cpp | 12 | ||||
| -rw-r--r-- | WebKit/wx/WebView.cpp | 11 | ||||
| -rw-r--r-- | WebKit/wx/wscript | 3 |
4 files changed, 47 insertions, 8 deletions
diff --git a/WebKit/wx/ChangeLog b/WebKit/wx/ChangeLog index 51da133..ab25102 100644 --- a/WebKit/wx/ChangeLog +++ b/WebKit/wx/ChangeLog @@ -1,3 +1,32 @@ +2010-05-27 Kevin Ollivier <kevino@theolliviers.com> + + [wx] Build fixes for Windows after recent changes. + + * WebView.cpp: + (wxWebView::Create): + * wscript: + +2010-05-26 Kevin Ollivier <kevino@theolliviers.com> + + Build fix after new client added to Page constructor. + + * WebView.cpp: + (wxWebView::Create): + +2010-05-24 Darin Adler <darin@apple.com> + + Reviewed by Eric Seidel. + + Move view-related functions from Frame to FrameView + https://bugs.webkit.org/show_bug.cgi?id=39366 + + * WebFrame.cpp: + (wxWebFrame::CanIncreaseTextSize): Check FrameView is not null. + (wxWebFrame::IncreaseTextSize): Call function on FrameView. + (wxWebFrame::CanDecreaseTextSize): Ditto. + (wxWebFrame::DecreaseTextSize): Ditto. + (wxWebFrame::ResetTextSize): Ditto. + 2010-05-11 Kevin Watters <kevinwatters@gmail.com> Reviewed by Kevin Ollivier. diff --git a/WebKit/wx/WebFrame.cpp b/WebKit/wx/WebFrame.cpp index 2515de4..cb66a72 100644 --- a/WebKit/wx/WebFrame.cpp +++ b/WebKit/wx/WebFrame.cpp @@ -305,7 +305,7 @@ bool wxWebFrame::CanRedo() bool wxWebFrame::CanIncreaseTextSize() const { - if (m_impl->frame) { + if (m_impl->frame && m_impl->frame->view()) { if (m_textMagnifier*TextSizeMultiplierRatio <= MaximumTextSizeMultiplier) return true; } @@ -316,13 +316,13 @@ void wxWebFrame::IncreaseTextSize() { if (CanIncreaseTextSize()) { m_textMagnifier = m_textMagnifier*TextSizeMultiplierRatio; - m_impl->frame->setZoomFactor(m_textMagnifier, WebCore::ZoomTextOnly); + m_impl->frame->view()->setZoomFactor(m_textMagnifier, WebCore::ZoomTextOnly); } } bool wxWebFrame::CanDecreaseTextSize() const { - if (m_impl->frame) { + if (m_impl->frame && m_impl->frame->view()) { if (m_textMagnifier/TextSizeMultiplierRatio >= MinimumTextSizeMultiplier) return true; } @@ -333,15 +333,15 @@ void wxWebFrame::DecreaseTextSize() { if (CanDecreaseTextSize()) { m_textMagnifier = m_textMagnifier/TextSizeMultiplierRatio; - m_impl->frame->setZoomFactor(m_textMagnifier, WebCore::ZoomTextOnly); + m_impl->frame->view()->setZoomFactor(m_textMagnifier, WebCore::ZoomTextOnly); } } void wxWebFrame::ResetTextSize() { m_textMagnifier = 1.0; - if (m_impl->frame) - m_impl->frame->setZoomFactor(m_textMagnifier, WebCore::ZoomTextOnly); + if (m_impl->frame && m_impl->frame->view()) + m_impl->frame->view()->setZoomFactor(m_textMagnifier, WebCore::ZoomTextOnly); } void wxWebFrame::MakeEditable(bool enable) 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); diff --git a/WebKit/wx/wscript b/WebKit/wx/wscript index 61fa903..fe934f1 100644 --- a/WebKit/wx/wscript +++ b/WebKit/wx/wscript @@ -40,6 +40,9 @@ include_paths = webkit_dirs + common_includes + ['.', '..', os.path.join(wk_root, 'WebCore', 'platform', 'graphics', 'wx'), ] +if sys.platform.startswith("win"): + include_paths.append(os.path.join(wk_root, 'WebCore','platform','win')) + windows_deps = [ 'lib/pthreadVC2.dll', 'bin/icuuc40.dll', 'bin/icudt40.dll', 'bin/icuin40.dll', |