diff options
| author | Ben Murdoch <benm@google.com> | 2010-07-22 15:37:06 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-07-27 10:20:25 +0100 |
| commit | 967717af5423377c967781471ee106e2bb4e11c8 (patch) | |
| tree | 1e701dc0a12f7f07cce1df4a7681717de77a211b /WebCore/platform/wx/CursorWx.cpp | |
| parent | dcc30a9fca45f634b1d3a12b276d3a0ccce99fc3 (diff) | |
| download | external_webkit-967717af5423377c967781471ee106e2bb4e11c8.zip external_webkit-967717af5423377c967781471ee106e2bb4e11c8.tar.gz external_webkit-967717af5423377c967781471ee106e2bb4e11c8.tar.bz2 | |
Merge WebKit at r63859 : Initial merge by git.
Change-Id: Ie8096c63ec7c991c9a9cba8bdd9c3b74a3b8ed62
Diffstat (limited to 'WebCore/platform/wx/CursorWx.cpp')
| -rw-r--r-- | WebCore/platform/wx/CursorWx.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/WebCore/platform/wx/CursorWx.cpp b/WebCore/platform/wx/CursorWx.cpp index ed7f86b..dd61f1e 100644 --- a/WebCore/platform/wx/CursorWx.cpp +++ b/WebCore/platform/wx/CursorWx.cpp @@ -34,15 +34,15 @@ namespace WebCore { Cursor::Cursor(const Cursor& other) - : m_impl(other.m_impl) + : m_platformCursor(other.m_platformCursor) { } Cursor::Cursor(Image* image, const IntPoint&) { - m_impl = 0; + m_platformCursor = 0; // FIXME: figure out why the below code causes a crash - //m_impl = new wxCursor( image->getWxBitmap()->ConvertToImage() ); + //m_platformCursor = new wxCursor( image->getWxBitmap()->ConvertToImage() ); } Cursor::~Cursor() @@ -51,12 +51,12 @@ Cursor::~Cursor() Cursor& Cursor::operator=(const Cursor& other) { - m_impl = other.m_impl; + m_platformCursor = other.m_platformCursor; return *this; } Cursor::Cursor(wxCursor* c) - : m_impl(c) + : m_platformCursor(c) { } |