From 5d812173d0e4e12a74bce2ee137d04b0e56db827 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 25 Oct 2010 10:36:27 -0400 Subject: Drop usage of GtkAnchorType. gtk+-3.0 removed it for being "unused". --- libgnomecanvas/gnome-canvas-widget.c | 111 ----------------------------------- 1 file changed, 111 deletions(-) (limited to 'libgnomecanvas/gnome-canvas-widget.c') diff --git a/libgnomecanvas/gnome-canvas-widget.c b/libgnomecanvas/gnome-canvas-widget.c index fbcb0a6a53..85259f0ce0 100644 --- a/libgnomecanvas/gnome-canvas-widget.c +++ b/libgnomecanvas/gnome-canvas-widget.c @@ -43,7 +43,6 @@ enum { PROP_Y, PROP_WIDTH, PROP_HEIGHT, - PROP_ANCHOR, PROP_SIZE_PIXELS }; @@ -156,13 +155,6 @@ gnome_canvas_widget_class_init (GnomeCanvasWidgetClass *class) g_param_spec_double ("height", NULL, NULL, -G_MAXDOUBLE, G_MAXDOUBLE, 0.0, (G_PARAM_READABLE | G_PARAM_WRITABLE))); - g_object_class_install_property - (gobject_class, - PROP_ANCHOR, - g_param_spec_enum ("anchor", NULL, NULL, - GTK_TYPE_ANCHOR_TYPE, - GTK_ANCHOR_NW, - (G_PARAM_READABLE | G_PARAM_WRITABLE))); g_object_class_install_property (gobject_class, PROP_SIZE_PIXELS, @@ -198,7 +190,6 @@ gnome_canvas_widget_init (GnomeCanvasWidget *witem) witem->y = 0.0; witem->width = 0.0; witem->height = 0.0; - witem->anchor = GTK_ANCHOR_NW; witem->size_pixels = FALSE; } @@ -240,52 +231,6 @@ recalc_bounds (GnomeCanvasWidget *witem) gnome_canvas_w2c (item->canvas, wx, wy, &witem->cx, &witem->cy); - /* Anchor widget item */ - - switch (witem->anchor) { - case GTK_ANCHOR_NW: - case GTK_ANCHOR_W: - case GTK_ANCHOR_SW: - break; - - case GTK_ANCHOR_N: - case GTK_ANCHOR_CENTER: - case GTK_ANCHOR_S: - witem->cx -= witem->cwidth / 2; - break; - - case GTK_ANCHOR_NE: - case GTK_ANCHOR_E: - case GTK_ANCHOR_SE: - witem->cx -= witem->cwidth; - break; - - default: - break; - } - - switch (witem->anchor) { - case GTK_ANCHOR_NW: - case GTK_ANCHOR_N: - case GTK_ANCHOR_NE: - break; - - case GTK_ANCHOR_W: - case GTK_ANCHOR_CENTER: - case GTK_ANCHOR_E: - witem->cy -= witem->cheight / 2; - break; - - case GTK_ANCHOR_SW: - case GTK_ANCHOR_S: - case GTK_ANCHOR_SE: - witem->cy -= witem->cheight; - break; - - default: - break; - } - /* Bounds */ item->x1 = witem->cx; @@ -371,14 +316,6 @@ gnome_canvas_widget_set_property (GObject *object, } break; - case PROP_ANCHOR: - if (witem->anchor != g_value_get_enum (value)) - { - witem->anchor = g_value_get_enum (value); - update = TRUE; - } - break; - case PROP_SIZE_PIXELS: if (witem->size_pixels != g_value_get_boolean (value)) { @@ -433,10 +370,6 @@ gnome_canvas_widget_get_property (GObject *object, g_value_set_double (value, witem->height); break; - case PROP_ANCHOR: - g_value_set_enum (value, witem->anchor); - break; - case PROP_SIZE_PIXELS: g_value_set_boolean (value, witem->size_pixels); break; @@ -564,50 +497,6 @@ gnome_canvas_widget_bounds (GnomeCanvasItem *item, *x1 = witem->x; *y1 = witem->y; - switch (witem->anchor) { - case GTK_ANCHOR_NW: - case GTK_ANCHOR_W: - case GTK_ANCHOR_SW: - break; - - case GTK_ANCHOR_N: - case GTK_ANCHOR_CENTER: - case GTK_ANCHOR_S: - *x1 -= witem->width / 2.0; - break; - - case GTK_ANCHOR_NE: - case GTK_ANCHOR_E: - case GTK_ANCHOR_SE: - *x1 -= witem->width; - break; - - default: - break; - } - - switch (witem->anchor) { - case GTK_ANCHOR_NW: - case GTK_ANCHOR_N: - case GTK_ANCHOR_NE: - break; - - case GTK_ANCHOR_W: - case GTK_ANCHOR_CENTER: - case GTK_ANCHOR_E: - *y1 -= witem->height / 2.0; - break; - - case GTK_ANCHOR_SW: - case GTK_ANCHOR_S: - case GTK_ANCHOR_SE: - *y1 -= witem->height; - break; - - default: - break; - } - *x2 = *x1 + witem->width; *y2 = *y1 + witem->height; } -- cgit v1.2.3