[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.20-204-g221d8e8
kevino at webkit.org
kevino at webkit.org
Wed Feb 10 22:14:46 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit a776607f39505b4f6c87ae480fa9979cbe9050b7
Author: kevino at webkit.org <kevino at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Feb 4 22:12:02 2010 +0000
[wx] Build fix after addition of Clipboard::writePlainText method.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54371 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index cd5a1d0..98c306f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2010-02-04 Kevin Ollivier <kevino at theolliviers.com>
+
+ [wx] Build fix after addition of Clipboard::writePlainText method.
+
+ * platform/wx/ClipboardWx.cpp:
+ (WebCore::ClipboardWx::writePlainText):
+ * platform/wx/ClipboardWx.h:
+
2010-02-04 Enrica Casucci <enrica at apple.com>
Reviewed by Oliver Hunt.
diff --git a/WebCore/platform/wx/ClipboardWx.cpp b/WebCore/platform/wx/ClipboardWx.cpp
index 0b02009..6100831 100644
--- a/WebCore/platform/wx/ClipboardWx.cpp
+++ b/WebCore/platform/wx/ClipboardWx.cpp
@@ -133,4 +133,9 @@ bool ClipboardWx::hasData()
return false;
}
+void ClipboardWx::writePlainText(const WebCore::String& text)
+{
+ Pasteboard::generalPasteboard()->writePlainText(text);
+}
+
}
diff --git a/WebCore/platform/wx/ClipboardWx.h b/WebCore/platform/wx/ClipboardWx.h
index 5e3ba86..b0c520b 100644
--- a/WebCore/platform/wx/ClipboardWx.h
+++ b/WebCore/platform/wx/ClipboardWx.h
@@ -59,6 +59,8 @@ namespace WebCore {
virtual void declareAndWriteDragImage(Element*, const KURL&, const String& title, Frame*);
virtual void writeURL(const KURL&, const String&, Frame*);
virtual void writeRange(Range*, Frame*);
+ virtual void writePlainText(const WebCore::String&);
+
virtual bool hasData();
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list