Build fixes to get wx impls. building on trunk.

Reviewed by Mark Rowe.

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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 0d8c9726c749a1ed9ddde4913fc500967b2bca08..4c34135ad08d7dde10294ea50c08279b8275d0f7 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,24 @@
+2007-11-03  Kevin Ollivier  <kevino@theolliviers.com>
+
+        Build fixes to get wx impls. building on trunk.
+
+        Reviewed by Mark Rowe.
+
+        * platform/wx/DragDataWx.cpp:
+        (WebCore::DragData::containsFiles):
+        (WebCore::DragData::asFilenames):
+        * platform/wx/DragImageWx.cpp:
+        (WebCore::scaleDragImage):
+        * platform/wx/MimeTypeRegistryWx.cpp:
+        (WebCore::MIMETypeRegistry::getMIMETypeForExtension):
+        * platform/wx/MouseEventWx.cpp:
+        (WebCore::PlatformMouseEvent::PlatformMouseEvent):
+        * platform/wx/MouseWheelEventWx.cpp:
+        * platform/wx/PasteboardWx.cpp:
+        (WebCore::Pasteboard::writeImage):
+        * platform/wx/WidgetWx.cpp:
+        (WebCore::Widget::setCursor):
+
 2007-11-03  David D. Kilzer  <ddkilzer@webkit.org>
 
         Sort files(...); sections of Xcode project files.

diff --git a/WebCore/platform/wx/DragDataWx.cpp b/WebCore/platform/wx/DragDataWx.cpp
index 73b5620a3912fb6afa709bf9758ae5a7833f6a28..49e4fd2a8cf56141be1c557646f05d2aa9642515 100644 (file)
--- a/WebCore/platform/wx/DragDataWx.cpp
+++ b/WebCore/platform/wx/DragDataWx.cpp
@@ -25,7 +25,6 @@
 
 #include "config.h"
 #include "DragData.h"
-
 #include "Document.h"
 #include "DocumentFragment.h"
 
@@ -41,6 +40,15 @@ bool DragData::containsColor() const
     return false;
 }
 
