wxPython bindings build fixes after recent changes.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48451 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/wx/ChangeLog b/WebKit/wx/ChangeLog
index 6af68fbd36ccb656d241c34e56cc2b8cb247d1bb..a086ba2ec5a010adb69439a2c6b7ff9f550849f0 100644 (file)
--- a/WebKit/wx/ChangeLog
+++ b/WebKit/wx/ChangeLog
@@ -1,3 +1,10 @@
+2009-09-16  Kevin Ollivier  <kevino@theolliviers.com>
+
+        wxPython bindings build fixes after recent changes.
+
+        * WebView.h:
+        * bindings/python/wscript:
+

 2009-09-13  Kevin Watters  <kevinwatters@gmail.com>
 
         Reviewed by Kevin Ollivier.
 2009-09-13  Kevin Watters  <kevinwatters@gmail.com>
 
         Reviewed by Kevin Ollivier.

diff --git a/WebKit/wx/WebView.h b/WebKit/wx/WebView.h
index 01893ac0b034e06804d53afa0fd9261213ad0041..e83c4205baf74141d82f8576d9c336a7c159f968 100644 (file)
--- a/WebKit/wx/WebView.h
+++ b/WebKit/wx/WebView.h
@@ -65,6 +65,8 @@ namespace WebCore {
 extern WXDLLIMPEXP_WEBKIT const wxChar* wxWebViewNameStr;
 #endif
 
 extern WXDLLIMPEXP_WEBKIT const wxChar* wxWebViewNameStr;
 #endif
 

+static const int defaultCacheCapacity = 8192 * 1024; // mirrors Cache.cpp
+

 class WXDLLIMPEXP_WEBKIT wxWebViewCachePolicy
 {
 public:
 class WXDLLIMPEXP_WEBKIT wxWebViewCachePolicy
 {
 public:


@@ -86,7 +88,6 @@ public:
     void SetMaxDeadCapacity(unsigned maxDeadCapacity) { m_maxDeadCapacity = maxDeadCapacity; }
 
 protected:
     void SetMaxDeadCapacity(unsigned maxDeadCapacity) { m_maxDeadCapacity = maxDeadCapacity; }
 
 protected:

-    static const int defaultCacheCapacity = 8192 * 1024; // mirrors Cache.cpp

     unsigned m_capacity;
     unsigned m_minDeadCapacity;
     unsigned m_maxDeadCapacity;
     unsigned m_capacity;
     unsigned m_minDeadCapacity;
     unsigned m_maxDeadCapacity;

diff --git a/WebKit/wx/bindings/python/wscript b/WebKit/wx/bindings/python/wscript
index 56017c8fa789aced6610e84faff30448f206d51c..41e5d41fbd9790bd611442de6c270f194b9d1850 100644 (file)
--- a/WebKit/wx/bindings/python/wscript
+++ b/WebKit/wx/bindings/python/wscript
@@ -81,6 +81,9 @@ def build(bld):
             Logs.warn("Cannot find location of wxPython .i files, wxPython extension will not be built.")
             return
     
             Logs.warn("Cannot find location of wxPython .i files, wxPython extension will not be built.")
             return
     

+        for inc_path in include_paths:
+            wx_swig_args.append('-I' + inc_path)
+

         obj = bld.new_task_gen(
             features = 'cxx cshlib pyext',
             includes = ' '.join(include_paths),
         obj = bld.new_task_gen(
             features = 'cxx cshlib pyext',
             includes = ' '.join(include_paths),