From: Steve Lamerton Date: Sat, 2 Jul 2011 14:32:02 +0000 (+0000) Subject: Implement clipboard api in gtk. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/ae26e17b93fd8c3dce7c66ce9f23475867160f62 Implement clipboard api in gtk. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68130 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/gtk/webview_webkit.h b/include/wx/gtk/webview_webkit.h index 54d5a3f762..69fef706f8 100644 --- a/include/wx/gtk/webview_webkit.h +++ b/include/wx/gtk/webview_webkit.h @@ -120,7 +120,13 @@ public: virtual wxWebViewZoom GetZoom(); virtual void SetZoom(wxWebViewZoom); - + //Clipboard functions + virtual bool CanCut(); + virtual bool CanCopy(); + virtual bool CanPaste(); + virtual void Cut(); + virtual void Copy(); + virtual void Paste(); /** FIXME: hack to work around signals being received too early */ bool m_ready; diff --git a/include/wx/webview.h b/include/wx/webview.h index b3bb60f223..3dadea6a32 100644 --- a/include/wx/webview.h +++ b/include/wx/webview.h @@ -18,6 +18,7 @@ #include #include #include "wx/sharedptr.h" +#include "wx/vector.h" class WXDLLIMPEXP_WEB wxWebHistoryItem { diff --git a/src/gtk/webview_webkit.cpp b/src/gtk/webview_webkit.cpp index ae1ab1212f..3e53beaa25 100644 --- a/src/gtk/webview_webkit.cpp +++ b/src/gtk/webview_webkit.cpp @@ -489,6 +489,36 @@ void wxWebViewWebKit::LoadHistoryItem(wxSharedPtr item) } } +bool wxWebViewWebKit::CanCut() +{ + return webkit_web_view_can_cut_clipboard(WEBKIT_WEB_VIEW(web_view)); +} + +bool wxWebViewWebKit::CanCopy() +{ + return webkit_web_view_can_copy_clipboard(WEBKIT_WEB_VIEW(web_view)); +} + +bool wxWebViewWebKit::CanPaste() +{ + return webkit_web_view_can_paste_clipboard(WEBKIT_WEB_VIEW(web_view)); +} + +void wxWebViewWebKit::Cut() +{ + webkit_web_view_cut_clipboard(WEBKIT_WEB_VIEW(web_view)); +} + +void wxWebViewWebKit::Copy() +{ + webkit_web_view_copy_clipboard(WEBKIT_WEB_VIEW(web_view)); +} + +void wxWebViewWebKit::Paste() +{ + webkit_web_view_paste_clipboard(WEBKIT_WEB_VIEW(web_view)); +} + wxString wxWebViewWebKit::GetCurrentURL() { // FIXME: check which encoding the web kit control uses instead of