+2011-03-03 Kevin Ollivier <kevino@theolliviers.com>
+
+ [wx] Build fix. Ensure the ICU include dir comes before JavaScriptCore/wtf on Win
+ to make sure the proper unicode/utf8.h header is included.
+
+ * wscript:
+
2011-03-02 Kevin Ollivier <kevino@theolliviers.com>
[wx] Build fix, don't use LocalizedNumberICU.cpp yet, headers that it needs are not
+2011-03-03 Kevin Ollivier <kevino@theolliviers.com>
+
+ [wx] Build fix. Alter order of headers included to make sure windows.h
+ is configured by wx, and skip Posix implementation file we don't use on Win.
+
+ * wscript:
+ * wtf/wx/StringWx.cpp:
+
2011-03-03 Oliver Hunt <oliver@apple.com>
Reviewed by Geoffrey Garen.
if build_port == "wx":
if building_on_win32:
- jscore_excludes += ['MarkStackPosix.cpp', 'ThreadingPthreads.cpp']
+ jscore_excludes += ['MarkStackPosix.cpp', 'OSAllocatorPosix.cpp', 'ThreadingPthreads.cpp']
sources += ['runtime/MarkStackWin.cpp']
else:
jscore_excludes.append('JSStringRefBSTR.cpp')
#include "config.h"
-#include <wtf/text/CString.h>
-#include <wtf/text/WTFString.h>
-
+// The wx headers must come first in this case, because the wtf/text headers
+// import windows.h, and we need to allow the wx headers to set its configuration
+// first.
#include <wx/defs.h>
#include <wx/string.h>
+#include <wtf/text/CString.h>
+#include <wtf/text/WTFString.h>
+
namespace WTF {
String::String(const wxString& wxstr)
+2011-03-03 Kevin Ollivier <kevino@theolliviers.com>
+
+ [wx] Build fixes. Use Font::textMetrics to get ascent value, and add missing include.
+
+ * platform/wx/DragDataWx.cpp:
+ * platform/wx/wxcode/win/non-kerned-drawing.cpp:
+ (WebCore::drawTextWithSpacing):
+
2011-03-03 Oliver Hunt <oliver@apple.com>
Reviewed by Geoffrey Garen.
#include "Document.h"
#include "DocumentFragment.h"
+#include "Range.h"
namespace WebCore {
// get the native HDC handle to draw using native APIs
HDC hdc = 0;
- float y = point.y() - font->ascent();
+ float y = point.y() - font->fontMetrics().ascent();
float x = point.x();
#if USE(WXGC)
cxxflags = []
if building_on_win32:
cxxflags.append('/FIWebCorePrefix.h')
+ # FIXME: We do this because in waf, local include dirs take precedence
+ # over global ones. This makes sense, but because unicode/utf8.h is both
+ # an ICU header name and a WebKit header name (in Source/JavaScriptCore/wtf)
+ # we have to make sure <unicode/utf8.h> picks up the ICU one first.
+ global msvclibs_dir
+ wk_includes.append(os.path.join(msvclibs_dir, 'include'))
else:
cxxflags.extend(['-include', 'WebCorePrefix.h'])