[cairo-commit] goocanvas/src Makefile.am, 1.3, 1.4 goocanvasitem.h, 1.2, 1.3 goocanvastext.h, 1.1.1.1, 1.2

[Damon Chaplin]

Committed by: damon

Update of /cvs/cairo/goocanvas/src
In directory kemper:/tmp/cvs-serv28871/src

Modified Files:
	Makefile.am goocanvasitem.h goocanvastext.h 
Log Message:
2006-04-12  Damon Chaplin  <damon at gnome.org>

	* autogen.sh: 
	* configure.in: 
	* Makefile.am: setup to use gtk-doc.

	* src/Makefile.am: build libgoocanvas as a library now, so we can
	document it with gtk-doc. The demo will be moved to a separate
	directory.

	* src/goocanvastext.h: 
	* src/goocanvasitem.h: rename a few parameters to match the sources,
	since gtk-doc complains if they are different.



Index: Makefile.am
===================================================================
RCS file: /cvs/cairo/goocanvas/src/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile.am	10 Apr 2006 20:30:24 -0000	1.3
+++ Makefile.am	12 Apr 2006 10:42:20 -0000	1.4
@@ -9,37 +9,60 @@
 	-DG_LOG_DOMAIN=\"GooCanvas\" \
 	@PACKAGE_CFLAGS@
 
-noinst_PROGRAMS = demo
+lib_LTLIBRARIES = libgoocanvas.la
 
-demo_SOURCES = \
-	demo.c demo-fifteen.c demo-scalability.c demo-grabs.c \
-	demo-arrowhead.c demo-features.c demo-events.c demo-paths.c \
-	goocanvasmarshal.list \
-	goocanvasellipse.h goocanvasellipse.c \
-	goocanvasellipseview.h goocanvasellipseview.c \
-	goocanvasgroup.h goocanvasgroup.c \
-	goocanvasgroupview.h goocanvasgroupview.c \
-	goocanvasimage.h goocanvasimage.c \
-	goocanvasimageview.h goocanvasimageview.c \
-	goocanvasitem.h goocanvasitem.c \
-	goocanvasitemsimple.h goocanvasitemsimple.c \
-	goocanvasitemview.h goocanvasitemview.c \
-	goocanvasmodel.h goocanvasmodel.c \
-	goocanvasmodelsimple.h goocanvasmodelsimple.c \
-	goocanvaspolyline.h goocanvaspolyline.c \
-	goocanvaspolylineview.h goocanvaspolylineview.c \
-	goocanvaspath.h goocanvaspath.c \
-	goocanvaspathview.h goocanvaspathview.c \
-	goocanvasrect.h goocanvasrect.c \
-	goocanvasrectview.h goocanvasrectview.c \
-	goocanvastext.h goocanvastext.c \
-	goocanvastextview.h goocanvastextview.c \
-	goocanvasutils.h goocanvasutils.c \
-	goocanvasview.h goocanvasview.c
+libgoocanvas_la_LIBADD = @PACKAGE_LIBS@ $(INTLLIBS)
 
-demo_LDADD = @PACKAGE_LIBS@ $(INTLLIBS)
+libgoocanvasincludedir = $(includedir)/libgoocanvas-1.0
+
+libgoocanvasinclude_HEADERS =			\
+	goocanvasellipse.h			\
+	goocanvasellipseview.h			\
+	goocanvasgroup.h			\
+	goocanvasgroupview.h			\
+	goocanvasimage.h			\
+	goocanvasimageview.h			\
+	goocanvasitem.h				\
+	goocanvasitemsimple.h			\
+	goocanvasitemview.h			\
+	goocanvasmodel.h			\
+	goocanvasmodelsimple.h			\
+	goocanvaspolyline.h			\
+	goocanvaspolylineview.h			\
+	goocanvaspath.h				\
+	goocanvaspathview.h			\
+	goocanvasrect.h				\
+	goocanvasrectview.h			\
+	goocanvastext.h				\
+	goocanvastextview.h			\
+	goocanvasutils.h			\
+	goocanvasview.h				\
+	goocanvas.h
+
+libgoocanvas_la_SOURCES =			\
+	goocanvasmarshal.list			\
+	goocanvasellipse.c			\
+	goocanvasellipseview.c			\
+	goocanvasgroup.c			\
+	goocanvasgroupview.c			\
+	goocanvasimage.c			\
+	goocanvasimageview.c			\
+	goocanvasitem.c				\
+	goocanvasitemsimple.c			\
+	goocanvasitemview.c			\
+	goocanvasmodel.c			\
+	goocanvasmodelsimple.c			\
+	goocanvaspolyline.c			\
+	goocanvaspolylineview.c			\
+	goocanvaspath.c				\
+	goocanvaspathview.c			\
+	goocanvasrect.c				\
+	goocanvasrectview.c			\
+	goocanvastext.c				\
+	goocanvastextview.c			\
+	goocanvasutils.c			\
+	goocanvasview.c 
 
-EXTRA_DIST = flower.png toroid.png
 
 GENMARSHAL_COMMAND = $(GLIB_GENMARSHAL) --prefix=goo_canvas_marshal
 SUFFIXES = .list

Index: goocanvasitem.h
===================================================================
RCS file: /cvs/cairo/goocanvas/src/goocanvasitem.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- goocanvasitem.h	23 Mar 2006 16:58:48 -0000	1.2
+++ goocanvasitem.h	12 Apr 2006 10:42:20 -0000	1.3
@@ -149,16 +149,16 @@
 						     double         sy);
 void                 goo_canvas_item_rotate         (GooCanvasItem *item,
 						     double         degrees,
-						     double         x,
-						     double         y);
+						     double         cx,
+						     double         cy);
 void                 goo_canvas_item_skew_x         (GooCanvasItem *item,
 						     double         degrees,
-						     double         x,
-						     double         y);
+						     double         cx,
+						     double         cy);
 void                 goo_canvas_item_skew_y         (GooCanvasItem *item,
 						     double         degrees,
-						     double         x,
-						     double         y);
+						     double         cx,
+						     double         cy);
 
 void                 goo_canvas_item_animate        (GooCanvasItem *item,
 						     double         x,

Index: goocanvastext.h
===================================================================
RCS file: /cvs/cairo/goocanvas/src/goocanvastext.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- goocanvastext.h	15 Dec 2005 15:32:00 -0000	1.1.1.1
+++ goocanvastext.h	12 Apr 2006 10:42:20 -0000	1.2
@@ -45,7 +45,7 @@
 
 GType          goo_canvas_text_get_type        (void) G_GNUC_CONST;
 GooCanvasItem* goo_canvas_text_new             (GooCanvasItem *parent,
-						const char    *text,
+						const char    *string,
 						gdouble        x,
 						gdouble        y,
 						gdouble        width,