wx/wxprec.h already includes wx/defs.h (with other minor cleaning).

[wxWidgets.git] / src / gtk / cursor.cpp

diff --git a/src/gtk/cursor.cpp b/src/gtk/cursor.cpp
index 6d66823e40f9b1f5cd6d25dedd8e148ca2964cac..7c431b8efa8b2b762fa66feb348272aed9057e7c 100644 (file)
--- a/src/gtk/cursor.cpp
+++ b/src/gtk/cursor.cpp
@@ -40,7 +40,7 @@ wxCursorRefData::wxCursorRefData()
 
 wxCursorRefData::~wxCursorRefData()
 {
-    if (m_cursor) gdk_cursor_destroy( m_cursor );
+    if (m_cursor) gdk_cursor_unref( m_cursor );
 }
 
 //-----------------------------------------------------------------------------
@@ -123,7 +123,7 @@ extern GtkWidget *wxGetRootWindow();
 
 wxCursor::wxCursor(const char bits[], int width, int  height,
                    int hotSpotX, int hotSpotY,
-                   const char maskBits[], wxColour *fg, wxColour *bg)
+                   const char maskBits[], const wxColour *fg, const wxColour *bg)
 {
     if (!maskBits)
         maskBits = bits;
@@ -144,8 +144,8 @@ wxCursor::wxCursor(const char bits[], int width, int  height,
                  data, mask, fg->GetColor(), bg->GetColor(),
                  hotSpotX, hotSpotY );
 
-    gdk_drawable_unref( data );
-    gdk_drawable_unref( mask );
+    g_object_unref (G_OBJECT (data));
+    g_object_unref (G_OBJECT (mask));
 }
 
 #if wxUSE_IMAGE
@@ -296,8 +296,8 @@ wxCursor::wxCursor( const wxImage & image )
                                 hotSpotX, hotSpotY
                              );
 
-    gdk_drawable_unref( data );
-    gdk_drawable_unref( mask );
+    g_object_unref (G_OBJECT (data));
+    g_object_unref (G_OBJECT (mask));
     delete [] bits;
     delete [] maskBits;
 }
@@ -359,7 +359,7 @@ void wxEndBusyCursor()
         wxTheApp->ProcessIdle();
 }
 
-void wxBeginBusyCursor( wxCursor *WXUNUSED(cursor) )
+void wxBeginBusyCursor( const wxCursor *WXUNUSED(cursor) )
 {
     if (gs_busyCount++ > 0)
         return;