diff options
Diffstat (limited to 'widgets/misc')
| -rw-r--r-- | widgets/misc/e-calendar-item.c | 13 | ||||
| -rw-r--r-- | widgets/misc/e-canvas-background.c | 16 | ||||
| -rw-r--r-- | widgets/misc/e-canvas.c | 10 |
3 files changed, 16 insertions, 23 deletions
diff --git a/widgets/misc/e-calendar-item.c b/widgets/misc/e-calendar-item.c index f5d2f870af..5ca1143c96 100644 --- a/widgets/misc/e-calendar-item.c +++ b/widgets/misc/e-calendar-item.c @@ -90,12 +90,11 @@ static void e_calendar_item_draw_day_numbers (ECalendarItem *calitem, gint start_weekday, gint cells_x, gint cells_y); -static gdouble e_calendar_item_point (GnomeCanvasItem *item, +static GnomeCanvasItem *e_calendar_item_point (GnomeCanvasItem *item, gdouble x, gdouble y, gint cx, - gint cy, - GnomeCanvasItem **actual_item); + gint cy); static void e_calendar_item_stop_selecting (ECalendarItem *calitem, guint32 time); static void e_calendar_item_selection_add_days (ECalendarItem *calitem, @@ -1760,13 +1759,11 @@ e_calendar_item_get_week_number (ECalendarItem *calitem, /* This is supposed to return the nearest item the the point and the distance. Since we are the only item we just return ourself and 0 for the distance. This is needed so that we get button/motion events. */ -static double +static GnomeCanvasItem * e_calendar_item_point (GnomeCanvasItem *item, gdouble x, gdouble y, - gint cx, gint cy, - GnomeCanvasItem **actual_item) + gint cx, gint cy) { - *actual_item = item; - return 0.0; + return item; } static void diff --git a/widgets/misc/e-canvas-background.c b/widgets/misc/e-canvas-background.c index f6179379e4..b2be246f21 100644 --- a/widgets/misc/e-canvas-background.c +++ b/widgets/misc/e-canvas-background.c @@ -371,23 +371,21 @@ ecb_draw (GnomeCanvasItem *item, x1, y1, x2 - x1, y2 - y1); } -static double -ecb_point (GnomeCanvasItem *item, gdouble x, gdouble y, gint cx, gint cy, - GnomeCanvasItem **actual_item) +static GnomeCanvasItem * +ecb_point (GnomeCanvasItem *item, gdouble x, gdouble y, gint cx, gint cy) { ECanvasBackground *ecb = E_CANVAS_BACKGROUND (item); if (ecb->priv->x1 >= 0 && ecb->priv->x1 > x) - return 1.0; + return NULL; if (ecb->priv->x2 >= 0 && ecb->priv->x2 < x) - return 1.0; + return NULL; if (ecb->priv->y1 >= 0 && ecb->priv->y1 > y) - return 1.0; + return NULL; if (ecb->priv->y2 >= 0 && ecb->priv->y2 < y) - return 1.0; - *actual_item = item; + return NULL; - return 0.0; + return item; } static void diff --git a/widgets/misc/e-canvas.c b/widgets/misc/e-canvas.c index dfa529ec6b..0b24b84cb9 100644 --- a/widgets/misc/e-canvas.c +++ b/widgets/misc/e-canvas.c @@ -167,13 +167,12 @@ canvas_emit_event (GnomeCanvas *canvas, * invariant. */ #define HACKISH_AFFINE -static double +static GnomeCanvasItem * gnome_canvas_item_invoke_point (GnomeCanvasItem *item, gdouble x, gdouble y, gint cx, - gint cy, - GnomeCanvasItem **actual_item) + gint cy) { #ifdef HACKISH_AFFINE gdouble i2w[6], w2c[6], i2c[6], c2i[6]; @@ -193,7 +192,7 @@ gnome_canvas_item_invoke_point (GnomeCanvasItem *item, #endif return (* GNOME_CANVAS_ITEM_CLASS (G_OBJECT_GET_CLASS (item))->point) ( - item, x, y, cx, cy, actual_item); + item, x, y, cx, cy); } /* Re-picks the current item in the canvas, based on the event's coordinates. @@ -287,8 +286,7 @@ pick_current_item (GnomeCanvas *canvas, GdkEvent *event) /* find the closest item */ if (canvas->root->flags & GNOME_CANVAS_ITEM_VISIBLE) - gnome_canvas_item_invoke_point (canvas->root, x, y, cx, cy, - &canvas->new_current_item); + canvas->new_current_item = gnome_canvas_item_invoke_point (canvas->root, x, y, cx, cy); else canvas->new_current_item = NULL; } else |