Commit f4c7c330 authored by kevino@webkit.org's avatar kevino@webkit.org

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


git-svn-id: svn://svn.chromium.org/blink/trunk@83090 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 357663cb
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> 2011-04-06 David Hyatt <hyatt@apple.com>
Reviewed by Dan Bernstein. Reviewed by Dan Bernstein.
...@@ -27,8 +27,10 @@ ...@@ -27,8 +27,10 @@
#include "Cursor.h" #include "Cursor.h"
#include "GraphicsContext.h" #include "GraphicsContext.h"
#include "HostWindow.h"
#include "IntRect.h" #include "IntRect.h"
#include "NotImplemented.h" #include "NotImplemented.h"
#include "ScrollView.h"
#include <wx/defs.h> #include <wx/defs.h>
#include <wx/scrolwin.h> #include <wx/scrolwin.h>
...@@ -54,8 +56,10 @@ void Widget::setFocus(bool focused) ...@@ -54,8 +56,10 @@ void Widget::setFocus(bool focused)
void Widget::setCursor(const Cursor& cursor) void Widget::setCursor(const Cursor& cursor)
{ {
if (platformWidget() && cursor.impl()) ScrollView* view = root();
platformWidget()->SetCursor(*cursor.impl()); if (!view)
return;
view->hostWindow()->setCursor(cursor);
} }
void Widget::show() void Widget::show()
......
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> 2011-04-04 MORITA Hajime <morrita@google.com>
Reviewed by Ryosuke Niwa. Reviewed by Ryosuke Niwa.
......
...@@ -460,9 +460,10 @@ void ChromeClientWx::chooseIconForFiles(const Vector<String>& filenames, FileCho ...@@ -460,9 +460,10 @@ void ChromeClientWx::chooseIconForFiles(const Vector<String>& filenames, FileCho
chooser->iconLoaded(Icon::createIconForFiles(filenames)); chooser->iconLoaded(Icon::createIconForFiles(filenames));
} }
void ChromeClientWx::setCursor(const Cursor&) void ChromeClientWx::setCursor(const Cursor& cursor)
{ {
notImplemented(); if (m_webView)
m_webView->SetCursor(*cursor.impl());
} }
void ChromeClientWx::requestGeolocationPermissionForFrame(Frame*, Geolocation*) void ChromeClientWx::requestGeolocationPermissionForFrame(Frame*, Geolocation*)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment