[wx] Build fixes for Windows.

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

diff --git a/ChangeLog b/ChangeLog
index 36cd3e7..b67a057 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+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

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 7f0371f..d018e37 100644 (file)
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,11 @@
+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.

diff --git a/Source/JavaScriptCore/wscript b/Source/JavaScriptCore/wscript
index 8e27304..214ef91 100644 (file)
--- a/Source/JavaScriptCore/wscript
+++ b/Source/JavaScriptCore/wscript
@@ -38,7 +38,7 @@ jscore_excludes.extend(get_excludes(jscore_dir, ['*None.cpp']))
 
 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')

diff --git a/Source/JavaScriptCore/wtf/wx/StringWx.cpp b/Source/JavaScriptCore/wtf/wx/StringWx.cpp
index 06c7b61..d5f6c57 100644 (file)
--- a/Source/JavaScriptCore/wtf/wx/StringWx.cpp
+++ b/Source/JavaScriptCore/wtf/wx/StringWx.cpp
@@ -25,12 +25,15 @@
 
 #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)

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 0d0e9c1..cff82cd 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+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.

diff --git a/Source/WebCore/platform/wx/DragDataWx.cpp b/Source/WebCore/platform/wx/DragDataWx.cpp
index 53b4219..be24042 100644 (file)
--- a/Source/WebCore/platform/wx/DragDataWx.cpp
+++ b/Source/WebCore/platform/wx/DragDataWx.cpp
@@ -28,6 +28,7 @@
 
 #include "Document.h"
 #include "DocumentFragment.h"
+#include "Range.h"
 
 namespace WebCore {
 

diff --git a/Source/WebCore/platform/wx/wxcode/win/non-kerned-drawing.cpp b/Source/WebCore/platform/wx/wxcode/win/non-kerned-drawing.cpp
index 2fcd761..c1320c3 100644 (file)
--- a/Source/WebCore/platform/wx/wxcode/win/non-kerned-drawing.cpp
+++ b/Source/WebCore/platform/wx/wxcode/win/non-kerned-drawing.cpp
@@ -79,7 +79,7 @@ void drawTextWithSpacing(GraphicsContext* graphicsContext, const SimpleFontData*
 
     // 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)

diff --git a/wscript b/wscript
index aa266af..199ab1b 100644 (file)
--- a/wscript
+++ b/wscript
@@ -237,6 +237,12 @@ def build(bld):
     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'])