+bool DragData::containsFiles() const
+{
+    return false;
+}
+
+void DragData::asFilenames(Vector<String>& result) const
+{
+}
+
 bool DragData::containsPlainText() const
 {
     return false;

diff --git a/WebCore/platform/wx/DragImageWx.cpp b/WebCore/platform/wx/DragImageWx.cpp
index 017258c487874067212b08060ffae3ccf526bbd6..df2dcee7f31c8fd2acfdd591ad6149935c61a037 100644 (file)
--- a/WebCore/platform/wx/DragImageWx.cpp
+++ b/WebCore/platform/wx/DragImageWx.cpp
@@ -25,8 +25,8 @@
 
 #include "config.h"
 #include "DragImage.h"
-
 #include "CachedImage.h"
+#include "FloatSize.h"
 #include "Image.h"
 
 namespace WebCore {
@@ -40,7 +40,7 @@ void deleteDragImage(DragImageRef)
 {
 }
 
-DragImageRef scaleDragImage(DragImageRef image, float)
+DragImageRef scaleDragImage(DragImageRef image, FloatSize)
 {
     return image;
 }

diff --git a/WebCore/platform/wx/MimeTypeRegistryWx.cpp b/WebCore/platform/wx/MimeTypeRegistryWx.cpp
index dd55bd8a025369925c71983525a8ef261c6c376e..ad831501ddf07ce171e901181499a4bac735fa52 100644 (file)
--- a/WebCore/platform/wx/MimeTypeRegistryWx.cpp
+++ b/WebCore/platform/wx/MimeTypeRegistryWx.cpp
@@ -28,8 +28,7 @@
 #include "config.h"
 #include "MimeTypeRegistry.h"
 
-namespace WebCore 
-{
+namespace WebCore {
 
 struct ExtensionMap {
     const char* extension;
@@ -56,7 +55,7 @@ static const ExtensionMap extensionMap [] = {
     { 0, 0 }
 };
     
-String MimeTypeRegistry::getMIMETypeForExtension(const String &ext)
+String MIMETypeRegistry::getMIMETypeForExtension(const String &ext)
 {
     String s = ext.lower();
     const ExtensionMap *e = extensionMap;

diff --git a/WebCore/platform/wx/MouseEventWx.cpp b/WebCore/platform/wx/MouseEventWx.cpp
index 5c841b89002e060e38c47b22fe7f15a9aeaaee9e..920ffd87c80af1ee0a1dd6b7dd1931406386a75a 100644 (file)
--- a/WebCore/platform/wx/MouseEventWx.cpp
+++ b/WebCore/platform/wx/MouseEventWx.cpp
@@ -23,6 +23,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
+#include "config.h"
 #include "PlatformMouseEvent.h"
 
 #include <wx/defs.h>
@@ -30,7 +31,7 @@
 
 namespace WebCore {
 
-PlatformMouseEvent::PlatformMouseEvent(wxMouseEvent& event, wxPoint& globalPoint)
+PlatformMouseEvent::PlatformMouseEvent(const wxMouseEvent& event, const wxPoint& globalPoint)
     : m_position(event.GetPosition())
     , m_globalPosition(globalPoint)
     , m_clickCount(event.ButtonDClick() ? 2 : 1)

diff --git a/WebCore/platform/wx/MouseWheelEventWx.cpp b/WebCore/platform/wx/MouseWheelEventWx.cpp
index 45ae8dcfc2fcb2fcc150890566ec2b24cf236b19..741c2167b4dd0477d9afdd744a728ee45343302d 100644 (file)
--- a/WebCore/platform/wx/MouseWheelEventWx.cpp
+++ b/WebCore/platform/wx/MouseWheelEventWx.cpp
@@ -23,6 +23,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
+#include "config.h"
 #include "PlatformWheelEvent.h"
 
 #include <wx/defs.h>

diff --git a/WebCore/platform/wx/PasteboardWx.cpp b/WebCore/platform/wx/PasteboardWx.cpp
index 506ef2c45a5781360631a20d66a295cad7dca554..5f90c51cb6690c6863a0bcd38038f3ac92bac920 100644 (file)
--- a/WebCore/platform/wx/PasteboardWx.cpp
+++ b/WebCore/platform/wx/PasteboardWx.cpp
@@ -24,13 +24,13 @@
  */
 
 #include "config.h"
-#include "Pasteboard.h"
 
+#include "Pasteboard.h"
 #include "DocumentFragment.h"
 #include "Editor.h"
+#include "KURL.h"
 #include "markup.h"
 #include "PlatformString.h"
-#include "KURL.h"
 
 #include <wx/defs.h>
 #include <wx/dataobj.h>
@@ -90,7 +90,7 @@ void Pasteboard::clear()
     wxTheClipboard->Clear();
 }
 
-void Pasteboard::writeImage(const HitTestResult&)
+void Pasteboard::writeImage(Node*, const KURL&, const String& title)
 {
 }
     

diff --git a/WebCore/platform/wx/WidgetWx.cpp b/WebCore/platform/wx/WidgetWx.cpp
index 4221367006d711ca9311f5731e765ed1a10e7f00..dd7e8b78253d8663604473db84c855604281ad70 100755 (executable)
--- a/WebCore/platform/wx/WidgetWx.cpp
+++ b/WebCore/platform/wx/WidgetWx.cpp
@@ -89,36 +89,17 @@ IntRect Widget::frameGeometry() const
     return IntRect();
 }
 
-bool Widget::hasFocus() const
-{
-    wxWindow* focus = wxWindow::FindFocus();
-    return (data->nativeWindow == focus);
-}
-
 void Widget::setFocus()
 {
     if (data->nativeWindow)
         data->nativeWindow->SetFocus();
 }
 
-void Widget::clearFocus()
-{
-}
-
-const Font& Widget::font() const
-{
-    return data->font;
-}
-
-void Widget::setFont(const Font& font)
-{
-    data->font = font;
-}
-
 void Widget::setCursor(const Cursor& cursor)
 {
-    if (data->nativeWindow)
+    if (data->nativeWindow && cursor.impl()) {
         data->nativeWindow->SetCursor(*cursor.impl());
+    }
 }
 
 void Widget::show()