X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b7cacb43db1e69b87b257a67912b4d52995b070a..01c226691aabe0eb4bfe86c04b4b9a59d7af367a:/src/gtk1/cursor.cpp diff --git a/src/gtk1/cursor.cpp b/src/gtk1/cursor.cpp index 4f4ab1af4a..b402989ce0 100644 --- a/src/gtk1/cursor.cpp +++ b/src/gtk1/cursor.cpp @@ -31,10 +31,9 @@ extern bool g_isIdle; // wxCursor //----------------------------------------------------------------------------- -class wxCursorRefData: public wxObjectRefData +class wxCursorRefData : public wxGDIRefData { - public: - +public: wxCursorRefData(); virtual ~wxCursorRefData(); @@ -43,7 +42,7 @@ class wxCursorRefData: public wxObjectRefData wxCursorRefData::wxCursorRefData() { - m_cursor = (GdkCursor *) NULL; + m_cursor = NULL; } wxCursorRefData::~wxCursorRefData() @@ -62,7 +61,7 @@ wxCursor::wxCursor() } -wxCursor::wxCursor( int cursorId ) +void wxCursor::InitFromStock( wxStockCursor cursorId ) { m_refData = new wxCursorRefData(); @@ -316,24 +315,19 @@ wxCursor::~wxCursor() { } -bool wxCursor::operator == ( const wxCursor& cursor ) const -{ - return m_refData == cursor.m_refData; -} - -bool wxCursor::operator != ( const wxCursor& cursor ) const +GdkCursor *wxCursor::GetCursor() const { - return m_refData != cursor.m_refData; + return M_CURSORDATA->m_cursor; } -bool wxCursor::IsOk() const +wxGDIRefData *wxCursor::CreateGDIRefData() const { - return (m_refData != NULL); + return new wxCursorRefData; } -GdkCursor *wxCursor::GetCursor() const +wxGDIRefData *wxCursor::CloneGDIRefData(const wxGDIRefData *data) const { - return M_CURSORDATA->m_cursor; + return new wxCursorRefData(*static_cast(data)); } //-----------------------------------------------------------------------------