<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[27187] trunk</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/27187">27187</a></dd>
<dt>Author</dt> <dd>kevino</dd>
<dt>Date</dt> <dd>2007-10-28 12:18:04 -0700 (Sun, 28 Oct 2007)</dd>
</dl>

<h3>Log Message</h3>
<pre>Add the defines, platform types and options needed for the wx port.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkJavaScriptCoreChangeLog">trunk/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkJavaScriptCorewtfPlatformh">trunk/JavaScriptCore/wtf/Platform.h</a></li>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCoreconfigh">trunk/WebCore/config.h</a></li>
<li><a href="#trunkWebCoreplatformContextMenuItemh">trunk/WebCore/platform/ContextMenuItem.h</a></li>
<li><a href="#trunkWebCoreplatformCursorh">trunk/WebCore/platform/Cursor.h</a></li>
<li><a href="#trunkWebCoreplatformDeprecatedStringh">trunk/WebCore/platform/DeprecatedString.h</a></li>
<li><a href="#trunkWebCoreplatformDragDatah">trunk/WebCore/platform/DragData.h</a></li>
<li><a href="#trunkWebCoreplatformDragImageh">trunk/WebCore/platform/DragImage.h</a></li>
<li><a href="#trunkWebCoreplatformFontDatah">trunk/WebCore/platform/FontData.h</a></li>
<li><a href="#trunkWebCoreplatformGlyphBufferh">trunk/WebCore/platform/GlyphBuffer.h</a></li>
<li><a href="#trunkWebCoreplatformPlatformKeyboardEventh">trunk/WebCore/platform/PlatformKeyboardEvent.h</a></li>
<li><a href="#trunkWebCoreplatformPlatformMenuDescriptionh">trunk/WebCore/platform/PlatformMenuDescription.h</a></li>
<li><a href="#trunkWebCoreplatformPlatformMouseEventh">trunk/WebCore/platform/PlatformMouseEvent.h</a></li>
<li><a href="#trunkWebCoreplatformPlatformStringh">trunk/WebCore/platform/PlatformString.h</a></li>
<li><a href="#trunkWebCoreplatformPlatformWheelEventh">trunk/WebCore/platform/PlatformWheelEvent.h</a></li>
<li><a href="#trunkWebCoreplatformScrollViewh">trunk/WebCore/platform/ScrollView.h</a></li>
<li><a href="#trunkWebCoreplatformWidgeth">trunk/WebCore/platform/Widget.h</a></li>
<li><a href="#trunkWebCoreplatformimagedecodersbmpBMPImageDecodercpp">trunk/WebCore/platform/image-decoders/bmp/BMPImageDecoder.cpp</a></li>
<li><a href="#trunkWebCoreplatformimagedecodersgifGIFImageDecodercpp">trunk/WebCore/platform/image-decoders/gif/GIFImageDecoder.cpp</a></li>
<li><a href="#trunkWebCoreplatformimagedecodersgifGIFImageReadercpp">trunk/WebCore/platform/image-decoders/gif/GIFImageReader.cpp</a></li>
<li><a href="#trunkWebCoreplatformimagedecodersicoICOImageDecodercpp">trunk/WebCore/platform/image-decoders/ico/ICOImageDecoder.cpp</a></li>
<li><a href="#trunkWebCoreplatformimagedecodersjpegJPEGImageDecodercpp">trunk/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp</a></li>
<li><a href="#trunkWebCoreplatformimagedecoderspngPNGImageDecodercpp">trunk/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp</a></li>
<li><a href="#trunkWebCoreplatformimagedecodersxbmXBMImageDecodercpp">trunk/WebCore/platform/image-decoders/xbm/XBMImageDecoder.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/ChangeLog (27186 => 27187)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/ChangeLog        2007-10-28 18:20:05 UTC (rev 27186)
+++ trunk/JavaScriptCore/ChangeLog        2007-10-28 19:18:04 UTC (rev 27187)
</span><span class="lines">@@ -1,3 +1,11 @@
</span><ins>+2007-10-28  Kevin Ollivier  &lt;kevino@theolliviers.com&gt;
+
+        Define wx port and set wx port USE options.
+
+        Reviewed by Adam Roben.
+
+        * wtf/Platform.h:
+
</ins><span class="cx"> 2007-10-28  Mark Rowe  &lt;mrowe@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         We don't include &quot;config.h&quot; in headers.
</span></span></pre></div>
<a id="trunkJavaScriptCorewtfPlatformh"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/wtf/Platform.h (27186 => 27187)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/wtf/Platform.h        2007-10-28 18:20:05 UTC (rev 27186)
+++ trunk/JavaScriptCore/wtf/Platform.h        2007-10-28 19:18:04 UTC (rev 27187)
</span><span class="lines">@@ -84,6 +84,8 @@
</span><span class="cx"> #define WTF_PLATFORM_KDE 1
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><ins>+#elif defined(BUILDING_WX__)
+#define WTF_PLATFORM_WX 1
</ins><span class="cx"> #elif defined(BUILDING_GTK__)
</span><span class="cx"> #define WTF_PLATFORM_GTK 1
</span><span class="cx"> #elif PLATFORM(DARWIN)
</span><span class="lines">@@ -99,7 +101,7 @@
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> #define WTF_PLATFORM_CG 1
</span><span class="cx"> #define WTF_PLATFORM_CI 1
</span><del>-#elif !PLATFORM(QT)
</del><ins>+#elif !PLATFORM(QT) &amp;&amp; !PLATFORM(WX)
</ins><span class="cx"> #define WTF_PLATFORM_CAIRO 1
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="lines">@@ -212,6 +214,11 @@
</span><span class="cx"> #define WTF_USE_WININET 1
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><ins>+#if PLATFORM(WX)
+#define WTF_USE_CURL 1
+#define WTF_USE_PTHREADS 1
+#endif
+
</ins><span class="cx"> #if PLATFORM(GTK)
</span><span class="cx"> #define WTF_USE_CURL 1
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (27186 => 27187)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2007-10-28 18:20:05 UTC (rev 27186)
+++ trunk/WebCore/ChangeLog        2007-10-28 19:18:04 UTC (rev 27187)
</span><span class="lines">@@ -1,3 +1,39 @@
</span><ins>+2007-10-28  Kevin Ollivier  &lt;kevino@theolliviers.com&gt;
+
+        Define types and accessors needed for wx implementation
+        of platform classes. Also, turn off DisallowCTypes.h because
+        disallowed methods appear in wx headers.
+
+        Reviewed by Adam Roben.
+
+        * config.h:
+        * platform/ContextMenuItem.h:
+        * platform/Cursor.h:
+        * platform/DeprecatedString.h:
+        * platform/DragData.h:
+        * platform/DragImage.h:
+        * platform/FontData.h:
+        (WebCore::FontData::getWxFont):
+        * platform/GlyphBuffer.h:
+        (WebCore::GlyphBuffer::glyphAt):
+        (WebCore::GlyphBuffer::advanceAt):
+        (WebCore::GlyphBuffer::add):
+        * platform/PlatformKeyboardEvent.h:
+        (WebCore::PlatformKeyboardEvent::isWxCharEvent):
+        * platform/PlatformMenuDescription.h:
+        * platform/PlatformMouseEvent.h:
+        * platform/PlatformString.h:
+        * platform/PlatformWheelEvent.h:
+        * platform/ScrollView.h:
+        * platform/Widget.h:
+        * platform/image-decoders/bmp/BMPImageDecoder.cpp:
+        * platform/image-decoders/gif/GIFImageDecoder.cpp:
+        * platform/image-decoders/gif/GIFImageReader.cpp:
+        * platform/image-decoders/ico/ICOImageDecoder.cpp:
+        * platform/image-decoders/jpeg/JPEGImageDecoder.cpp:
+        * platform/image-decoders/png/PNGImageDecoder.cpp:
+        * platform/image-decoders/xbm/XBMImageDecoder.cpp:
+
</ins><span class="cx"> 2007-10-28  Mark Rowe  &lt;mrowe@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         We don't include &quot;config.h&quot; in headers.
</span></span></pre></div>
<a id="trunkWebCoreconfigh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/config.h (27186 => 27187)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/config.h        2007-10-28 18:20:05 UTC (rev 27186)
+++ trunk/WebCore/config.h        2007-10-28 19:18:04 UTC (rev 27187)
</span><span class="lines">@@ -66,7 +66,10 @@
</span><span class="cx"> 
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-#if !PLATFORM(QT) // this breaks compilation of &lt;QFontDatabase&gt;, at least, so turn it off for now
</del><ins>+// this breaks compilation of &lt;QFontDatabase&gt;, at least, so turn it off for now
+// Also generates errors on wx on Windows, presumably because these functions
+// are used from wx headers. 
+#if !PLATFORM(QT) &amp;&amp; !PLATFORM(WX)
</ins><span class="cx"> #include &lt;wtf/DisallowCType.h&gt;
</span><span class="cx"> #endif
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkWebCoreplatformContextMenuItemh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/ContextMenuItem.h (27186 => 27187)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/ContextMenuItem.h        2007-10-28 18:20:05 UTC (rev 27186)
+++ trunk/WebCore/platform/ContextMenuItem.h        2007-10-28 19:18:04 UTC (rev 27187)
</span><span class="lines">@@ -44,6 +44,8 @@
</span><span class="cx"> typedef struct _GtkMenuItem GtkMenuItem;
</span><span class="cx"> #elif PLATFORM(QT)
</span><span class="cx"> #include &lt;QAction&gt;
</span><ins>+#elif PLATFORM(WX)
+class wxMenuItem;
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -138,6 +140,8 @@
</span><span class="cx">     typedef PlatformMenuItemDescriptionType* PlatformMenuItemDescription;
</span><span class="cx"> #elif PLATFORM(GTK)
</span><span class="cx">     typedef GtkMenuItem* PlatformMenuItemDescription;
</span><ins>+#elif PLATFORM(WX)
+    typedef wxMenuItem* PlatformMenuItemDescription;
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx">     class ContextMenuItem {
</span></span></pre></div>
<a id="trunkWebCoreplatformCursorh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/Cursor.h (27186 => 27187)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/Cursor.h        2007-10-28 18:20:05 UTC (rev 27186)
+++ trunk/WebCore/platform/Cursor.h        2007-10-28 19:18:04 UTC (rev 27187)
</span><span class="lines">@@ -47,6 +47,10 @@
</span><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><ins>+#if PLATFORM(WX)
+class wxCursor;
+#endif
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><span class="cx">     class Image;
</span><span class="lines">@@ -70,6 +74,8 @@
</span><span class="cx">     typedef GdkCursor* PlatformCursor;
</span><span class="cx"> #elif PLATFORM(QT) &amp;&amp; !defined(QT_NO_CURSOR)
</span><span class="cx">     typedef QCursor PlatformCursor;
</span><ins>+#elif PLATFORM(WX)
+    typedef wxCursor* PlatformCursor;
</ins><span class="cx"> #else
</span><span class="cx">     typedef void* PlatformCursor;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkWebCoreplatformDeprecatedStringh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/DeprecatedString.h (27186 => 27187)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/DeprecatedString.h        2007-10-28 18:20:05 UTC (rev 27186)
+++ trunk/WebCore/platform/DeprecatedString.h        2007-10-28 19:18:04 UTC (rev 27187)
</span><span class="lines">@@ -54,6 +54,10 @@
</span><span class="cx"> class QString;
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><ins>+#if PLATFORM(WX)
+class wxString;
+#endif
+
</ins><span class="cx"> namespace KJS {
</span><span class="cx">     class Identifier;
</span><span class="cx">     class UString;
</span><span class="lines">@@ -437,6 +441,10 @@
</span><span class="cx"> 
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><ins>+#if PLATFORM(WX)
+    operator wxString() const;
+#endif
+
</ins><span class="cx"> #if PLATFORM(SYMBIAN)
</span><span class="cx">     TPtrC des() const;
</span><span class="cx">     TPtrC8 des8() const;
</span></span></pre></div>
<a id="trunkWebCoreplatformDragDatah"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/DragData.h (27186 => 27187)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/DragData.h        2007-10-28 18:20:05 UTC (rev 27186)
+++ trunk/WebCore/platform/DragData.h        2007-10-28 19:18:04 UTC (rev 27187)
</span><span class="lines">@@ -47,6 +47,8 @@
</span><span class="cx"> typedef const QMimeData* DragDataRef;
</span><span class="cx"> #elif PLATFORM(WIN)
</span><span class="cx"> typedef struct IDataObject* DragDataRef;
</span><ins>+#elif PLATFORM(WX)
+typedef class wxDataObject* DragDataRef;
</ins><span class="cx"> #elif PLATFORM(GTK)
</span><span class="cx"> // FIXME: this should probably be something gdk-specific
</span><span class="cx"> typedef void* DragDataRef;
</span></span></pre></div>
<a id="trunkWebCoreplatformDragImageh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/DragImage.h (27186 => 27187)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/DragImage.h        2007-10-28 18:20:05 UTC (rev 27186)
+++ trunk/WebCore/platform/DragImage.h        2007-10-28 19:18:04 UTC (rev 27187)
</span><span class="lines">@@ -40,6 +40,8 @@
</span><span class="cx"> class QImage;
</span><span class="cx"> #elif PLATFORM(WIN)
</span><span class="cx"> typedef struct HBITMAP__* HBITMAP;
</span><ins>+#elif PLATFORM(WX)
+class wxDragImage;
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> //We need to #define YOffset as it needs to be shared with WebKit
</span><span class="lines">@@ -60,6 +62,8 @@
</span><span class="cx">     typedef QImage* DragImageRef;
</span><span class="cx"> #elif PLATFORM(WIN)
</span><span class="cx">     typedef HBITMAP DragImageRef;
</span><ins>+#elif PLATFORM(WX)
+    typedef wxDragImage* DragImageRef;
</ins><span class="cx"> #elif PLATFORM(GTK)
</span><span class="cx">     typedef void* DragImageRef;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkWebCoreplatformFontDatah"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/FontData.h (27186 => 27187)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/FontData.h        2007-10-28 18:20:05 UTC (rev 27186)
+++ trunk/WebCore/platform/FontData.h        2007-10-28 19:18:04 UTC (rev 27187)
</span><span class="lines">@@ -98,6 +98,10 @@
</span><span class="cx">     void setFont(cairo_t*) const;
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><ins>+#if PLATFORM(WX)
+    wxFont* getWxFont() const { return m_font.font(); }
+#endif
+
</ins><span class="cx"> private:
</span><span class="cx">     void platformInit();
</span><span class="cx">     void platformDestroy();
</span></span></pre></div>
<a id="trunkWebCoreplatformGlyphBufferh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/GlyphBuffer.h (27186 => 27187)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/GlyphBuffer.h        2007-10-28 18:20:05 UTC (rev 27186)
+++ trunk/WebCore/platform/GlyphBuffer.h        2007-10-28 19:18:04 UTC (rev 27187)
</span><span class="lines">@@ -50,6 +50,9 @@
</span><span class="cx"> #elif PLATFORM(CAIRO)
</span><span class="cx"> typedef cairo_glyph_t GlyphBufferGlyph;
</span><span class="cx"> typedef FloatSize GlyphBufferAdvance;
</span><ins>+#elif PLATFORM(WX)
+typedef Glyph GlyphBufferGlyph;
+typedef FloatSize GlyphBufferAdvance;
</ins><span class="cx"> #elif PLATFORM(QT)
</span><span class="cx"> typedef unsigned short GlyphBufferGlyph;
</span><span class="cx"> typedef FloatSize GlyphBufferAdvance;
</span><span class="lines">@@ -100,7 +103,7 @@
</span><span class="cx"> 
</span><span class="cx">     Glyph glyphAt(int index) const
</span><span class="cx">     {
</span><del>-#if PLATFORM(CG) || PLATFORM(QT)
</del><ins>+#if PLATFORM(CG) || PLATFORM(QT) || PLATFORM(WX)
</ins><span class="cx">         return m_glyphs[index];
</span><span class="cx"> #elif PLATFORM(CAIRO)
</span><span class="cx">         return m_glyphs[index].index;
</span><span class="lines">@@ -111,7 +114,7 @@
</span><span class="cx">     {
</span><span class="cx"> #if PLATFORM(CG)
</span><span class="cx">         return m_advances[index].width;
</span><del>-#elif PLATFORM(CAIRO) || PLATFORM(QT)
</del><ins>+#elif PLATFORM(CAIRO) || PLATFORM(QT) || PLATFORM(WX)
</ins><span class="cx">         return m_advances[index].width();
</span><span class="cx"> #endif
</span><span class="cx">     }
</span><span class="lines">@@ -139,7 +142,7 @@
</span><span class="cx">         cairoGlyph.index = glyph;
</span><span class="cx">         m_glyphs.append(cairoGlyph);
</span><span class="cx">         m_advances.append(FloatSize(width, 0));
</span><del>-#elif PLATFORM(QT)
</del><ins>+#elif PLATFORM(QT) || PLATFORM(WX)
</ins><span class="cx">         m_glyphs.append(glyph);
</span><span class="cx">         m_advances.append(FloatSize(width, 0));
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkWebCoreplatformPlatformKeyboardEventh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/PlatformKeyboardEvent.h (27186 => 27187)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/PlatformKeyboardEvent.h        2007-10-28 18:20:05 UTC (rev 27186)
+++ trunk/WebCore/platform/PlatformKeyboardEvent.h        2007-10-28 19:18:04 UTC (rev 27187)
</span><span class="lines">@@ -52,6 +52,10 @@
</span><span class="cx"> class QKeyEvent;
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><ins>+#if PLATFORM(WX)
+class wxKeyEvent;
+#endif
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><span class="cx">     class PlatformKeyboardEvent {
</span><span class="lines">@@ -87,6 +91,11 @@
</span><span class="cx">         PlatformKeyboardEvent(QKeyEvent*);
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><ins>+#if PLATFORM(WX)
+        PlatformKeyboardEvent(wxKeyEvent&amp;);
+        bool isWxCharEvent() const { return m_isWxCharEvent; }
+#endif
+
</ins><span class="cx">     private:
</span><span class="cx">         String m_text;
</span><span class="cx">         String m_unmodifiedText;
</span><span class="lines">@@ -99,7 +108,9 @@
</span><span class="cx">         bool m_ctrlKey;
</span><span class="cx">         bool m_altKey;
</span><span class="cx">         bool m_metaKey;
</span><del>-
</del><ins>+#if PLATFORM(WX)
+        bool m_isWxCharEvent;
+#endif
</ins><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx">         RetainPtr&lt;NSEvent&gt; m_macEvent;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkWebCoreplatformPlatformMenuDescriptionh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/PlatformMenuDescription.h (27186 => 27187)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/PlatformMenuDescription.h        2007-10-28 18:20:05 UTC (rev 27186)
+++ trunk/WebCore/platform/PlatformMenuDescription.h        2007-10-28 19:18:04 UTC (rev 27187)
</span><span class="lines">@@ -38,6 +38,8 @@
</span><span class="cx"> class QMenu;
</span><span class="cx"> #elif PLATFORM(GTK)
</span><span class="cx"> typedef struct _GtkMenu GtkMenu;
</span><ins>+#elif PLATFORM(WX)
+class wxMenu;
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -50,6 +52,8 @@
</span><span class="cx">     typedef QMenu* PlatformMenuDescription;
</span><span class="cx"> #elif PLATFORM(GTK)
</span><span class="cx">     typedef GtkMenu* PlatformMenuDescription;
</span><ins>+#elif PLATFORM(WX)
+    typedef wxMenu* PlatformMenuDescription;
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> } // namespace
</span></span></pre></div>
<a id="trunkWebCoreplatformPlatformMouseEventh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/PlatformMouseEvent.h (27186 => 27187)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/PlatformMouseEvent.h        2007-10-28 18:20:05 UTC (rev 27186)
+++ trunk/WebCore/platform/PlatformMouseEvent.h        2007-10-28 19:18:04 UTC (rev 27187)
</span><span class="lines">@@ -57,6 +57,10 @@
</span><span class="cx"> class QMouseEvent;
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><ins>+#if PLATFORM(WX)
+class wxMouseEvent;
+#endif
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">     
</span><span class="cx">     // These button numbers match the ones used in the DOM API, 0 through 2, except for NoButton which isn't specified.
</span><span class="lines">@@ -126,6 +130,11 @@
</span><span class="cx">         PlatformMouseEvent(QMouseEvent*, int clickCount);
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><ins>+#if PLATFORM(WX)
+        PlatformMouseEvent(const wxMouseEvent&amp;, const wxPoint&amp; globalPoint);
+#endif
+
+
</ins><span class="cx">     private:
</span><span class="cx">         IntPoint m_position;
</span><span class="cx">         IntPoint m_globalPosition;
</span></span></pre></div>
<a id="trunkWebCoreplatformPlatformStringh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/PlatformString.h (27186 => 27187)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/PlatformString.h        2007-10-28 18:20:05 UTC (rev 27186)
+++ trunk/WebCore/platform/PlatformString.h        2007-10-28 19:18:04 UTC (rev 27187)
</span><span class="lines">@@ -37,6 +37,11 @@
</span><span class="cx"> class QString;
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><ins>+#if PLATFORM(WX)
+class wxString;
+#endif
+
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><span class="cx"> class CString;
</span><span class="lines">@@ -178,6 +183,11 @@
</span><span class="cx">     TPtrC des() const { if (!m_impl) return KNullDesC(); return m_impl-&gt;des(); }
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><ins>+#if PLATFORM(WX)
+    String(const wxString&amp;);
+    operator wxString() const;
+#endif
+
</ins><span class="cx"> #ifndef NDEBUG
</span><span class="cx">     // For debugging only, leaks memory.
</span><span class="cx">     Vector&lt;char&gt; ascii() const;
</span></span></pre></div>
<a id="trunkWebCoreplatformPlatformWheelEventh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/PlatformWheelEvent.h (27186 => 27187)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/PlatformWheelEvent.h        2007-10-28 18:20:05 UTC (rev 27186)
+++ trunk/WebCore/platform/PlatformWheelEvent.h        2007-10-28 19:18:04 UTC (rev 27187)
</span><span class="lines">@@ -50,6 +50,11 @@
</span><span class="cx"> class QWheelEvent;
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><ins>+#if PLATFORM(WX)
+class wxMouseEvent;
+class wxPoint;
+#endif
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><span class="cx">     class PlatformWheelEvent {
</span><span class="lines">@@ -90,6 +95,9 @@
</span><span class="cx"> #if PLATFORM(QT)
</span><span class="cx">         PlatformWheelEvent(QWheelEvent*);
</span><span class="cx"> #endif
</span><ins>+#if PLATFORM(WX)
+        PlatformWheelEvent(const wxMouseEvent&amp;, const wxPoint&amp;);
+#endif
</ins><span class="cx"> 
</span><span class="cx">     private:
</span><span class="cx">         IntPoint m_position;
</span></span></pre></div>
<a id="trunkWebCoreplatformScrollViewh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/ScrollView.h (27186 => 27187)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/ScrollView.h        2007-10-28 18:20:05 UTC (rev 27186)
+++ trunk/WebCore/platform/ScrollView.h        2007-10-28 19:18:04 UTC (rev 27187)
</span><span class="lines">@@ -209,6 +209,13 @@
</span><span class="cx">         class ScrollViewPrivate;
</span><span class="cx">         ScrollViewPrivate* m_data;
</span><span class="cx"> #endif
</span><ins>+#if PLATFORM(WX)
+        ScrollView();
+        ~ScrollView();
+    private:
+        class ScrollViewPrivate;
+        ScrollViewPrivate* m_data;
+#endif
</ins><span class="cx">     };
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkWebCoreplatformWidgeth"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/Widget.h (27186 => 27187)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/Widget.h        2007-10-28 18:20:05 UTC (rev 27186)
+++ trunk/WebCore/platform/Widget.h        2007-10-28 19:18:04 UTC (rev 27187)
</span><span class="lines">@@ -51,6 +51,10 @@
</span><span class="cx"> class QWebFrame;
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><ins>+#if PLATFORM(WX)
+class wxScrolledWindow;
+#endif
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><span class="cx">     class Cursor;
</span><span class="lines">@@ -194,6 +198,12 @@
</span><span class="cx">         IntPoint convertToScreenCoordinate(NSView*, const IntPoint&amp;);
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><ins>+#if PLATFORM(WX)
+        Widget(wxScrolledWindow*);
+        wxScrolledWindow* nativeWindow() const;
+        void setNativeWindow(wxScrolledWindow*);
+#endif
+
</ins><span class="cx">     private:
</span><span class="cx">         WidgetPrivate* data;
</span><span class="cx">     };
</span></span></pre></div>
<a id="trunkWebCoreplatformimagedecodersbmpBMPImageDecodercpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/image-decoders/bmp/BMPImageDecoder.cpp (27186 => 27187)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/image-decoders/bmp/BMPImageDecoder.cpp        2007-10-28 18:20:05 UTC (rev 27186)
+++ trunk/WebCore/platform/image-decoders/bmp/BMPImageDecoder.cpp        2007-10-28 19:18:04 UTC (rev 27187)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #include &quot;config.h&quot;
</span><span class="cx"> #include &quot;BMPImageDecoder.h&quot;
</span><span class="cx"> 
</span><del>-#if PLATFORM(CAIRO) || PLATFORM(QT)
</del><ins>+#if PLATFORM(CAIRO) || PLATFORM(QT) || PLATFORM(WX)
</ins><span class="cx"> 
</span><span class="cx"> namespace WebCore
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkWebCoreplatformimagedecodersgifGIFImageDecodercpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/image-decoders/gif/GIFImageDecoder.cpp (27186 => 27187)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/image-decoders/gif/GIFImageDecoder.cpp        2007-10-28 18:20:05 UTC (rev 27186)
+++ trunk/WebCore/platform/image-decoders/gif/GIFImageDecoder.cpp        2007-10-28 19:18:04 UTC (rev 27187)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #include &quot;GIFImageDecoder.h&quot;
</span><span class="cx"> #include &quot;GIFImageReader.h&quot;
</span><span class="cx"> 
</span><del>-#if PLATFORM(CAIRO) || PLATFORM(QT)
</del><ins>+#if PLATFORM(CAIRO) || PLATFORM(QT) || PLATFORM(WX)
</ins><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkWebCoreplatformimagedecodersgifGIFImageReadercpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/image-decoders/gif/GIFImageReader.cpp (27186 => 27187)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/image-decoders/gif/GIFImageReader.cpp        2007-10-28 18:20:05 UTC (rev 27186)
+++ trunk/WebCore/platform/image-decoders/gif/GIFImageReader.cpp        2007-10-28 19:18:04 UTC (rev 27187)
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> #include &lt;string.h&gt;
</span><span class="cx"> #include &quot;GIFImageDecoder.h&quot;
</span><span class="cx"> 
</span><del>-#if PLATFORM(CAIRO) || PLATFORM(QT)
</del><ins>+#if PLATFORM(CAIRO) || PLATFORM(QT) || PLATFORM(WX)
</ins><span class="cx"> 
</span><span class="cx"> using WebCore::GIFImageDecoder;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkWebCoreplatformimagedecodersicoICOImageDecodercpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/image-decoders/ico/ICOImageDecoder.cpp (27186 => 27187)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/image-decoders/ico/ICOImageDecoder.cpp        2007-10-28 18:20:05 UTC (rev 27186)
+++ trunk/WebCore/platform/image-decoders/ico/ICOImageDecoder.cpp        2007-10-28 19:18:04 UTC (rev 27187)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #include &quot;config.h&quot;
</span><span class="cx"> #include &quot;ICOImageDecoder.h&quot;
</span><span class="cx"> 
</span><del>-#if PLATFORM(CAIRO) || PLATFORM(QT)
</del><ins>+#if PLATFORM(CAIRO) || PLATFORM(QT) || PLATFORM(WX)
</ins><span class="cx"> 
</span><span class="cx"> namespace WebCore
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkWebCoreplatformimagedecodersjpegJPEGImageDecodercpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp (27186 => 27187)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp        2007-10-28 18:20:05 UTC (rev 27186)
+++ trunk/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp        2007-10-28 19:18:04 UTC (rev 27187)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> #include &quot;JPEGImageDecoder.h&quot;
</span><span class="cx"> #include &lt;assert.h&gt;
</span><span class="cx"> 
</span><del>-#if PLATFORM(CAIRO) || PLATFORM(QT)
</del><ins>+#if PLATFORM(CAIRO) || PLATFORM(QT) || PLATFORM(WX)
</ins><span class="cx"> 
</span><span class="cx"> extern &quot;C&quot; {
</span><span class="cx"> #include &quot;jpeglib.h&quot;
</span></span></pre></div>
<a id="trunkWebCoreplatformimagedecoderspngPNGImageDecodercpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp (27186 => 27187)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp        2007-10-28 18:20:05 UTC (rev 27186)
+++ trunk/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp        2007-10-28 19:18:04 UTC (rev 27187)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> #include &quot;png.h&quot;
</span><span class="cx"> #include &quot;assert.h&quot;
</span><span class="cx"> 
</span><del>-#if PLATFORM(CAIRO) || PLATFORM(QT)
</del><ins>+#if PLATFORM(CAIRO) || PLATFORM(QT) || PLATFORM(WX)
</ins><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkWebCoreplatformimagedecodersxbmXBMImageDecodercpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/image-decoders/xbm/XBMImageDecoder.cpp (27186 => 27187)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/image-decoders/xbm/XBMImageDecoder.cpp        2007-10-28 18:20:05 UTC (rev 27186)
+++ trunk/WebCore/platform/image-decoders/xbm/XBMImageDecoder.cpp        2007-10-28 19:18:04 UTC (rev 27187)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #include &quot;config.h&quot;
</span><span class="cx"> #include &quot;XBMImageDecoder.h&quot;
</span><span class="cx">  
</span><del>-#if PLATFORM(CAIRO) || PLATFORM(QT)
</del><ins>+#if PLATFORM(CAIRO) || PLATFORM(QT) || PLATFORM(WX)
</ins><span class="cx"> 
</span><span class="cx"> namespace WebCore
</span><span class="cx"> {
</span></span></pre>
</div>
</div>

</body>
</html>