Merge WebKit at r65615 : Initial merge by git.

Change-Id: Ifbf384f4531e3b58475a662e38195c2d9152ae79

2 files changed, 10 insertions, 11 deletions

diff --git a/WebKit/wx/bindings/python/webview.i b/WebKit/wx/bindings/python/webview.i
index 58961c0..8e3c808 100644
--- a/WebKit/wx/bindings/python/webview.i
+++ b/WebKit/wx/bindings/python/webview.i
@@ -50,6 +50,7 @@
 #include "WebDOMObject.h"
 #include "WebDOMRange.h"
 
+#ifndef __WXMSW__
 PyObject* createDOMNodeSubtype(WebDOMNode* ptr, bool setThisOwn)
 {
     //static wxPyTypeInfoHashMap* typeInfoCache = NULL;
@@ -86,6 +87,7 @@ PyObject* createDOMNodeSubtype(WebDOMNode* ptr, bool setThisOwn)
     
     return Py_None;
 }
+#endif
 
 %}
 //---------------------------------------------------------------------------
@@ -93,8 +95,12 @@ PyObject* createDOMNodeSubtype(WebDOMNode* ptr, bool setThisOwn)
 %import core.i
 %import windows.i
 
+#ifndef __WXMSW__
 %typemap(out) WebDOMNode*             { $result = createDOMNodeSubtype($1, (bool)$owner); }
 %typemap(out) WebDOMElement*             { $result = createDOMNodeSubtype($1, (bool)$owner); }
+%typemap(out) WebDOMNode             { $result = createDOMNodeSubtype(&$1, (bool)$owner); }
+%typemap(out) WebDOMElement             { $result = createDOMNodeSubtype(&$1, (bool)$owner); }
+#endif
 
 MAKE_CONST_WXSTRING(WebViewNameStr);
 
@@ -104,6 +110,7 @@ MustHaveApp(wxWebView);
 
 %include WebKitDefines.h
 
+#ifndef __WXMSW__
 %include WebDOMObject.h
 %include WebDOMNode.h
 
@@ -112,6 +119,7 @@ MustHaveApp(wxWebView);
 %include WebDOMElement.h
 %include WebDOMNodeList.h
 %include WebDOMRange.h
+#endif
 
 %include WebBrowserShell.h
 %include WebDOMSelection.h
diff --git a/WebKit/wx/bindings/python/wscript b/WebKit/wx/bindings/python/wscript
index 617a839..cd07836 100644
--- a/WebKit/wx/bindings/python/wscript
+++ b/WebKit/wx/bindings/python/wscript
@@ -53,15 +53,6 @@ def wxpy_swig_include():
             return fullpath
             
     return ''
-
-def set_options(opt):
-    common_set_options(opt)
-
-def configure(conf):
-    if Options.options.wxpython:
-        common_configure(conf)
-        conf.check_tool('swig', tooldir='.')
-        conf.check_swig_version('1.3.29')
     
 def build(bld):
     if Options.options.wxpython:
@@ -94,9 +85,9 @@ def build(bld):
             swig_flags = ' '.join(wx_swig_args),
             defines = defines,
             target = '_webview',
-            uselib = 'WX CURL ICU XSLT XML SQLITE3 WXWEBKIT ' + get_config(),
+            uselib = 'WX CURL ICU XSLT XML SQLITE3 ' + get_config(),
             
             libpath = [output_dir],
-            uselib_local = '',
+            uselib_local = 'wxwebkit',
             install_path = output_dir
             )