[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 f6066fc7f5e168e416d6c14d7def36204b3a1881
Author: kevino at webkit.org <kevino at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Aug 16 16:31:03 2010 +0000

    wxMSW build fix. Don't build the Python DOM bindings until we get the export issues
    sorted out.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65433 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/wx/ChangeLog b/WebKit/wx/ChangeLog
index 8454abb..3e78070 100644
--- a/WebKit/wx/ChangeLog
+++ b/WebKit/wx/ChangeLog
@@ -1,3 +1,10 @@
+2010-08-16  Kevin Ollivier  <kevino at theolliviers.com>
+
+        wxMSW build fix. Don't build the Python DOM bindings until we get the export issues
+        sorted out.
+
+        * bindings/python/webview.i:
+
 2010-08-13  Gavin Barraclough  <barraclough at apple.com>
 
         Reviewed by Sam Weinig
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

-- 
WebKit Debian packaging