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

diff --git a/WebKit/wx/ChangeLog b/WebKit/wx/ChangeLog
index 0fc35fa00ecdca95fae98f5e65efd001057cb012..7de85518cf94571775920fe73f78f985f26fff07 100644 (file)
--- a/WebKit/wx/ChangeLog
+++ b/WebKit/wx/ChangeLog
@@ -1,3 +1,15 @@
+2008-12-13  Kevin Watters  <kevinwatters@gmail.com>
+
+        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  <brettw@chromium.org>
 
         Reviewed by Dave Hyatt.

diff --git a/WebKit/wx/WebFrame.cpp b/WebKit/wx/WebFrame.cpp
index 4211af76d45076fcb5ad838a6318728c2f0a175d..3883cd32fff54a456b0001787b5906688175844b 100644 (file)
--- 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 a2803a2d633c44b84805283feebfaf40784b944c..5c697d6720f0514443fc0a77dff2063f9579f32c 100644 (file)
--- 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 8da4ac7f545dfdfe4a423fdf646524010709ab8b..852d44a234e47e1fde8daee2c0df32d65bf1590a 100644 (file)
--- 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 953ae296f315acfd885b6d5bfc1d1c3d1d980cd4..fc01ab877ab23a4cbc112a1fc115ad292eb9532a 100644 (file)
--- 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();