From 5beeca1f80c3a618feeeb2c5b7e09cc47b64387d Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 9 Nov 2009 20:40:07 -0500 Subject: Kill e-cursor(s) (both of them). --- widgets/table/e-table-header-item.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'widgets/table/e-table-header-item.c') diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c index 684c92037a..2b601c44b6 100644 --- a/widgets/table/e-table-header-item.c +++ b/widgets/table/e-table-header-item.c @@ -38,7 +38,6 @@ #include "e-util/e-util.h" #include "e-util/e-xml-utils.h" #include "misc/e-canvas.h" -#include "misc/e-cursors.h" #include "misc/e-gui-utils.h" #include "misc/e-popup-menu.h" @@ -121,6 +120,11 @@ ethi_dispose (GObject *object) { scroll_off (ethi); + if (ethi->resize_cursor) { + gdk_cursor_unref (ethi->resize_cursor); + ethi->resize_cursor = NULL; + } + if (ethi->dnd_code) { g_free (ethi->dnd_code); ethi->dnd_code = NULL; @@ -1081,10 +1085,9 @@ set_cursor (ETableHeaderItem *ethi, gint pos) } if (resizable) - e_cursor_set (canvas->window, E_CURSOR_SIZE_X); + gdk_window_set_cursor (canvas->window, ethi->resize_cursor); else gdk_window_set_cursor (canvas->window, NULL); - /* e_cursor_set (canvas->window, E_CURSOR_ARROW);*/ } static void @@ -1695,7 +1698,6 @@ ethi_event (GnomeCanvasItem *item, GdkEvent *e) case GDK_LEAVE_NOTIFY: gdk_window_set_cursor (GTK_WIDGET (canvas)->window, NULL); - /* e_cursor_set (GTK_WIDGET (canvas)->window, E_CURSOR_ARROW);*/ break; case GDK_MOTION_NOTIFY: @@ -1711,7 +1713,7 @@ ethi_event (GnomeCanvasItem *item, GdkEvent *e) gnome_canvas_item_grab (item, GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK, - e_cursor_get (E_CURSOR_SIZE_X), + ethi->resize_cursor, e->button.time); } @@ -1952,6 +1954,8 @@ ethi_init (ETableHeaderItem *ethi) { GnomeCanvasItem *item = GNOME_CANVAS_ITEM (ethi); + ethi->resize_cursor = gdk_cursor_new (GDK_SB_H_DOUBLE_ARROW); + ethi->resize_col = -1; item->x1 = 0; -- cgit v1.2.3