Merge in WebKit r47029.

3 files changed, 99 insertions, 18 deletions

diff --git a/WebKit/wx/bindings/python/samples/simple.py b/WebKit/wx/bindings/python/samples/simple.py
index 2ebdf9c..52d4e1b 100644
--- a/WebKit/wx/bindings/python/samples/simple.py
+++ b/WebKit/wx/bindings/python/samples/simple.py
@@ -85,7 +85,7 @@ class TestPanel(wx.Panel):
         self.webview.LoadURL(self.current)
         self.location.Append(self.current)
         
-        self.webview.Bind(wx.webview.EVT_WEBVIEW_STATE_CHANGED, self.OnStateChanged)
+        self.webview.Bind(wx.webview.EVT_WEBVIEW_LOAD, self.OnStateChanged)
 
         self.SetSizer(sizer)
 
diff --git a/WebKit/wx/bindings/python/wscript b/WebKit/wx/bindings/python/wscript
new file mode 100644
index 0000000..f9d73c3
--- /dev/null
+++ b/WebKit/wx/bindings/python/wscript
@@ -0,0 +1,89 @@
+#! /usr/bin/env python
+
+# Copyright (C) 2009 Kevin Ollivier  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. 
+#
+# wxWebKit Python bindings build script for the waf build system
+
+from settings import *
+import Logs
+import Options
+
+include_paths = [
+            os.path.join(wk_root, 'WebKit', 'wx'),
+            os.path.join(wx_root, 'wxPython', 'include'),
+            os.path.join(wx_root, '..', 'wxPython', 'include'),
+            ]
+
+def wxpy_swig_include():
+    dirs = [
+                'include/wx-2.9/wx/wxPython/i_files',
+                'include/wx-2.8/wx/wxPython/i_files',
+                'include/wx/wxPython/i_files',
+                'wxPython/src',
+                '../wxPython/src',
+           ]
+
+    for adir in dirs:
+        fullpath = os.path.join(wx_root, adir)
+        if os.path.exists(fullpath):
+            return fullpath
+            
+    return ''
+
+def set_options(opt):
+    common_set_options(opt)
+
+def configure(conf):
+    common_configure(conf)
+    conf.check_tool('swig', tooldir='.')
+    conf.check_swig_version('1.3.29')
+    
+def build(bld):
+    if Options.options.wxpython:
+        wx_swig_args = ['-DSWIG_TYPE_TABLE=_wxPython_table', '-DWXP_USE_THREAD=1', '-DSWIG_PYTHON_OUTPUT_TUPLE']
+        try:
+            import wx.build.config
+            wx_swig_args += wx.build.config.swig_args
+        except:
+            Logs.warn("Cannot find wxPython, wxPython extension will not be built.")
+            return
+    
+        wxpy_include = wxpy_swig_include()
+        if os.path.exists(wxpy_include):
+            include_paths.append(wxpy_include)
+        else:
+            Logs.warn("Cannot find location of wxPython .i files, wxPython extension will not be built.")
+            return
+    
+        obj = bld.new_task_gen(
+            features = 'cxx cshlib pyext',
+            includes = ' '.join(include_paths),
+            source = 'webview.i',
+            swig_flags = ' '.join(wx_swig_args),
+            target = '_webview',
+            uselib = 'WX CURL ICU XSLT XML SQLITE3 WXWEBKIT ' + waf_configname,
+            
+            libpath = [output_dir],
+            uselib_local = '',
+            install_path = output_dir)
diff --git a/WebKit/wx/bindings/python/wxwebkit-py.bkl b/WebKit/wx/bindings/python/wxwebkit-py.bkl
index 8c49a67..2fade58 100644
--- a/WebKit/wx/bindings/python/wxwebkit-py.bkl
+++ b/WebKit/wx/bindings/python/wxwebkit-py.bkl
@@ -40,12 +40,11 @@ Bakefile for wxWebKit Python bindings.
         <set var="WX_PYTHON">1</set>
     </if>
     
-    <if cond="not isdefined('PYTHON_VERSION')">
-        <option name="PYTHON_VERSION">
-            <values>24,25</values>
-            <default-value>25</default-value>
+    <if cond="not isdefined('PYTHON_LIB')">
+        <option name="PYTHON_LIB" never_empty="1">
+            <default-value>python26</default-value>
             <description>
-                Python version we're building against. 
+                The name of the Python library file. 
             </description>
         </option>
     </if>
@@ -83,25 +82,18 @@ Bakefile for wxWebKit Python bindings.
             <set var="MAC_FLAGS">
                 <if cond="PLATFORM_OS=='mac'">-bundle -undefined dynamic_lookup</if>
             </set>
-            
-            <sys-lib>python2.5</sys-lib>
+            <ldflags>$(PYTHON_LIB)</ldflags>
             <ldflags>$(MAC_FLAGS)</ldflags>
         </if>
         <if cond="FORMAT in ['msvc','msvs2005prj']">
-            <set var="PY_LIBNAME">
-                <if cond="PYTHON_VERSION=='24'">
-                    python24
-                </if>
-                <if cond="PYTHON_VERSION=='25'">
-                    python25
-                </if>
-            </set>
             <sys-lib>libpng</sys-lib>
-            <sys-lib>$(PY_LIBNAME)</sys-lib>
             <lib-path>$(WK_ROOT)/libpng</lib-path>
-            <lib-path>$(PYTHON_LIBDIR)</lib-path>
+            <sys-lib>$(PYTHON_LIB)</sys-lib>
         </if>
         
+        <lib-path>$(PYTHON_LIBDIR)</lib-path>
+        
+
         <sys-lib>wxwebkit</sys-lib>
         <lib-path>$(WKOUTPUTDIR)</lib-path>