[evolution/foocanvas] Remove libart-compat as it is not necessary anymore.
- From: Henning Habighorst <hhabig src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution/foocanvas] Remove libart-compat as it is not necessary anymore.
- Date: Sun, 25 Apr 2010 23:28:50 +0000 (UTC)
commit ac5a0cc6b7b54079367ece7373cf04529f0b59c5
Author: H.Habighorst <h habighorst googlemail com>
Date: Mon Apr 26 01:28:28 2010 +0200
Remove libart-compat as it is not necessary anymore.
widgets/libfoocanvas/Makefile.am | 2 -
widgets/libfoocanvas/foo-canvas.c | 61 --------------------
widgets/libfoocanvas/foo-canvas.h | 15 -----
widgets/libfoocanvas/libart-compat.c | 83 ----------------------------
widgets/libfoocanvas/libart-compat.h | 41 --------------
widgets/misc/e-canvas-background.c | 1 -
widgets/misc/e-canvas-background.h | 2 +-
widgets/misc/e-canvas.c | 1 -
widgets/table/e-cell-text.c | 1 -
widgets/table/e-table-field-chooser-item.c | 1 -
widgets/table/e-table-header-item.c | 1 -
widgets/table/e-table-item.c | 1 -
widgets/text/e-text.c | 1 -
13 files changed, 1 insertions(+), 210 deletions(-)
---
diff --git a/widgets/libfoocanvas/Makefile.am b/widgets/libfoocanvas/Makefile.am
index 4415b99..c76d625 100644
--- a/widgets/libfoocanvas/Makefile.am
+++ b/widgets/libfoocanvas/Makefile.am
@@ -19,8 +19,6 @@ libfoocanvas_la_LIBADD = \
$(E_WIDGETS_LIBS)
libfoocanvas_la_SOURCES = \
- libart-compat.h \
- libart-compat.c \
foo-canvas-i18n.h \
foo-canvas-line.c \
foo-canvas-line.h \
diff --git a/widgets/libfoocanvas/foo-canvas.c b/widgets/libfoocanvas/foo-canvas.c
index 6e4e234..db008eb 100644
--- a/widgets/libfoocanvas/foo-canvas.c
+++ b/widgets/libfoocanvas/foo-canvas.c
@@ -874,23 +874,6 @@ foo_canvas_item_ungrab (FooCanvasItem *item, guint32 etime)
}
/**
- * foo_canvas_item_i2w_affine:
- * @item: A canvas item
- * @affine: An affine transformation matrix (return value).
- *
- * Gets the affine transform that converts from the item's coordinate system to
- * world coordinates.
- **/
-void
-foo_canvas_item_i2w_affine (FooCanvasItem *item, gdouble affine[6])
-{
- g_return_if_fail (FOO_IS_CANVAS_ITEM (item));
- g_return_if_fail (affine != NULL);
-
- art_affine_identity (affine);
-}
-
-/**
* foo_canvas_item_w2i:
* @item: A canvas item.
* @x: X coordinate to convert (input/output value).
@@ -944,24 +927,6 @@ foo_canvas_item_i2w (FooCanvasItem *item, gdouble *x, gdouble *y)
}
}
-/**
- * foo_canvas_item_i2c_affine:
- * @item: A canvas item.
- * @affine: An affine transformation matrix (return value).
- *
- * Gets the affine transform that converts from item-relative coordinates to
- * canvas pixel coordinates.
- **/
-void
-foo_canvas_item_i2c_affine (FooCanvasItem *item, gdouble affine[6])
-{
- gdouble i2w[6], w2c[6];
-
- foo_canvas_item_i2w_affine (item, i2w);
- foo_canvas_w2c_affine (item->canvas, w2c);
- art_affine_multiply (affine, i2w, w2c);
-}
-
/* Returns whether the item is an inferior of or is equal to the parent. */
static gint
is_descendant (FooCanvasItem *item, FooCanvasItem *parent)
@@ -3325,32 +3290,6 @@ foo_canvas_request_redraw (FooCanvas *canvas, gint x1, gint y1, gint x2, gint y2
}
/**
- * foo_canvas_w2c_affine:
- * @canvas: A canvas.
- * @affine: An affine transformation matrix (return value).
- *
- * Gets the affine transform that converts from world coordinates to canvas
- * pixel coordinates.
- **/
-void
-foo_canvas_w2c_affine (FooCanvas *canvas, gdouble affine[6])
-{
- gdouble zooom;
-
- g_return_if_fail (FOO_IS_CANVAS (canvas));
- g_return_if_fail (affine != NULL);
-
- zooom = canvas->pixels_per_unit;
-
- affine[0] = zooom;
- affine[1] = 0;
- affine[2] = 0;
- affine[3] = zooom;
- affine[4] = -canvas->scroll_x1 * zooom;
- affine[5] = -canvas->scroll_y1 * zooom;
-}
-
-/**
* foo_canvas_w2c:
* @canvas: A canvas.
* @wx: World X coordinate.
diff --git a/widgets/libfoocanvas/foo-canvas.h b/widgets/libfoocanvas/foo-canvas.h
index 098b5aa..9434915 100644
--- a/widgets/libfoocanvas/foo-canvas.h
+++ b/widgets/libfoocanvas/foo-canvas.h
@@ -244,16 +244,6 @@ void foo_canvas_item_ungrab (FooCanvasItem *item, guint32 etime);
void foo_canvas_item_w2i (FooCanvasItem *item, gdouble *x, gdouble *y);
void foo_canvas_item_i2w (FooCanvasItem *item, gdouble *x, gdouble *y);
-/* Gets the affine transform that converts from item-relative coordinates to
- * world coordinates.
- */
-void foo_canvas_item_i2w_affine (FooCanvasItem *item, gdouble affine[6]);
-
-/* Gets the affine transform that converts from item-relative coordinates to
- * canvas pixel coordinates.
- */
-void foo_canvas_item_i2c_affine (FooCanvasItem *item, gdouble affine[6]);
-
/* Remove the item from its parent group and make the new group its parent. The
* item will be put on top of all the items in the new group. The item's
* coordinates relative to its new parent to *not* change -- this means that the
@@ -479,11 +469,6 @@ FooCanvasItem *foo_canvas_get_item_at (FooCanvas *canvas, gdouble x, gdouble y);
*/
void foo_canvas_request_redraw (FooCanvas *canvas, gint x1, gint y1, gint x2, gint y2);
-/* Gets the affine transform that converts world coordinates into canvas pixel
- * coordinates.
- */
-void foo_canvas_w2c_affine (FooCanvas *canvas, gdouble affine[6]);
-
/* These functions convert from a coordinate system to another. "w" is world
* coordinates, "c" is canvas pixel coordinates (pixel coordinates that are
* (0,0) for the upper-left scrolling limit and something else for the
diff --git a/widgets/misc/e-canvas-background.c b/widgets/misc/e-canvas-background.c
index 99a22e6..2b69c20 100644
--- a/widgets/misc/e-canvas-background.c
+++ b/widgets/misc/e-canvas-background.c
@@ -36,7 +36,6 @@
#include "misc/e-canvas.h"
#include "misc/e-canvas-utils.h"
#include "misc/e-hsv-utils.h"
-#include "libfoocanvas/libart-compat.h"
#include "e-canvas-background.h"
diff --git a/widgets/misc/e-canvas-background.h b/widgets/misc/e-canvas-background.h
index c06a2b8..d44afbc 100644
--- a/widgets/misc/e-canvas-background.h
+++ b/widgets/misc/e-canvas-background.h
@@ -39,7 +39,7 @@ G_BEGIN_DECLS
* x1 gdouble RW Coordinates for edges of background rectangle
* x2 gdouble RW Default is all of them = -1.
* y1 gdouble RW Which means that the entire space is shown.
- * y2 gdouble RW If you need the rectangle to have negative coordinates, use an affine.
+ * y2 gdouble RW
*/
#define E_CANVAS_BACKGROUND_TYPE (e_canvas_background_get_type ())
diff --git a/widgets/misc/e-canvas.c b/widgets/misc/e-canvas.c
index 0d7a7d6..046669a 100644
--- a/widgets/misc/e-canvas.c
+++ b/widgets/misc/e-canvas.c
@@ -25,7 +25,6 @@
#include <gtk/gtk.h>
#include "e-util/e-util.h"
-#include <libfoocanvas/libart-compat.h>
#include "e-canvas.h"
diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c
index a52978b..3d9bd1f 100644
--- a/widgets/table/e-cell-text.c
+++ b/widgets/table/e-cell-text.c
@@ -53,7 +53,6 @@
#include "e-util/e-text-event-processor-emacs-like.h"
#include "e-util/e-util.h"
#include "misc/e-canvas.h"
-#include "libfoocanvas/libart-compat.h"
#include "e-util/e-unicode.h"
#include "e-table.h"
diff --git a/widgets/table/e-table-field-chooser-item.c b/widgets/table/e-table-field-chooser-item.c
index 1f7e3bd..6ea1d2c 100644
--- a/widgets/table/e-table-field-chooser-item.c
+++ b/widgets/table/e-table-field-chooser-item.c
@@ -35,7 +35,6 @@
#include "e-util/e-util.h"
#include "e-util/e-xml-utils.h"
#include "misc/e-canvas.h"
-#include "libfoocanvas/libart-compat.h"
#include "e-table-col-dnd.h"
#include "e-table-defines.h"
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
index 64137a4..8c3051b 100644
--- a/widgets/table/e-table-header-item.c
+++ b/widgets/table/e-table-header-item.c
@@ -39,7 +39,6 @@
#include "e-util/e-xml-utils.h"
#include "misc/e-canvas.h"
#include "misc/e-popup-menu.h"
-#include "libfoocanvas/libart-compat.h"
#include "e-table.h"
#include "e-table-col-dnd.h"
diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c
index 1fe9f47..0379f09 100644
--- a/widgets/table/e-table-item.c
+++ b/widgets/table/e-table-item.c
@@ -43,7 +43,6 @@
#include "misc/e-canvas.h"
#include "misc/e-canvas-utils.h"
#include "misc/e-hsv-utils.h"
-#include "libfoocanvas/libart-compat.h"
#include "e-cell.h"
#include "e-table-item.h"
diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c
index 74e9409..094aae0 100644
--- a/widgets/text/e-text.c
+++ b/widgets/text/e-text.c
@@ -53,7 +53,6 @@
#include <glib/gi18n.h>
#include "e-util/e-text-event-processor-emacs-like.h"
#include "e-util/e-util.h"
-#include "libfoocanvas/libart-compat.h"
#include "e-text.h"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]