Changeset 83090 in webkit

Timestamp:

Apr 6, 2011 1:29:22 PM (13 years ago)

Author:

kevino@webkit.org

Message:

Reviewed by Kevin Ollivier.

[wx] Fix cursor handling so that we always call the chrome to set it.

​https://bugs.webkit.org/show_bug.cgi?id=57972

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/wx/WidgetWx.cpp (modified) (2 diffs)
• WebKit/wx/ChangeLog (modified) (1 diff)
• WebKit/wx/WebKitSupport/ChromeClientWx.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-06  Malcolm MacLeod  <malcolm.macleod@tshwanedje.com>
+
+        Reviewed by Kevin Ollivier.
+
+        [wx] Fix cursor handling so that we always call the chrome to set it.
+        
+        https://bugs.webkit.org/show_bug.cgi?id=57972
+
+        * platform/wx/WidgetWx.cpp:
+        (WebCore::Widget::setCursor):
+
 2011-04-06  David Hyatt  <hyatt@apple.com>
 

trunk/Source/WebCore/platform/wx/WidgetWx.cpp

@@ -28 +28 @@
 #include "Cursor.h"
 #include "GraphicsContext.h"
+#include "HostWindow.h"
 #include "IntRect.h"
 #include "NotImplemented.h"
+#include "ScrollView.h"
 
 #include <wx/defs.h>
@@ -55 +57 @@
 void Widget::setCursor(const Cursor& cursor)
 {
-    if (platformWidget() && cursor.impl())
-        platformWidget()->SetCursor(*cursor.impl());
+    ScrollView* view = root();
+    if (!view)
+        return;
+    view->hostWindow()->setCursor(cursor);
 }
 

trunk/Source/WebKit/wx/ChangeLog

@@ +1 @@
+2011-04-06  Malcolm MacLeod  <malcolm.macleod@tshwanedje.com>
+
+        Reviewed by Kevin Ollivier.
+
+        [wx] Fix cursor handling so that we always call the chrome to set it.
+        
+        https://bugs.webkit.org/show_bug.cgi?id=57972
+
+        * WebKitSupport/ChromeClientWx.cpp:
+        (WebCore::ChromeClientWx::setCursor):
+
 2011-04-04  MORITA Hajime  <morrita@google.com>
 

trunk/Source/WebKit/wx/WebKitSupport/ChromeClientWx.cpp

@@ -461 +461 @@
 }
 
-void ChromeClientWx::setCursor(const Cursor&)
-{
-    notImplemented();
+void ChromeClientWx::setCursor(const Cursor& cursor)
+{
+    if (m_webView)
+        m_webView->SetCursor(*cursor.impl());
 }