[wx] Unreviewed build fixes after recent trunk changes.

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

diff --git a/ChangeLog b/ChangeLog
index dfe965c..eed0239 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-05-05  Kevin Ollivier  <kevino@theolliviers.com>
+
+        [wx] Unreviewed build fix. Add LocalizedDateNone.cpp to the build.
+
+        * wscript:
+
 2011-05-05  Prasanth Ullattil  <prasanth.ullattil@nokia.com>
 
         Reviewed by Simon Hausmann.

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index bf348b1..0dbdc27 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2011-05-05  Kevin Ollivier  <kevino@theolliviers.com>
+
+        [wx] Unreviewed build fix. Include ApplicationServices for wx port.
+
+        * platform/graphics/GlyphBuffer.h:
+        * platform/graphics/mac/ComplexTextControllerCoreText.cpp:
+
 2011-05-05  Dan Bernstein  <mitz@apple.com>
 
         Reviewed by Simon Fraser.

diff --git a/Source/WebCore/platform/graphics/GlyphBuffer.h b/Source/WebCore/platform/graphics/GlyphBuffer.h
index 1a7cd8d..89dac78 100644 (file)
--- a/Source/WebCore/platform/graphics/GlyphBuffer.h
+++ b/Source/WebCore/platform/graphics/GlyphBuffer.h
@@ -35,10 +35,14 @@
 #include <wtf/UnusedParam.h>
 #include <wtf/Vector.h>
 
-#if USE(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROME)
+#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
 #include <CoreGraphics/CGGeometry.h>
 #endif
 
+#if PLATFORM(WX) && OS(DARWIN)
+#include <ApplicationServices/ApplicationServices.h>
+#endif
+
 #if USE(CAIRO) || (PLATFORM(WX) && defined(__WXGTK__))
 #include <cairo.h>
 #endif

diff --git a/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.cpp b/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.cpp
index 6a7af5a..6e71a85 100644 (file)
--- a/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.cpp
+++ b/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.cpp
@@ -31,7 +31,12 @@
 #include "Font.h"
 #include "TextRun.h"
 #include "WebCoreSystemInterface.h"
+
+#if PLATFORM(WX)
+#include <ApplicationServices/ApplicationServices.h>
+#else
 #include <CoreText/CoreText.h>
+#endif
 
 #if defined(BUILDING_ON_LEOPARD)
 // The following symbols are SPI in 10.5.

diff --git a/wscript b/wscript
index c6771f0..0034ea7 100644 (file)
--- a/wscript
+++ b/wscript
@@ -145,7 +145,8 @@ def build(bld):
     if Options.options.port == "wx":
         webcore_sources['wx'] = [
             'Source/WebCore/bindings/cpp/WebDOMEventTarget.cpp',
-            'Source/WebCore/platform/KillRingNone.cpp',                     
+            'Source/WebCore/platform/KillRingNone.cpp',
+            'Source/WebCore/platform/text/LocalizedDateNone.cpp',
             'Source/WebCore/platform/text/LocalizedNumberNone.cpp'
         ]