summaryrefslogtreecommitdiffstats
path: root/WebKit/wx/bindings
diff options
context:
space:
mode:
authorCary Clark <>2009-04-14 06:33:00 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-04-14 06:33:00 -0700
commit563af33bc48281d19dce701398dbb88cb54fd7ec (patch)
tree395b4502f029dea8b25b342d66dc06b5d8f99985 /WebKit/wx/bindings
parent5cfedfef172691d0f4bcf2be5ca3cddd8c9a47f4 (diff)
downloadexternal_webkit-563af33bc48281d19dce701398dbb88cb54fd7ec.zip
external_webkit-563af33bc48281d19dce701398dbb88cb54fd7ec.tar.gz
external_webkit-563af33bc48281d19dce701398dbb88cb54fd7ec.tar.bz2
AI 146110: add missing files to webkit
brings it in sync with webkit svn cl 42046 Automated import of CL 146110
Diffstat (limited to 'WebKit/wx/bindings')
-rw-r--r--WebKit/wx/bindings/python/webview.i3
-rw-r--r--WebKit/wx/bindings/python/wxwebkit-py.bkl3
2 files changed, 4 insertions, 2 deletions
diff --git a/WebKit/wx/bindings/python/webview.i b/WebKit/wx/bindings/python/webview.i
index e9926ad..44b38ab 100644
--- a/WebKit/wx/bindings/python/webview.i
+++ b/WebKit/wx/bindings/python/webview.i
@@ -31,12 +31,13 @@
#include "WebView.h"
#include "WebBrowserShell.h"
%}
-
//---------------------------------------------------------------------------
%import core.i
%import windows.i
+MAKE_CONST_WXSTRING(WebViewNameStr);
+
MustHaveApp(wxWebView);
MustHaveApp(wxWebBrowserShell);
diff --git a/WebKit/wx/bindings/python/wxwebkit-py.bkl b/WebKit/wx/bindings/python/wxwebkit-py.bkl
index d6c2f7a..8c49a67 100644
--- a/WebKit/wx/bindings/python/wxwebkit-py.bkl
+++ b/WebKit/wx/bindings/python/wxwebkit-py.bkl
@@ -81,9 +81,10 @@ Bakefile for wxWebKit Python bindings.
<if cond="FORMAT=='gnu'">
<sys-lib>png</sys-lib>
<set var="MAC_FLAGS">
- <if cond="WX_PORT=='mac'">-bundle -undefined dynamic_lookup</if>
+ <if cond="PLATFORM_OS=='mac'">-bundle -undefined dynamic_lookup</if>
</set>
+ <sys-lib>python2.5</sys-lib>
<ldflags>$(MAC_FLAGS)</ldflags>
</if>
<if cond="FORMAT in ['msvc','msvs2005prj']">