aboutsummaryrefslogtreecommitdiffstats
path: root/widgets/table
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2009-11-10 09:40:07 +0800
committerMatthew Barnes <mbarnes@redhat.com>2009-11-10 10:19:20 +0800
commit5beeca1f80c3a618feeeb2c5b7e09cc47b64387d (patch)
tree10a64d9c5ee58b63f908a173451135c6447ddd90 /widgets/table
parentbd5d405fe311361f27c78cd48682d2e067273d27 (diff)
downloadgsoc2013-evolution-5beeca1f80c3a618feeeb2c5b7e09cc47b64387d.tar
gsoc2013-evolution-5beeca1f80c3a618feeeb2c5b7e09cc47b64387d.tar.gz
gsoc2013-evolution-5beeca1f80c3a618feeeb2c5b7e09cc47b64387d.tar.bz2
gsoc2013-evolution-5beeca1f80c3a618feeeb2c5b7e09cc47b64387d.tar.lz
gsoc2013-evolution-5beeca1f80c3a618feeeb2c5b7e09cc47b64387d.tar.xz
gsoc2013-evolution-5beeca1f80c3a618feeeb2c5b7e09cc47b64387d.tar.zst
gsoc2013-evolution-5beeca1f80c3a618feeeb2c5b7e09cc47b64387d.zip
Kill e-cursor(s) (both of them).
Diffstat (limited to 'widgets/table')
-rw-r--r--widgets/table/e-table-header-item.c14
-rw-r--r--widgets/table/e-table-header-item.h1
2 files changed, 10 insertions, 5 deletions
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;
diff --git a/widgets/table/e-table-header-item.h b/widgets/table/e-table-header-item.h
index db2aeb3508..17e6e964f3 100644
--- a/widgets/table/e-table-header-item.h
+++ b/widgets/table/e-table-header-item.h
@@ -44,6 +44,7 @@ typedef struct {
ETableHeader *eth;
GdkCursor *change_cursor;
+ GdkCursor *resize_cursor;
short height, width;
PangoFontDescription *font_desc;