[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[kevino at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 9ef99bd38ddbcf2b5193889947b1a759f3ec1fa7
Author: kevino at webkit.org <kevino at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jul 28 22:15:44 2010 +0000

    [wx] Build fix after recent changes.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64236 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/wx/ChangeLog b/WebKit/wx/ChangeLog
index 1bf295a..3815128 100644
--- a/WebKit/wx/ChangeLog
+++ b/WebKit/wx/ChangeLog
@@ -1,3 +1,10 @@
+2010-07-28  Kevin Ollivier  <kevino at theolliviers.com>
+
+        [wx] Build fix after recent changes.
+
+        * WebEdit.h: Added.
+        * bindings/python/webview.i:
+
 2010-07-28  Robin Dunn  <robin at alldunn.com>
 
         Reviewed by Kevin Ollivier.
diff --git a/WebKit/wx/WebEdit.h b/WebKit/wx/WebEdit.h
new file mode 100644
index 0000000..7099088
--- /dev/null
+++ b/WebKit/wx/WebEdit.h
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2009 Kevin Ollivier <kevino at theolliviers.com>
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+ 
+#ifndef WXWEBEDIT_H
+#define WXWEBEDIT_H
+
+#include "wx/wxprec.h"
+#ifndef WX_PRECOMP
+    #include "wx/wx.h"
+#endif
+
+#include "WebKitDefines.h"
+
+namespace WebCore {
+    class CompositeEditCommand;
+    class WebCoreEditCommand;
+}
+
+class WebDOMElement;
+class wxWebFrame;
+
+class WXDLLIMPEXP_WEBKIT wxWebEditCommand
+{
+    friend class WebCore::CompositeEditCommand;
+    friend class WebCore::WebCoreEditCommand;
+
+public:
+    wxWebEditCommand(wxWebFrame*);
+    ~wxWebEditCommand();
+    
+    void SetNodeAttribute(WebDOMElement*, const wxString&, const wxString&);
+    void Apply();
+    
+private:
+    WebCore::WebCoreEditCommand* m_impl;
+};
+
+#endif
diff --git a/WebKit/wx/bindings/python/webview.i b/WebKit/wx/bindings/python/webview.i
index 95a6ff8..94c89cf 100644
--- a/WebKit/wx/bindings/python/webview.i
+++ b/WebKit/wx/bindings/python/webview.i
@@ -32,7 +32,6 @@
 #include "WebDOMSelection.h"
 #include "WebEdit.h"
 #include "WebFrame.h"
-#include "WebDOMDefines.h"
 #include "WebSettings.h"
 #include "WebView.h"
 

-- 
WebKit Debian packaging