X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/de6185e212ebc37ff11ff70278e3c4f68419b097..539872aef30aedbf24339285374d19c0aedd2b11:/src/gtk/cursor.cpp diff --git a/src/gtk/cursor.cpp b/src/gtk/cursor.cpp index c975d3cf0d..a175daaa6e 100644 --- a/src/gtk/cursor.cpp +++ b/src/gtk/cursor.cpp @@ -15,13 +15,12 @@ #ifndef WX_PRECOMP #include "wx/app.h" #include "wx/utils.h" + #include "wx/image.h" + #include "wx/colour.h" #endif // WX_PRECOMP #include "wx/gtk/private.h" //for idle stuff -#include -#include - //----------------------------------------------------------------------------- // wxCursor //----------------------------------------------------------------------------- @@ -31,7 +30,7 @@ class wxCursorRefData: public wxObjectRefData public: wxCursorRefData(); - ~wxCursorRefData(); + virtual ~wxCursorRefData(); GdkCursor *m_cursor; }; @@ -88,7 +87,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_SIZING; break; + case wxCURSOR_SIZING: gdk_cur = GDK_FLEUR; 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; @@ -147,8 +146,8 @@ wxCursor::wxCursor(const char bits[], int width, int height, data, mask, fg->GetColor(), bg->GetColor(), hotSpotX, hotSpotY ); - g_object_unref (G_OBJECT (data)); - g_object_unref (G_OBJECT (mask)); + g_object_unref (data); + g_object_unref (mask); } #if wxUSE_IMAGE @@ -299,8 +298,8 @@ wxCursor::wxCursor( const wxImage & image ) hotSpotX, hotSpotY ); - g_object_unref (G_OBJECT (data)); - g_object_unref (G_OBJECT (mask)); + g_object_unref (data); + g_object_unref (mask); delete [] bits; delete [] maskBits; }