summaryrefslogtreecommitdiffstats
path: root/WebKit/wx
diff options
context:
space:
mode:
Diffstat (limited to 'WebKit/wx')
-rw-r--r--WebKit/wx/ChangeLog63
-rw-r--r--WebKit/wx/WebEdit.cpp4
-rw-r--r--WebKit/wx/WebFrame.cpp2
-rw-r--r--WebKit/wx/WebKitDefines.h2
-rw-r--r--WebKit/wx/bindings/python/webview.i8
-rw-r--r--WebKit/wx/bindings/python/wscript13
6 files changed, 77 insertions, 15 deletions
diff --git a/WebKit/wx/ChangeLog b/WebKit/wx/ChangeLog
index b66bf69..342edea 100644
--- a/WebKit/wx/ChangeLog
+++ b/WebKit/wx/ChangeLog
@@ -1,3 +1,66 @@
+2010-08-16 Kevin Ollivier <kevino@theolliviers.com>
+
+ [wx] Build fix, do not build WebCore as a convenience library as this leads to
+ errors in the Win build w/export symbols and causes problems with DOM bindings
+ debugging in gdb.
+
+ * WebKitDefines.h:
+ * bindings/python/wscript:
+
+2010-08-16 Kevin Ollivier <kevino@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@apple.com>
+
+ Reviewed by Sam Weinig
+
+ Unify UString::UTF8String() & String::utf8() methods,
+ remove UString::cost() & make atArrayIndex a free function.
+
+ * WebFrame.cpp:
+ (wxWebFrame::RunScript):
+
+2010-08-12 Sheriff Bot <webkit.review.bot@gmail.com>
+
+ Unreviewed, rolling out r65295.
+ http://trac.webkit.org/changeset/65295
+ https://bugs.webkit.org/show_bug.cgi?id=43950
+
+ It broke 4 sputnik tests (Requested by Ossy on #webkit).
+
+ * WebFrame.cpp:
+ (wxWebFrame::RunScript):
+
+2010-08-12 Gavin Barraclough <barraclough@apple.com>
+
+ Reviewed by Sam Weinig
+
+ Unify UString::UTF8String() & String::utf8() methods,
+ remove UString::cost() & make atArrayIndex a free function.
+
+ * WebFrame.cpp:
+ (wxWebFrame::RunScript):
+
+2010-08-11 Kevin Ollivier <kevino@theolliviers.com>
+
+ [wx] Build fix. WebCore::String -> WTF::String fixes.
+
+ * WebEdit.cpp:
+ (wxWebEditCommand::SetNodeAttribute):
+
+2010-08-10 Gavin Barraclough <barraclough@apple.com>
+
+ Rubber stamped by Sam Weinig.
+
+ Bug 43786 - Move AtomicStringHash from WebCore to WTF
+ Also remove deprecated string headers from WebCore/platform/text.
+
+ * WebEdit.cpp:
+
2010-08-06 Gavin Barraclough <barraclough@apple.com>
Rubber stamped by Sam Weinig
diff --git a/WebKit/wx/WebEdit.cpp b/WebKit/wx/WebEdit.cpp
index 22ad193..503e2ed 100644
--- a/WebKit/wx/WebEdit.cpp
+++ b/WebKit/wx/WebEdit.cpp
@@ -3,7 +3,6 @@
#include "config.h"
#include "WebEdit.h"
-#include "AtomicString.h"
#include "CompositeEditCommand.h"
#include "Document.h"
#include "Frame.h"
@@ -13,6 +12,7 @@
#include "WebFrame.h"
#include "WebDOMElement.h"
+#include <wtf/text/AtomicString.h>
namespace WebCore {
@@ -55,7 +55,7 @@ wxWebEditCommand::~wxWebEditCommand()
void wxWebEditCommand::SetNodeAttribute(WebDOMElement* element, const wxString& name, const wxString& value)
{
if (m_impl)
- m_impl->setElementAttribute(element->impl(), WebCore::QualifiedName(WebCore::nullAtom, WTF::String(name), WebCore::nullAtom), WTF::String(value));
+ m_impl->setElementAttribute(element->impl(), WebCore::QualifiedName(WTF::nullAtom, WTF::String(name), WTF::nullAtom), WTF::String(value));
}
void wxWebEditCommand::Apply()
diff --git a/WebKit/wx/WebFrame.cpp b/WebKit/wx/WebFrame.cpp
index 182004b..f9be56f 100644
--- a/WebKit/wx/WebFrame.cpp
+++ b/WebKit/wx/WebFrame.cpp
@@ -233,7 +233,7 @@ wxString wxWebFrame::RunScript(const wxString& javascript)
if (jsEnabled) {
JSC::JSValue result = controller->executeScript(javascript, true).jsValue();
if (result)
- returnValue = wxString(result.toString(m_impl->frame->script()->globalObject(WebCore::mainThreadNormalWorld())->globalExec()).UTF8String().data(), wxConvUTF8);
+ returnValue = wxString(result.toString(m_impl->frame->script()->globalObject(WebCore::mainThreadNormalWorld())->globalExec()).utf8().data(), wxConvUTF8);
}
}
}
diff --git a/WebKit/wx/WebKitDefines.h b/WebKit/wx/WebKitDefines.h
index 67ad868..66e4216 100644
--- a/WebKit/wx/WebKitDefines.h
+++ b/WebKit/wx/WebKitDefines.h
@@ -34,7 +34,7 @@
#define WXDLLIMPEXP_WEBKIT __attribute__ ((visibility("default")))
#elif defined(WXMAKINGDLL_WEBKIT)
#define WXDLLIMPEXP_WEBKIT WXEXPORT
-#elif defined(WXUSINGDLL_WEBKIT)
+#else
#define WXDLLIMPEXP_WEBKIT WXIMPORT
#endif
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
)
generated by cgit v1.1 at 2025-08-17 01:36:32 +0000