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/circle.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/circle.c')
| -rw-r--r-- | src/circle.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/circle.c b/src/circle.c index 0e0d096..c37d78c 100644 --- a/src/circle.c +++ b/src/circle.c @@ -17,7 +17,6 @@ #include <string.h> #include "ganv/canvas.h" -#include "ganv/canvas-base.h" #include "ganv/circle.h" #include "./color.h" @@ -233,8 +232,8 @@ request_redraw(GanvItem* item, ganv_item_i2w_pair(item, &x1, &y1, &x2, &y2); } - ganv_canvas_base_request_redraw(item->canvas, x1, y1, x2, y2); - ganv_canvas_base_request_redraw(item->canvas, 0, 0, 10000, 10000); + ganv_canvas_request_redraw(item->canvas, x1, y1, x2, y2); + ganv_canvas_request_redraw(item->canvas, 0, 0, 10000, 10000); } static void @@ -290,8 +289,8 @@ ganv_circle_update(GanvItem* item, int flags) ganv_item_i2w_pair(item, &x1, &y1, &x2, &y2); // Update item canvas coordinates - ganv_canvas_base_w2c_d(GANV_CANVAS_BASE(item->canvas), x1, y1, &item->x1, &item->y1); - ganv_canvas_base_w2c_d(GANV_CANVAS_BASE(item->canvas), x2, y2, &item->x2, &item->y2); + ganv_canvas_w2c_d(item->canvas, x1, y1, &item->x1, &item->y1); + ganv_canvas_w2c_d(item->canvas, x2, y2, &item->x2, &item->y2); // Request redraw of new location request_redraw(item, &impl->coords, FALSE); |