X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f516d986371b7643efda569d64ae19e75d221411..a4761b4c08e6272c69bd242b3323ab47dbbc8902:/src/gtk1/cursor.cpp?ds=sidebyside diff --git a/src/gtk1/cursor.cpp b/src/gtk1/cursor.cpp index 70a3e24583..3b14510edb 100644 --- a/src/gtk1/cursor.cpp +++ b/src/gtk1/cursor.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: cursor.cpp +// Name: src/gtk1/cursor.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -11,8 +11,11 @@ #include "wx/wxprec.h" #include "wx/cursor.h" -#include "wx/utils.h" -#include "wx/app.h" + +#ifndef WX_PRECOMP + #include "wx/app.h" + #include "wx/utils.h" +#endif // WX_PRECOMP #include #include @@ -28,12 +31,11 @@ extern bool g_isIdle; // wxCursor //----------------------------------------------------------------------------- -class wxCursorRefData: public wxObjectRefData +class wxCursorRefData : public wxGDIRefData { - public: - +public: wxCursorRefData(); - ~wxCursorRefData(); + virtual ~wxCursorRefData(); GdkCursor *m_cursor; }; @@ -313,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::Ok() 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(*wx_static_cast(const wxCursorRefData *, data)); } //-----------------------------------------------------------------------------