X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ff654490b7cb185631a1dc4621094d88643ccf41..63779a3de18f273c04247d74cee65f2bc6baa8ba:/src/gtk/cursor.cpp diff --git a/src/gtk/cursor.cpp b/src/gtk/cursor.cpp index b8d86c2037..0e778d1f8c 100644 --- a/src/gtk/cursor.cpp +++ b/src/gtk/cursor.cpp @@ -25,13 +25,14 @@ // wxCursor //----------------------------------------------------------------------------- -class wxCursorRefData: public wxObjectRefData +class wxCursorRefData: public wxGDIRefData { - public: - +public: wxCursorRefData(); virtual ~wxCursorRefData(); + virtual bool IsOk() const { return m_cursor != NULL; } + GdkCursor *m_cursor; }; @@ -87,7 +88,7 @@ wxCursor::wxCursor( int cursorId ) case wxCURSOR_ARROWWAIT: case wxCURSOR_WAIT: case wxCURSOR_WATCH: gdk_cur = GDK_WATCH; break; - case wxCURSOR_SIZING: gdk_cur = GDK_FLEUR; break; + case wxCURSOR_SIZING: gdk_cur = GDK_SIZING; break; case wxCURSOR_SPRAYCAN: gdk_cur = GDK_SPRAYCAN; break; case wxCURSOR_IBEAM: gdk_cur = GDK_XTERM; break; case wxCURSOR_PENCIL: gdk_cur = GDK_PENCIL; break; @@ -360,14 +361,19 @@ wxCursor::~wxCursor() { } -bool wxCursor::IsOk() const +GdkCursor *wxCursor::GetCursor() const { - return (m_refData != NULL); + return M_CURSORDATA->m_cursor; } -GdkCursor *wxCursor::GetCursor() const +wxGDIRefData *wxCursor::CreateGDIRefData() const { - return M_CURSORDATA->m_cursor; + return new wxCursorRefData; +} + +wxGDIRefData *wxCursor::CloneGDIRefData(const wxGDIRefData *data) const +{ + return new wxCursorRefData(*wx_static_cast(const wxCursorRefData *, data)); } //-----------------------------------------------------------------------------