diff options
| author | David Robillard <d@drobilla.net> | 2014-01-11 22:35:56 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2014-01-11 22:35:56 +0000 |
| commit | 2c07b0df01c7b8ca9e9d5ea1730b09ca3cf801de (patch) | |
| tree | e1a58dd99261b26be3bfbe8090afe3f0e78784b6 /src/widget.c | |
| parent | afdb578607526ca82cf03ec04cb4f410f11692c1 (diff) | |
| download | ganv-2c07b0df01c7b8ca9e9d5ea1730b09ca3cf801de.tar.gz ganv-2c07b0df01c7b8ca9e9d5ea1730b09ca3cf801de.tar.bz2 ganv-2c07b0df01c7b8ca9e9d5ea1730b09ca3cf801de.zip | |
Merge GanvCanvasBase and GanvCanvas.
git-svn-id: http://svn.drobilla.net/lad/trunk/ganv@5302 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/widget.c')
| -rw-r--r-- | src/widget.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/widget.c b/src/widget.c index afbf56c..63c1dfd 100644 --- a/src/widget.c +++ b/src/widget.c @@ -21,7 +21,7 @@ #include <gtk/gtksignal.h> -#include "ganv/canvas-base.h" +#include "ganv/canvas.h" #include "ganv/widget.h" #include "./gettext.h" @@ -85,7 +85,7 @@ recalc_bounds(GanvWidget* witem) /* Get canvas pixel coordinates */ - ganv_canvas_base_w2c(item->canvas, wx, wy, &witem->cx, &witem->cy); + ganv_canvas_w2c(item->canvas, wx, wy, &witem->cx, &witem->cy); /* Anchor widget item */ @@ -330,7 +330,7 @@ ganv_widget_point(GanvItem* item, double x, double y, *actual_item = item; double x1, y1; - ganv_canvas_base_c2w(item->canvas, witem->cx, witem->cy, &x1, &y1); + ganv_canvas_c2w(item->canvas, witem->cx, witem->cy, &x1, &y1); double x2 = x1 + (witem->cwidth - 1) / item->canvas->pixels_per_unit; double y2 = y1 + (witem->cheight - 1) / item->canvas->pixels_per_unit; |