From a5aa80135051c60073cf382118b8ec47a4af5489 Mon Sep 17 00:00:00 2001 From: "kevino@webkit.org" Date: Sat, 13 Dec 2008 17:50:33 +0000 Subject: [PATCH] Reviewed by Kevin Ollivier. Expose findString in wxWebView as FindString. https://bugs.webkit.org/show_bug.cgi?id=22458 git-svn-id: http://svn.webkit.org/repository/webkit/trunk@39273 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- WebKit/wx/ChangeLog | 12 ++++++++++++ WebKit/wx/WebFrame.cpp | 8 ++++++++ WebKit/wx/WebFrame.h | 4 ++++ WebKit/wx/WebView.cpp | 8 ++++++++ WebKit/wx/WebView.h | 4 ++++ 5 files changed, 36 insertions(+) diff --git a/WebKit/wx/ChangeLog b/WebKit/wx/ChangeLog index 0fc35fa00ecd..7de85518cf94 100644 --- a/WebKit/wx/ChangeLog +++ b/WebKit/wx/ChangeLog @@ -1,3 +1,15 @@ +2008-12-13 Kevin Watters + + Reviewed by Kevin Ollivier. + + Expose findString in wxWebView as FindString. + + https://bugs.webkit.org/show_bug.cgi?id=22458 + + * WebView.cpp: + (wxWebView::FindString): + * WebView.h: + 2008-12-09 Brett Wilson Reviewed by Dave Hyatt. diff --git a/WebKit/wx/WebFrame.cpp b/WebKit/wx/WebFrame.cpp index 4211af76d450..3883cd32fff5 100644 --- a/WebKit/wx/WebFrame.cpp +++ b/WebKit/wx/WebFrame.cpp @@ -183,6 +183,14 @@ wxString wxWebFrame::RunScript(const wxString& javascript) return returnValue; } +bool wxWebFrame::FindString(const wxString& string, bool forward, bool caseSensitive, bool wrapSelection, bool startInSelection) +{ + if (m_impl->frame) + return m_impl->frame->findString(string, forward, caseSensitive, wrapSelection, startInSelection); + + return false; +} + void wxWebFrame::LoadURL(const wxString& url) { if (m_impl->frame && m_impl->frame->loader()) { diff --git a/WebKit/wx/WebFrame.h b/WebKit/wx/WebFrame.h index a2803a2d633c..5c697d6720f0 100644 --- a/WebKit/wx/WebFrame.h +++ b/WebKit/wx/WebFrame.h @@ -134,6 +134,10 @@ class WXDLLIMPEXP_WEBKIT wxWebFrame wxString RunScript(const wxString& javascript); + bool FindString(const wxString& string, bool forward = true, + bool caseSensitive = false, bool wrapSelection = true, + bool startInSelection = true); + bool CanIncreaseTextSize() const; void IncreaseTextSize(); bool CanDecreaseTextSize() const; diff --git a/WebKit/wx/WebView.cpp b/WebKit/wx/WebView.cpp index 8da4ac7f545d..852d44a234e4 100644 --- a/WebKit/wx/WebView.cpp +++ b/WebKit/wx/WebView.cpp @@ -463,6 +463,14 @@ void wxWebView::OnPaint(wxPaintEvent& event) } } +bool wxWebView::FindString(const wxString& string, bool forward, bool caseSensitive, bool wrapSelection, bool startInSelection) +{ + if (m_mainFrame) + return m_mainFrame->FindString(string, forward, caseSensitive, wrapSelection, startInSelection); + + return false; +} + void wxWebView::OnSize(wxSizeEvent& event) { if (m_isInitialized && m_mainFrame) { diff --git a/WebKit/wx/WebView.h b/WebKit/wx/WebView.h index 953ae296f315..fc01ab877ab2 100644 --- a/WebKit/wx/WebView.h +++ b/WebKit/wx/WebView.h @@ -124,6 +124,10 @@ public: bool IsTransparent() const; wxString RunScript(const wxString& javascript); + + bool FindString(const wxString& string, bool forward = true, + bool caseSensitive = false, bool wrapSelection = true, + bool startInSelection = true); bool CanIncreaseTextSize() const; void IncreaseTextSize(); -- 2.36.0