goffice r2114 - in trunk: goffice/cut-n-paste/foocanvas goffice/gtk tools
- From: jody svn gnome org
- To: svn-commits-list gnome org
- Subject: goffice r2114 - in trunk: goffice/cut-n-paste/foocanvas goffice/gtk tools
- Date: Sat, 21 Jun 2008 15:59:56 +0000 (UTC)
Author: jody
Date: Sat Jun 21 15:59:55 2008
New Revision: 2114
URL: http://svn.gnome.org/viewvc/goffice?rev=2114&view=rev
Log:
Remove the unused bonobo dock code.
Update foocanvas.
Get things building with trunk gtk after the GSEAL patch.
Removed:
trunk/goffice/gtk/go-dock-band.c
trunk/goffice/gtk/go-dock-band.h
trunk/goffice/gtk/go-dock-item-grip.c
trunk/goffice/gtk/go-dock-item-grip.h
trunk/goffice/gtk/go-dock-item.c
trunk/goffice/gtk/go-dock-item.h
trunk/goffice/gtk/go-dock-layout.c
trunk/goffice/gtk/go-dock-layout.h
trunk/goffice/gtk/go-dock.c
trunk/goffice/gtk/go-dock.h
Modified:
trunk/goffice/cut-n-paste/foocanvas/foo-canvas-i18n.h
trunk/goffice/cut-n-paste/foocanvas/foo-canvas-line.c
trunk/goffice/cut-n-paste/foocanvas/foo-canvas-line.h
trunk/goffice/cut-n-paste/foocanvas/foo-canvas-pixbuf.c
trunk/goffice/cut-n-paste/foocanvas/foo-canvas-pixbuf.h
trunk/goffice/cut-n-paste/foocanvas/foo-canvas-polygon.c
trunk/goffice/cut-n-paste/foocanvas/foo-canvas-polygon.h
trunk/goffice/cut-n-paste/foocanvas/foo-canvas-rect-ellipse.c
trunk/goffice/cut-n-paste/foocanvas/foo-canvas-rect-ellipse.h
trunk/goffice/cut-n-paste/foocanvas/foo-canvas-text.c
trunk/goffice/cut-n-paste/foocanvas/foo-canvas-text.h
trunk/goffice/cut-n-paste/foocanvas/foo-canvas-util.c
trunk/goffice/cut-n-paste/foocanvas/foo-canvas-util.h
trunk/goffice/cut-n-paste/foocanvas/foo-canvas-widget.c
trunk/goffice/cut-n-paste/foocanvas/foo-canvas-widget.h
trunk/goffice/cut-n-paste/foocanvas/foo-canvas.c
trunk/goffice/cut-n-paste/foocanvas/foo-canvas.h
trunk/goffice/cut-n-paste/foocanvas/libfoocanvas.h
trunk/goffice/cut-n-paste/foocanvas/libfoocanvastypes.c
trunk/goffice/gtk/Makefile.am
trunk/goffice/gtk/go-action-combo-stack.c
trunk/goffice/gtk/go-combo-text.c
trunk/tools/import-foocanvas
Modified: trunk/goffice/cut-n-paste/foocanvas/foo-canvas-i18n.h
==============================================================================
--- trunk/goffice/cut-n-paste/foocanvas/foo-canvas-i18n.h (original)
+++ trunk/goffice/cut-n-paste/foocanvas/foo-canvas-i18n.h Sat Jun 21 15:59:55 2008
@@ -17,9 +17,9 @@
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
- * License along with the Gnome Library; see the file COPYING.LIB. If
- * not, write to the Free Software Foundation, Inc., 51 Franklin St,
- * Fifth Floor, Boston, MA 02110-1301 USA.
+ * License along with the Gnome Library; see the file COPYING.LIB. If not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
*/
/*
@NOTATION@
Modified: trunk/goffice/cut-n-paste/foocanvas/foo-canvas-line.c
==============================================================================
--- trunk/goffice/cut-n-paste/foocanvas/foo-canvas-line.c (original)
+++ trunk/goffice/cut-n-paste/foocanvas/foo-canvas-line.c Sat Jun 21 15:59:55 2008
@@ -21,9 +21,9 @@
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
- * License along with the Gnome Library; see the file COPYING.LIB. If
- * not, write to the Free Software Foundation, Inc., 51 Franklin St,
- * Fifth Floor, Boston, MA 02110-1301 USA.
+ * License along with the Gnome Library; see the file COPYING.LIB. If not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
*/
/*
@NOTATION@
@@ -86,7 +86,7 @@
};
-static void foo_canvas_line_class_init (FooCanvasLineClass *class);
+static void foo_canvas_line_class_init (FooCanvasLineClass *klass);
static void foo_canvas_line_init (FooCanvasLine *line);
static void foo_canvas_line_destroy (GtkObject *object);
static void foo_canvas_line_set_property (GObject *object,
@@ -113,43 +113,20 @@
static FooCanvasItemClass *parent_class;
-
-GtkType
-foo_canvas_line_get_type (void)
-{
- static GtkType line_type = 0;
-
- if (!line_type) {
- /* FIXME: Convert to gobject style. */
- static const GtkTypeInfo line_info = {
- (char *)"FooCanvasLine",
- sizeof (FooCanvasLine),
- sizeof (FooCanvasLineClass),
- (GtkClassInitFunc) foo_canvas_line_class_init,
- (GtkObjectInitFunc) foo_canvas_line_init,
- NULL, /* reserved_1 */
- NULL, /* reserved_2 */
- (GtkClassInitFunc) NULL
- };
-
- line_type = gtk_type_unique (foo_canvas_item_get_type (), &line_info);
- }
-
- return line_type;
-}
+G_DEFINE_TYPE (FooCanvasLine, foo_canvas_line, FOO_TYPE_CANVAS_ITEM)
static void
-foo_canvas_line_class_init (FooCanvasLineClass *class)
+foo_canvas_line_class_init (FooCanvasLineClass *klass)
{
GObjectClass *gobject_class;
GtkObjectClass *object_class;
FooCanvasItemClass *item_class;
- gobject_class = (GObjectClass *) class;
- object_class = (GtkObjectClass *) class;
- item_class = (FooCanvasItemClass *) class;
+ gobject_class = (GObjectClass *) klass;
+ object_class = (GtkObjectClass *) klass;
+ item_class = (FooCanvasItemClass *) klass;
- parent_class = gtk_type_class (foo_canvas_item_get_type ());
+ parent_class = g_type_class_peek_parent (klass);
gobject_class->set_property = foo_canvas_line_set_property;
gobject_class->get_property = foo_canvas_line_get_property;
Modified: trunk/goffice/cut-n-paste/foocanvas/foo-canvas-line.h
==============================================================================
--- trunk/goffice/cut-n-paste/foocanvas/foo-canvas-line.h (original)
+++ trunk/goffice/cut-n-paste/foocanvas/foo-canvas-line.h Sat Jun 21 15:59:55 2008
@@ -17,9 +17,9 @@
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
- * License along with the Gnome Library; see the file COPYING.LIB. If
- * not, write to the Free Software Foundation, Inc., 51 Franklin St,
- * Fifth Floor, Boston, MA 02110-1301 USA.
+ * License along with the Gnome Library; see the file COPYING.LIB. If not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
*/
/*
@NOTATION@
@@ -85,11 +85,11 @@
#define FOO_TYPE_CANVAS_LINE (foo_canvas_line_get_type ())
-#define FOO_CANVAS_LINE(obj) (GTK_CHECK_CAST ((obj), FOO_TYPE_CANVAS_LINE, FooCanvasLine))
-#define FOO_CANVAS_LINE_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), FOO_TYPE_CANVAS_LINE, FooCanvasLineClass))
-#define FOO_IS_CANVAS_LINE(obj) (GTK_CHECK_TYPE ((obj), FOO_TYPE_CANVAS_LINE))
-#define FOO_IS_CANVAS_LINE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), FOO_TYPE_CANVAS_LINE))
-#define FOO_CANVAS_LINE_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), FOO_TYPE_CANVAS_LINE, FooCanvasLineClass))
+#define FOO_CANVAS_LINE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), FOO_TYPE_CANVAS_LINE, FooCanvasLine))
+#define FOO_CANVAS_LINE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), FOO_TYPE_CANVAS_LINE, FooCanvasLineClass))
+#define FOO_IS_CANVAS_LINE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), FOO_TYPE_CANVAS_LINE))
+#define FOO_IS_CANVAS_LINE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), FOO_TYPE_CANVAS_LINE))
+#define FOO_CANVAS_LINE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), FOO_TYPE_CANVAS_LINE, FooCanvasLineClass))
typedef struct _FooCanvasLine FooCanvasLine;
@@ -144,7 +144,7 @@
/* Standard Gtk function */
-GtkType foo_canvas_line_get_type (void) G_GNUC_CONST;
+GType foo_canvas_line_get_type (void) G_GNUC_CONST;
G_END_DECLS
Modified: trunk/goffice/cut-n-paste/foocanvas/foo-canvas-pixbuf.c
==============================================================================
--- trunk/goffice/cut-n-paste/foocanvas/foo-canvas-pixbuf.c (original)
+++ trunk/goffice/cut-n-paste/foocanvas/foo-canvas-pixbuf.c Sat Jun 21 15:59:55 2008
@@ -21,9 +21,9 @@
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
- * USA.
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
*/
#include <math.h>
@@ -93,7 +93,7 @@
PROP_POINT_IGNORES_ALPHA
};
-static void foo_canvas_pixbuf_class_init (FooCanvasPixbufClass *class);
+static void foo_canvas_pixbuf_class_init (FooCanvasPixbufClass *klass);
static void foo_canvas_pixbuf_init (FooCanvasPixbuf *cpb);
static void foo_canvas_pixbuf_destroy (GtkObject *object);
static void foo_canvas_pixbuf_set_property (GObject *object,
@@ -118,53 +118,19 @@
static FooCanvasItemClass *parent_class;
-
-
-/**
- * foo_canvas_pixbuf_get_type:
- * @void:
- *
- * Registers the #FooCanvasPixbuf class if necessary, and returns the type ID
- * associated to it.
- *
- * Return value: The type ID of the #FooCanvasPixbuf class.
- **/
-GtkType
-foo_canvas_pixbuf_get_type (void)
-{
- static GtkType canvas_pixbuf_type = 0;
-
- if (!canvas_pixbuf_type) {
- /* FIXME: Convert to gobject style. */
- static const GtkTypeInfo canvas_pixbuf_info = {
- (char *)"FooCanvasPixbuf",
- sizeof (FooCanvasPixbuf),
- sizeof (FooCanvasPixbufClass),
- (GtkClassInitFunc) foo_canvas_pixbuf_class_init,
- (GtkObjectInitFunc) foo_canvas_pixbuf_init,
- NULL, /* reserved_1 */
- NULL, /* reserved_2 */
- (GtkClassInitFunc) NULL
- };
-
- canvas_pixbuf_type = gtk_type_unique (foo_canvas_item_get_type (),
- &canvas_pixbuf_info);
- }
-
- return canvas_pixbuf_type;
-}
+G_DEFINE_TYPE (FooCanvasPixbuf, foo_canvas_pixbuf, FOO_TYPE_CANVAS_ITEM)
/* Class initialization function for the pixbuf canvas item */
static void
-foo_canvas_pixbuf_class_init (FooCanvasPixbufClass *class)
+foo_canvas_pixbuf_class_init (FooCanvasPixbufClass *klass)
{
GObjectClass *gobject_class;
GtkObjectClass *object_class;
FooCanvasItemClass *item_class;
- gobject_class = (GObjectClass *) class;
- object_class = (GtkObjectClass *) class;
- item_class = (FooCanvasItemClass *) class;
+ gobject_class = (GObjectClass *) klass;
+ object_class = (GtkObjectClass *) klass;
+ item_class = (FooCanvasItemClass *) klass;
parent_class = gtk_type_class (foo_canvas_item_get_type ());
Modified: trunk/goffice/cut-n-paste/foocanvas/foo-canvas-pixbuf.h
==============================================================================
--- trunk/goffice/cut-n-paste/foocanvas/foo-canvas-pixbuf.h (original)
+++ trunk/goffice/cut-n-paste/foocanvas/foo-canvas-pixbuf.h Sat Jun 21 15:59:55 2008
@@ -17,9 +17,9 @@
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
- * USA.
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
*/
#ifndef FOO_CANVAS_PIXBUF_H
@@ -33,11 +33,11 @@
#define FOO_TYPE_CANVAS_PIXBUF (foo_canvas_pixbuf_get_type ())
-#define FOO_CANVAS_PIXBUF(obj) (GTK_CHECK_CAST ((obj), FOO_TYPE_CANVAS_PIXBUF, FooCanvasPixbuf))
-#define FOO_CANVAS_PIXBUF_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), FOO_TYPE_CANVAS_PIXBUF, FooCanvasPixbufClass))
-#define FOO_IS_CANVAS_PIXBUF(obj) (GTK_CHECK_TYPE ((obj), FOO_TYPE_CANVAS_PIXBUF))
-#define FOO_IS_CANVAS_PIXBUF_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), FOO_TYPE_CANVAS_PIXBUF))
-#define FOO_CANVAS_PIXBUF_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), FOO_TYPE_CANVAS_PIXBUF, FooCanvasPixbufClass))
+#define FOO_CANVAS_PIXBUF(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), FOO_TYPE_CANVAS_PIXBUF, FooCanvasPixbuf))
+#define FOO_CANVAS_PIXBUF_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), FOO_TYPE_CANVAS_PIXBUF, FooCanvasPixbufClass))
+#define FOO_IS_CANVAS_PIXBUF(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), FOO_TYPE_CANVAS_PIXBUF))
+#define FOO_IS_CANVAS_PIXBUF_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), FOO_TYPE_CANVAS_PIXBUF))
+#define FOO_CANVAS_PIXBUF_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), FOO_TYPE_CANVAS_PIXBUF, FooCanvasPixbufClass))
typedef struct _FooCanvasPixbuf FooCanvasPixbuf;
@@ -55,7 +55,7 @@
};
-GtkType foo_canvas_pixbuf_get_type (void) G_GNUC_CONST;
+GType foo_canvas_pixbuf_get_type (void) G_GNUC_CONST;
Modified: trunk/goffice/cut-n-paste/foocanvas/foo-canvas-polygon.c
==============================================================================
--- trunk/goffice/cut-n-paste/foocanvas/foo-canvas-polygon.c (original)
+++ trunk/goffice/cut-n-paste/foocanvas/foo-canvas-polygon.c Sat Jun 21 15:59:55 2008
@@ -21,9 +21,9 @@
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
- * License along with the Gnome Library; see the file COPYING.LIB. If
- * not, write to the Free Software Foundation, Inc., 51 Franklin St,
- * Fifth Floor, Boston, MA 02110-1301 USA.
+ * License along with the Gnome Library; see the file COPYING.LIB. If not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
*/
/*
@NOTATION@
@@ -75,7 +75,7 @@
};
-static void foo_canvas_polygon_class_init (FooCanvasPolygonClass *class);
+static void foo_canvas_polygon_class_init (FooCanvasPolygonClass *klass);
static void foo_canvas_polygon_init (FooCanvasPolygon *poly);
static void foo_canvas_polygon_destroy (GtkObject *object);
static void foo_canvas_polygon_set_property (GObject *object,
@@ -102,43 +102,20 @@
static FooCanvasItemClass *parent_class;
-
-GtkType
-foo_canvas_polygon_get_type (void)
-{
- static GtkType polygon_type = 0;
-
- if (!polygon_type) {
- /* FIXME: Convert to gobject style. */
- static const GtkTypeInfo polygon_info = {
- (char *)"FooCanvasPolygon",
- sizeof (FooCanvasPolygon),
- sizeof (FooCanvasPolygonClass),
- (GtkClassInitFunc) foo_canvas_polygon_class_init,
- (GtkObjectInitFunc) foo_canvas_polygon_init,
- NULL, /* reserved_1 */
- NULL, /* reserved_2 */
- (GtkClassInitFunc) NULL
- };
-
- polygon_type = gtk_type_unique (foo_canvas_item_get_type (), &polygon_info);
- }
-
- return polygon_type;
-}
+G_DEFINE_TYPE (FooCanvasPolygon, foo_canvas_polygon, FOO_TYPE_CANVAS_ITEM)
static void
-foo_canvas_polygon_class_init (FooCanvasPolygonClass *class)
+foo_canvas_polygon_class_init (FooCanvasPolygonClass *klass)
{
GObjectClass *gobject_class;
GtkObjectClass *object_class;
FooCanvasItemClass *item_class;
- gobject_class = (GObjectClass *) class;
- object_class = (GtkObjectClass *) class;
- item_class = (FooCanvasItemClass *) class;
+ gobject_class = (GObjectClass *) klass;
+ object_class = (GtkObjectClass *) klass;
+ item_class = (FooCanvasItemClass *) klass;
- parent_class = gtk_type_class (foo_canvas_item_get_type ());
+ parent_class = g_type_class_peek_parent (klass);
gobject_class->set_property = foo_canvas_polygon_set_property;
gobject_class->get_property = foo_canvas_polygon_get_property;
Modified: trunk/goffice/cut-n-paste/foocanvas/foo-canvas-polygon.h
==============================================================================
--- trunk/goffice/cut-n-paste/foocanvas/foo-canvas-polygon.h (original)
+++ trunk/goffice/cut-n-paste/foocanvas/foo-canvas-polygon.h Sat Jun 21 15:59:55 2008
@@ -17,9 +17,9 @@
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
- * License along with the Gnome Library; see the file COPYING.LIB. If
- * not, write to the Free Software Foundation, Inc., 51 Franklin St,
- * Fifth Floor, Boston, MA 02110-1301 USA.
+ * License along with the Gnome Library; see the file COPYING.LIB. If not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
*/
/*
@NOTATION@
@@ -71,11 +71,11 @@
*/
#define FOO_TYPE_CANVAS_POLYGON (foo_canvas_polygon_get_type ())
-#define FOO_CANVAS_POLYGON(obj) (GTK_CHECK_CAST ((obj), FOO_TYPE_CANVAS_POLYGON, FooCanvasPolygon))
-#define FOO_CANVAS_POLYGON_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), FOO_TYPE_CANVAS_POLYGON, FooCanvasPolygonClass))
-#define FOO_IS_CANVAS_POLYGON(obj) (GTK_CHECK_TYPE ((obj), FOO_TYPE_CANVAS_POLYGON))
-#define FOO_IS_CANVAS_POLYGON_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), FOO_TYPE_CANVAS_POLYGON))
-#define FOO_CANVAS_POLYGON_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), FOO_TYPE_CANVAS_POLYGON, FooCanvasPolygonClass))
+#define FOO_CANVAS_POLYGON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), FOO_TYPE_CANVAS_POLYGON, FooCanvasPolygon))
+#define FOO_CANVAS_POLYGON_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), FOO_TYPE_CANVAS_POLYGON, FooCanvasPolygonClass))
+#define FOO_IS_CANVAS_POLYGON(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), FOO_TYPE_CANVAS_POLYGON))
+#define FOO_IS_CANVAS_POLYGON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), FOO_TYPE_CANVAS_POLYGON))
+#define FOO_CANVAS_POLYGON_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), FOO_TYPE_CANVAS_POLYGON, FooCanvasPolygonClass))
typedef struct _FooCanvasPolygon FooCanvasPolygon;
@@ -115,7 +115,7 @@
/* Standard Gtk function */
-GtkType foo_canvas_polygon_get_type (void) G_GNUC_CONST;
+GType foo_canvas_polygon_get_type (void) G_GNUC_CONST;
G_END_DECLS
Modified: trunk/goffice/cut-n-paste/foocanvas/foo-canvas-rect-ellipse.c
==============================================================================
--- trunk/goffice/cut-n-paste/foocanvas/foo-canvas-rect-ellipse.c (original)
+++ trunk/goffice/cut-n-paste/foocanvas/foo-canvas-rect-ellipse.c Sat Jun 21 15:59:55 2008
@@ -20,9 +20,9 @@
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
- * License along with the Gnome Library; see the file COPYING.LIB. If
- * not, write to the Free Software Foundation, Inc., 51 Franklin St,
- * Fifth Floor, Boston, MA 02110-1301 USA.
+ * License along with the Gnome Library; see the file COPYING.LIB. If not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
*/
/*
@NOTATION@
@@ -69,7 +69,7 @@
};
-static void foo_canvas_re_class_init (FooCanvasREClass *class);
+static void foo_canvas_re_class_init (FooCanvasREClass *klass);
static void foo_canvas_re_init (FooCanvasRE *re);
static void foo_canvas_re_destroy (GtkObject *object);
static void foo_canvas_re_set_property (GObject *object,
@@ -130,17 +130,17 @@
}
static void
-foo_canvas_re_class_init (FooCanvasREClass *class)
+foo_canvas_re_class_init (FooCanvasREClass *klass)
{
GObjectClass *gobject_class;
GtkObjectClass *object_class;
FooCanvasItemClass *item_class;
- gobject_class = (GObjectClass *) class;
- object_class = (GtkObjectClass *) class;
- item_class = (FooCanvasItemClass *) class;
+ gobject_class = (GObjectClass *) klass;
+ object_class = (GtkObjectClass *) klass;
+ item_class = (FooCanvasItemClass *) klass;
- re_parent_class = g_type_class_peek_parent (class);
+ re_parent_class = g_type_class_peek_parent (klass);
gobject_class->set_property = foo_canvas_re_set_property;
gobject_class->get_property = foo_canvas_re_get_property;
@@ -751,7 +751,7 @@
/* Rectangle item */
-static void foo_canvas_rect_class_init (FooCanvasRectClass *class);
+static void foo_canvas_rect_class_init (FooCanvasRectClass *klass);
static void foo_canvas_rect_init (FooCanvasRect *rect);
static void foo_canvas_rect_finalize (GObject *object);
static void foo_canvas_rect_realize (FooCanvasItem *item);
@@ -799,20 +799,20 @@
}
static void
-foo_canvas_rect_class_init (FooCanvasRectClass *class)
+foo_canvas_rect_class_init (FooCanvasRectClass *klass)
{
FooCanvasItemClass *item_class;
- rect_parent_class = g_type_class_peek_parent (class);
+ rect_parent_class = g_type_class_peek_parent (klass);
- item_class = (FooCanvasItemClass *) class;
+ item_class = (FooCanvasItemClass *) klass;
item_class->draw = foo_canvas_rect_draw;
item_class->point = foo_canvas_rect_point;
item_class->update = foo_canvas_rect_update;
item_class->realize = foo_canvas_rect_realize;
- G_OBJECT_CLASS (class)->finalize = foo_canvas_rect_finalize;
+ G_OBJECT_CLASS (klass)->finalize = foo_canvas_rect_finalize;
}
@@ -1228,7 +1228,7 @@
/* Ellipse item */
-static void foo_canvas_ellipse_class_init (FooCanvasEllipseClass *class);
+static void foo_canvas_ellipse_class_init (FooCanvasEllipseClass *klass);
static void foo_canvas_ellipse_draw (FooCanvasItem *item, GdkDrawable *drawable, GdkEventExpose *expose);
static double foo_canvas_ellipse_point (FooCanvasItem *item, double x, double y, int cx, int cy,
@@ -1264,11 +1264,11 @@
}
static void
-foo_canvas_ellipse_class_init (FooCanvasEllipseClass *class)
+foo_canvas_ellipse_class_init (FooCanvasEllipseClass *klass)
{
FooCanvasItemClass *item_class;
- item_class = (FooCanvasItemClass *) class;
+ item_class = (FooCanvasItemClass *) klass;
item_class->draw = foo_canvas_ellipse_draw;
item_class->point = foo_canvas_ellipse_point;
Modified: trunk/goffice/cut-n-paste/foocanvas/foo-canvas-rect-ellipse.h
==============================================================================
--- trunk/goffice/cut-n-paste/foocanvas/foo-canvas-rect-ellipse.h (original)
+++ trunk/goffice/cut-n-paste/foocanvas/foo-canvas-rect-ellipse.h Sat Jun 21 15:59:55 2008
@@ -17,9 +17,9 @@
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
- * License along with the Gnome Library; see the file COPYING.LIB. If
- * not, write to the Free Software Foundation, Inc., 51 Franklin St,
- * Fifth Floor, Boston, MA 02110-1301 USA.
+ * License along with the Gnome Library; see the file COPYING.LIB. If not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
*/
/*
@NOTATION@
@@ -67,11 +67,11 @@
#define FOO_TYPE_CANVAS_RE (foo_canvas_re_get_type ())
-#define FOO_CANVAS_RE(obj) (GTK_CHECK_CAST ((obj), FOO_TYPE_CANVAS_RE, FooCanvasRE))
-#define FOO_CANVAS_RE_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), FOO_TYPE_CANVAS_RE, FooCanvasREClass))
-#define FOO_IS_CANVAS_RE(obj) (GTK_CHECK_TYPE ((obj), FOO_TYPE_CANVAS_RE))
-#define FOO_IS_CANVAS_RE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), FOO_TYPE_CANVAS_RE))
-#define FOO_CANVAS_RE_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), FOO_TYPE_CANVAS_RE, FooCanvasREClass))
+#define FOO_CANVAS_RE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), FOO_TYPE_CANVAS_RE, FooCanvasRE))
+#define FOO_CANVAS_RE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), FOO_TYPE_CANVAS_RE, FooCanvasREClass))
+#define FOO_IS_CANVAS_RE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), FOO_TYPE_CANVAS_RE))
+#define FOO_IS_CANVAS_RE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), FOO_TYPE_CANVAS_RE))
+#define FOO_CANVAS_RE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), FOO_TYPE_CANVAS_RE, FooCanvasREClass))
typedef struct _FooCanvasRE FooCanvasRE;
@@ -117,11 +117,11 @@
#define FOO_TYPE_CANVAS_RECT (foo_canvas_rect_get_type ())
-#define FOO_CANVAS_RECT(obj) (GTK_CHECK_CAST ((obj), FOO_TYPE_CANVAS_RECT, FooCanvasRect))
-#define FOO_CANVAS_RECT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), FOO_TYPE_CANVAS_RECT, FooCanvasRectClass))
-#define FOO_IS_CANVAS_RECT(obj) (GTK_CHECK_TYPE ((obj), FOO_TYPE_CANVAS_RECT))
-#define FOO_IS_CANVAS_RECT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), FOO_TYPE_CANVAS_RECT))
-#define FOO_CANVAS_RECT_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), FOO_TYPE_CANVAS_RECT, FooCanvasRectClass))
+#define FOO_CANVAS_RECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), FOO_TYPE_CANVAS_RECT, FooCanvasRect))
+#define FOO_CANVAS_RECT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), FOO_TYPE_CANVAS_RECT, FooCanvasRectClass))
+#define FOO_IS_CANVAS_RECT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), FOO_TYPE_CANVAS_RECT))
+#define FOO_IS_CANVAS_RECT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), FOO_TYPE_CANVAS_RECT))
+#define FOO_CANVAS_RECT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), FOO_TYPE_CANVAS_RECT, FooCanvasRectClass))
typedef struct _FooCanvasRect FooCanvasRect;
@@ -148,11 +148,11 @@
#define FOO_TYPE_CANVAS_ELLIPSE (foo_canvas_ellipse_get_type ())
-#define FOO_CANVAS_ELLIPSE(obj) (GTK_CHECK_CAST ((obj), FOO_TYPE_CANVAS_ELLIPSE, FooCanvasEllipse))
-#define FOO_CANVAS_ELLIPSE_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), FOO_TYPE_CANVAS_ELLIPSE, FooCanvasEllipseClass))
-#define FOO_IS_CANVAS_ELLIPSE(obj) (GTK_CHECK_TYPE ((obj), FOO_TYPE_CANVAS_ELLIPSE))
-#define FOO_IS_CANVAS_ELLIPSE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), FOO_TYPE_CANVAS_ELLIPSE))
-#define FOO_CANVAS_ELLIPSE_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), FOO_TYPE_CANVAS_ELLIPSE, FooCanvasEllipseClass))
+#define FOO_CANVAS_ELLIPSE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), FOO_TYPE_CANVAS_ELLIPSE, FooCanvasEllipse))
+#define FOO_CANVAS_ELLIPSE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), FOO_TYPE_CANVAS_ELLIPSE, FooCanvasEllipseClass))
+#define FOO_IS_CANVAS_ELLIPSE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), FOO_TYPE_CANVAS_ELLIPSE))
+#define FOO_IS_CANVAS_ELLIPSE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), FOO_TYPE_CANVAS_ELLIPSE))
+#define FOO_CANVAS_ELLIPSE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), FOO_TYPE_CANVAS_ELLIPSE, FooCanvasEllipseClass))
typedef struct _FooCanvasEllipse FooCanvasEllipse;
Modified: trunk/goffice/cut-n-paste/foocanvas/foo-canvas-text.c
==============================================================================
--- trunk/goffice/cut-n-paste/foocanvas/foo-canvas-text.c (original)
+++ trunk/goffice/cut-n-paste/foocanvas/foo-canvas-text.c Sat Jun 21 15:59:55 2008
@@ -6,6 +6,7 @@
#include <gsf/gsf-impl-utils.h>
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
+ * $Id$
* Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation
* All rights reserved.
*
@@ -22,9 +23,9 @@
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
- * License along with the Gnome Library; see the file COPYING.LIB. If
- * not, write to the Free Software Foundation, Inc., 51 Franklin St,
- * Fifth Floor, Boston, MA 02110-1301 USA.
+ * License along with the Gnome Library; see the file COPYING.LIB. If not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
*/
/*
@NOTATION@
@@ -104,7 +105,7 @@
gint placeholder;
};
-static void foo_canvas_text_class_init (FooCanvasTextClass *class);
+static void foo_canvas_text_class_init (FooCanvasTextClass *klass);
static void foo_canvas_text_init (FooCanvasText *text);
static void foo_canvas_text_destroy (GtkObject *object);
static void foo_canvas_text_set_property (GObject *object,
@@ -154,54 +155,21 @@
static FooCanvasItemClass *parent_class;
-
-
-/**
- * foo_canvas_text_get_type:
- * @void:
- *
- * Registers the &FooCanvasText class if necessary, and returns the type ID
- * associated to it.
- *
- * Return value: The type ID of the &FooCanvasText class.
- **/
-GtkType
-foo_canvas_text_get_type (void)
-{
- static GtkType text_type = 0;
-
- if (!text_type) {
- /* FIXME: Convert to gobject style. */
- static const GtkTypeInfo text_info = {
- (char *)"FooCanvasText",
- sizeof (FooCanvasText),
- sizeof (FooCanvasTextClass),
- (GtkClassInitFunc) foo_canvas_text_class_init,
- (GtkObjectInitFunc) foo_canvas_text_init,
- NULL, /* reserved_1 */
- NULL, /* reserved_2 */
- (GtkClassInitFunc) NULL
- };
-
- text_type = gtk_type_unique (foo_canvas_item_get_type (), &text_info);
- }
-
- return text_type;
-}
+G_DEFINE_TYPE (FooCanvasText, foo_canvas_text, FOO_TYPE_CANVAS_ITEM)
/* Class initialization function for the text item */
static void
-foo_canvas_text_class_init (FooCanvasTextClass *class)
+foo_canvas_text_class_init (FooCanvasTextClass *klass)
{
GObjectClass *gobject_class;
GtkObjectClass *object_class;
FooCanvasItemClass *item_class;
- gobject_class = (GObjectClass *) class;
- object_class = (GtkObjectClass *) class;
- item_class = (FooCanvasItemClass *) class;
+ gobject_class = (GObjectClass *) klass;
+ object_class = (GtkObjectClass *) klass;
+ item_class = (FooCanvasItemClass *) klass;
- parent_class = gtk_type_class (foo_canvas_item_get_type ());
+ parent_class = g_type_class_peek_parent (klass);
gobject_class->set_property = foo_canvas_text_set_property;
gobject_class->get_property = foo_canvas_text_get_property;
Modified: trunk/goffice/cut-n-paste/foocanvas/foo-canvas-text.h
==============================================================================
--- trunk/goffice/cut-n-paste/foocanvas/foo-canvas-text.h (original)
+++ trunk/goffice/cut-n-paste/foocanvas/foo-canvas-text.h Sat Jun 21 15:59:55 2008
@@ -18,9 +18,9 @@
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
- * License along with the Gnome Library; see the file COPYING.LIB. If
- * not, write to the Free Software Foundation, Inc., 51 Franklin St,
- * Fifth Floor, Boston, MA 02110-1301 USA.
+ * License along with the Gnome Library; see the file COPYING.LIB. If not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
*/
/*
@NOTATION@
@@ -98,11 +98,11 @@
*/
#define FOO_TYPE_CANVAS_TEXT (foo_canvas_text_get_type ())
-#define FOO_CANVAS_TEXT(obj) (GTK_CHECK_CAST ((obj), FOO_TYPE_CANVAS_TEXT, FooCanvasText))
-#define FOO_CANVAS_TEXT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), FOO_TYPE_CANVAS_TEXT, FooCanvasTextClass))
-#define FOO_IS_CANVAS_TEXT(obj) (GTK_CHECK_TYPE ((obj), FOO_TYPE_CANVAS_TEXT))
-#define FOO_IS_CANVAS_TEXT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), FOO_TYPE_CANVAS_TEXT))
-#define FOO_CANVAS_TEXT_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), FOO_TYPE_CANVAS_TEXT, FooCanvasTextClass))
+#define FOO_CANVAS_TEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), FOO_TYPE_CANVAS_TEXT, FooCanvasText))
+#define FOO_CANVAS_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), FOO_TYPE_CANVAS_TEXT, FooCanvasTextClass))
+#define FOO_IS_CANVAS_TEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), FOO_TYPE_CANVAS_TEXT))
+#define FOO_IS_CANVAS_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), FOO_TYPE_CANVAS_TEXT))
+#define FOO_CANVAS_TEXT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), FOO_TYPE_CANVAS_TEXT, FooCanvasTextClass))
typedef struct _FooCanvasText FooCanvasText;
@@ -162,7 +162,7 @@
/* Standard Gtk function */
-GtkType foo_canvas_text_get_type (void) G_GNUC_CONST;
+GType foo_canvas_text_get_type (void) G_GNUC_CONST;
G_END_DECLS
Modified: trunk/goffice/cut-n-paste/foocanvas/foo-canvas-util.c
==============================================================================
--- trunk/goffice/cut-n-paste/foocanvas/foo-canvas-util.c (original)
+++ trunk/goffice/cut-n-paste/foocanvas/foo-canvas-util.c Sat Jun 21 15:59:55 2008
@@ -20,9 +20,9 @@
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
- * License along with the Gnome Library; see the file COPYING.LIB. If
- * not, write to the Free Software Foundation, Inc., 51 Franklin St,
- * Fifth Floor, Boston, MA 02110-1301 USA.
+ * License along with the Gnome Library; see the file COPYING.LIB. If not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
*/
/*
@NOTATION@
Modified: trunk/goffice/cut-n-paste/foocanvas/foo-canvas-util.h
==============================================================================
--- trunk/goffice/cut-n-paste/foocanvas/foo-canvas-util.h (original)
+++ trunk/goffice/cut-n-paste/foocanvas/foo-canvas-util.h Sat Jun 21 15:59:55 2008
@@ -17,9 +17,9 @@
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
- * License along with the Gnome Library; see the file COPYING.LIB. If
- * not, write to the Free Software Foundation, Inc., 51 Franklin St,
- * Fifth Floor, Boston, MA 02110-1301 USA.
+ * License along with the Gnome Library; see the file COPYING.LIB. If not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
*/
/*
@NOTATION@
Modified: trunk/goffice/cut-n-paste/foocanvas/foo-canvas-widget.c
==============================================================================
--- trunk/goffice/cut-n-paste/foocanvas/foo-canvas-widget.c (original)
+++ trunk/goffice/cut-n-paste/foocanvas/foo-canvas-widget.c Sat Jun 21 15:59:55 2008
@@ -21,9 +21,9 @@
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
- * License along with the Gnome Library; see the file COPYING.LIB. If
- * not, write to the Free Software Foundation, Inc., 51 Franklin St,
- * Fifth Floor, Boston, MA 02110-1301 USA.
+ * License along with the Gnome Library; see the file COPYING.LIB. If not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
*/
/*
@NOTATION@
@@ -38,7 +38,7 @@
*/
#include <math.h>
-#include <gtk/gtksignal.h>
+#include <glib-object.h>
#include "foo-canvas-widget.h"
enum {
@@ -53,7 +53,7 @@
};
-static void foo_canvas_widget_class_init (FooCanvasWidgetClass *class);
+static void foo_canvas_widget_class_init (FooCanvasWidgetClass *klass);
static void foo_canvas_widget_init (FooCanvasWidget *witem);
static void foo_canvas_widget_destroy (GtkObject *object);
static void foo_canvas_widget_get_property (GObject *object,
@@ -79,43 +79,20 @@
static FooCanvasItemClass *parent_class;
-
-GtkType
-foo_canvas_widget_get_type (void)
-{
- static GtkType witem_type = 0;
-
- if (!witem_type) {
- /* FIXME: Convert to gobject style. */
- static const GtkTypeInfo witem_info = {
- (char *)"FooCanvasWidget",
- sizeof (FooCanvasWidget),
- sizeof (FooCanvasWidgetClass),
- (GtkClassInitFunc) foo_canvas_widget_class_init,
- (GtkObjectInitFunc) foo_canvas_widget_init,
- NULL, /* reserved_1 */
- NULL, /* reserved_2 */
- (GtkClassInitFunc) NULL
- };
-
- witem_type = gtk_type_unique (foo_canvas_item_get_type (), &witem_info);
- }
-
- return witem_type;
-}
+G_DEFINE_TYPE (FooCanvasWidget, foo_canvas_widget, FOO_TYPE_CANVAS_ITEM)
static void
-foo_canvas_widget_class_init (FooCanvasWidgetClass *class)
+foo_canvas_widget_class_init (FooCanvasWidgetClass *klass)
{
GObjectClass *gobject_class;
GtkObjectClass *object_class;
FooCanvasItemClass *item_class;
- gobject_class = (GObjectClass *) class;
- object_class = (GtkObjectClass *) class;
- item_class = (FooCanvasItemClass *) class;
+ gobject_class = (GObjectClass *) klass;
+ object_class = (GtkObjectClass *) klass;
+ item_class = (FooCanvasItemClass *) klass;
- parent_class = gtk_type_class (foo_canvas_item_get_type ());
+ parent_class = g_type_class_peek_parent (klass);
gobject_class->set_property = foo_canvas_widget_set_property;
gobject_class->get_property = foo_canvas_widget_get_property;
Modified: trunk/goffice/cut-n-paste/foocanvas/foo-canvas-widget.h
==============================================================================
--- trunk/goffice/cut-n-paste/foocanvas/foo-canvas-widget.h (original)
+++ trunk/goffice/cut-n-paste/foocanvas/foo-canvas-widget.h Sat Jun 21 15:59:55 2008
@@ -17,9 +17,9 @@
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
- * License along with the Gnome Library; see the file COPYING.LIB. If
- * not, write to the Free Software Foundation, Inc., 51 Franklin St,
- * Fifth Floor, Boston, MA 02110-1301 USA.
+ * License along with the Gnome Library; see the file COPYING.LIB. If not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
*/
/*
@NOTATION@
@@ -63,11 +63,11 @@
#define FOO_TYPE_CANVAS_WIDGET (foo_canvas_widget_get_type ())
-#define FOO_CANVAS_WIDGET(obj) (GTK_CHECK_CAST ((obj), FOO_TYPE_CANVAS_WIDGET, FooCanvasWidget))
-#define FOO_CANVAS_WIDGET_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), FOO_TYPE_CANVAS_WIDGET, FooCanvasWidgetClass))
-#define FOO_IS_CANVAS_WIDGET(obj) (GTK_CHECK_TYPE ((obj), FOO_TYPE_CANVAS_WIDGET))
-#define FOO_IS_CANVAS_WIDGET_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), FOO_TYPE_CANVAS_WIDGET))
-#define FOO_CANVAS_WIDGET_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), FOO_TYPE_CANVAS_WIDGET, FooCanvasWidgetClass))
+#define FOO_CANVAS_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), FOO_TYPE_CANVAS_WIDGET, FooCanvasWidget))
+#define FOO_CANVAS_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), FOO_TYPE_CANVAS_WIDGET, FooCanvasWidgetClass))
+#define FOO_IS_CANVAS_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), FOO_TYPE_CANVAS_WIDGET))
+#define FOO_IS_CANVAS_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), FOO_TYPE_CANVAS_WIDGET))
+#define FOO_CANVAS_WIDGET_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), FOO_TYPE_CANVAS_WIDGET, FooCanvasWidgetClass))
typedef struct _FooCanvasWidget FooCanvasWidget;
@@ -97,7 +97,7 @@
/* Standard Gtk function */
-GtkType foo_canvas_widget_get_type (void) G_GNUC_CONST;
+GType foo_canvas_widget_get_type (void) G_GNUC_CONST;
G_END_DECLS
Modified: trunk/goffice/cut-n-paste/foocanvas/foo-canvas.c
==============================================================================
--- trunk/goffice/cut-n-paste/foocanvas/foo-canvas.c (original)
+++ trunk/goffice/cut-n-paste/foocanvas/foo-canvas.c Sat Jun 21 15:59:55 2008
@@ -21,9 +21,9 @@
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
- * License along with the Gnome Library; see the file COPYING.LIB. If
- * not, write to the Free Software Foundation, Inc., 51 Franklin St,
- * Fifth Floor, Boston, MA 02110-1301 USA.
+ * License along with the Gnome Library; see the file COPYING.LIB. If not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
*/
/*
@NOTATION@
@@ -101,7 +101,7 @@
ITEM_LAST_SIGNAL
};
-static void foo_canvas_item_class_init (FooCanvasItemClass *class);
+static void foo_canvas_item_class_init (FooCanvasItemClass *klass);
static void foo_canvas_item_init (FooCanvasItem *item);
static int emit_event (FooCanvas *canvas, GdkEvent *event);
@@ -1091,6 +1091,9 @@
void
foo_canvas_item_request_update (FooCanvasItem *item)
{
+ if (NULL == item->canvas)
+ return;
+
g_return_if_fail (!item->canvas->doing_update);
if (item->object.flags & FOO_CANVAS_ITEM_NEED_UPDATE)
@@ -1135,7 +1138,7 @@
};
-static void foo_canvas_group_class_init (FooCanvasGroupClass *class);
+static void foo_canvas_group_class_init (FooCanvasGroupClass *klass);
static void foo_canvas_group_init (FooCanvasGroup *group);
static void foo_canvas_group_set_property(GObject *object,
guint param_id,
@@ -1207,17 +1210,17 @@
/* Class initialization function for FooCanvasGroupClass */
static void
-foo_canvas_group_class_init (FooCanvasGroupClass *class)
+foo_canvas_group_class_init (FooCanvasGroupClass *klass)
{
GObjectClass *gobject_class;
GtkObjectClass *object_class;
FooCanvasItemClass *item_class;
- gobject_class = (GObjectClass *) class;
- object_class = (GtkObjectClass *) class;
- item_class = (FooCanvasItemClass *) class;
+ gobject_class = (GObjectClass *) klass;
+ object_class = (GtkObjectClass *) klass;
+ item_class = (FooCanvasItemClass *) klass;
- group_parent_class = gtk_type_class (foo_canvas_item_get_type ());
+ group_parent_class = g_type_class_peek_parent (klass);
gobject_class->set_property = foo_canvas_group_set_property;
gobject_class->get_property = foo_canvas_group_get_property;
@@ -1684,7 +1687,7 @@
/* Unparent the child */
item->parent = NULL;
- item->canvas = NULL;
+ /* item->canvas = NULL; */
g_object_unref (G_OBJECT (item));
/* Remove it from the list */
@@ -1707,7 +1710,7 @@
LAST_SIGNAL
};
-static void foo_canvas_class_init (FooCanvasClass *class);
+static void foo_canvas_class_init (FooCanvasClass *klass);
static void foo_canvas_init (FooCanvas *canvas);
static void foo_canvas_destroy (GtkObject *object);
static void foo_canvas_map (GtkWidget *widget);
@@ -2018,7 +2021,7 @@
object_class = (GtkObjectClass *) klass;
widget_class = (GtkWidgetClass *) klass;
- canvas_parent_class = gtk_type_class (gtk_layout_get_type ());
+ canvas_parent_class = g_type_class_peek_parent (klass);
gobject_class->set_property = foo_canvas_set_property;
gobject_class->get_property = foo_canvas_get_property;
@@ -2372,12 +2375,12 @@
}
/* Signal GtkLayout that it should do a redraw. */
- if (redraw) {
- if (changed_x)
- g_signal_emit_by_name (G_OBJECT (canvas->layout.hadjustment), "value_changed");
- if (changed_y)
- g_signal_emit_by_name (G_OBJECT (canvas->layout.vadjustment), "value_changed");
-}
+ if (redraw) {
+ if (changed_x)
+ g_signal_emit_by_name (G_OBJECT (canvas->layout.hadjustment), "value_changed");
+ if (changed_y)
+ g_signal_emit_by_name (G_OBJECT (canvas->layout.vadjustment), "value_changed");
+ }
}
/* Size allocation handler for the canvas */
@@ -2533,14 +2536,14 @@
finished = FALSE;
while (item && !finished) {
- g_object_ref (G_OBJECT (item));
+ g_object_ref (GTK_OBJECT (item));
g_signal_emit (
G_OBJECT (item), item_signals[ITEM_EVENT], 0,
&ev, &finished);
parent = item->parent;
- g_object_unref (G_OBJECT (item));
+ g_object_unref (GTK_OBJECT (item));
item = parent;
}
@@ -3955,11 +3958,11 @@
/* Class initialization function for FooCanvasItemClass */
static void
-foo_canvas_item_class_init (FooCanvasItemClass *class)
+foo_canvas_item_class_init (FooCanvasItemClass *klass)
{
- GObjectClass *gobject_class = (GObjectClass *) class;
+ GObjectClass *gobject_class = (GObjectClass *) klass;
- item_parent_class = gtk_type_class (gtk_object_get_type ());
+ item_parent_class = g_type_class_peek_parent (klass);
gobject_class->set_property = foo_canvas_item_set_property;
gobject_class->get_property = foo_canvas_item_get_property;
@@ -3979,7 +3982,7 @@
item_signals[ITEM_EVENT] =
g_signal_new ("event",
- G_TYPE_FROM_CLASS (class),
+ G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (FooCanvasItemClass, event),
boolean_handled_accumulator, NULL,
@@ -3987,11 +3990,11 @@
G_TYPE_BOOLEAN, 1,
GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
- class->realize = foo_canvas_item_realize;
- class->unrealize = foo_canvas_item_unrealize;
- class->map = foo_canvas_item_map;
- class->unmap = foo_canvas_item_unmap;
- class->update = foo_canvas_item_update;
+ klass->realize = foo_canvas_item_realize;
+ klass->unrealize = foo_canvas_item_unrealize;
+ klass->map = foo_canvas_item_map;
+ klass->unmap = foo_canvas_item_unmap;
+ klass->update = foo_canvas_item_update;
atk_registry_set_factory_type (atk_get_default_registry (),
FOO_TYPE_CANVAS_ITEM,
Modified: trunk/goffice/cut-n-paste/foocanvas/foo-canvas.h
==============================================================================
--- trunk/goffice/cut-n-paste/foocanvas/foo-canvas.h (original)
+++ trunk/goffice/cut-n-paste/foocanvas/foo-canvas.h Sat Jun 21 15:59:55 2008
@@ -18,9 +18,9 @@
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
- * License along with the Gnome Library; see the file COPYING.LIB. If
- * not, write to the Free Software Foundation, Inc., 51 Franklin St,
- * Fifth Floor, Boston, MA 02110-1301 USA.
+ * License along with the Gnome Library; see the file COPYING.LIB. If not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
*/
/*
@NOTATION@
@@ -104,11 +104,11 @@
};
#define FOO_TYPE_CANVAS_ITEM (foo_canvas_item_get_type ())
-#define FOO_CANVAS_ITEM(obj) (GTK_CHECK_CAST ((obj), FOO_TYPE_CANVAS_ITEM, FooCanvasItem))
-#define FOO_CANVAS_ITEM_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), FOO_TYPE_CANVAS_ITEM, FooCanvasItemClass))
-#define FOO_IS_CANVAS_ITEM(obj) (GTK_CHECK_TYPE ((obj), FOO_TYPE_CANVAS_ITEM))
-#define FOO_IS_CANVAS_ITEM_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), FOO_TYPE_CANVAS_ITEM))
-#define FOO_CANVAS_ITEM_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), FOO_TYPE_CANVAS_ITEM, FooCanvasItemClass))
+#define FOO_CANVAS_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), FOO_TYPE_CANVAS_ITEM, FooCanvasItem))
+#define FOO_CANVAS_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), FOO_TYPE_CANVAS_ITEM, FooCanvasItemClass))
+#define FOO_IS_CANVAS_ITEM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), FOO_TYPE_CANVAS_ITEM))
+#define FOO_IS_CANVAS_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), FOO_TYPE_CANVAS_ITEM))
+#define FOO_CANVAS_ITEM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), FOO_TYPE_CANVAS_ITEM, FooCanvasItemClass))
struct _FooCanvasItem {
@@ -307,11 +307,11 @@
#define FOO_TYPE_CANVAS_GROUP (foo_canvas_group_get_type ())
-#define FOO_CANVAS_GROUP(obj) (GTK_CHECK_CAST ((obj), FOO_TYPE_CANVAS_GROUP, FooCanvasGroup))
-#define FOO_CANVAS_GROUP_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), FOO_TYPE_CANVAS_GROUP, FooCanvasGroupClass))
-#define FOO_IS_CANVAS_GROUP(obj) (GTK_CHECK_TYPE ((obj), FOO_TYPE_CANVAS_GROUP))
-#define FOO_IS_CANVAS_GROUP_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), FOO_TYPE_CANVAS_GROUP))
-#define FOO_CANVAS_GROUP_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), FOO_TYPE_CANVAS_GROUP, FooCanvasGroupClass))
+#define FOO_CANVAS_GROUP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), FOO_TYPE_CANVAS_GROUP, FooCanvasGroup))
+#define FOO_CANVAS_GROUP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), FOO_TYPE_CANVAS_GROUP, FooCanvasGroupClass))
+#define FOO_IS_CANVAS_GROUP(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), FOO_TYPE_CANVAS_GROUP))
+#define FOO_IS_CANVAS_GROUP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), FOO_TYPE_CANVAS_GROUP))
+#define FOO_CANVAS_GROUP_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), FOO_TYPE_CANVAS_GROUP, FooCanvasGroupClass))
struct _FooCanvasGroup {
@@ -337,11 +337,11 @@
#define FOO_TYPE_CANVAS (foo_canvas_get_type ())
-#define FOO_CANVAS(obj) (GTK_CHECK_CAST ((obj), FOO_TYPE_CANVAS, FooCanvas))
-#define FOO_CANVAS_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), FOO_TYPE_CANVAS, FooCanvasClass))
-#define FOO_IS_CANVAS(obj) (GTK_CHECK_TYPE ((obj), FOO_TYPE_CANVAS))
-#define FOO_IS_CANVAS_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), FOO_TYPE_CANVAS))
-#define FOO_CANVAS_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), FOO_TYPE_CANVAS, FooCanvasClass))
+#define FOO_CANVAS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), FOO_TYPE_CANVAS, FooCanvas))
+#define FOO_CANVAS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), FOO_TYPE_CANVAS, FooCanvasClass))
+#define FOO_IS_CANVAS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), FOO_TYPE_CANVAS))
+#define FOO_IS_CANVAS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), FOO_TYPE_CANVAS))
+#define FOO_CANVAS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), FOO_TYPE_CANVAS, FooCanvasClass))
struct _FooCanvas {
Modified: trunk/goffice/cut-n-paste/foocanvas/libfoocanvas.h
==============================================================================
--- trunk/goffice/cut-n-paste/foocanvas/libfoocanvas.h (original)
+++ trunk/goffice/cut-n-paste/foocanvas/libfoocanvas.h Sat Jun 21 15:59:55 2008
@@ -17,9 +17,9 @@
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
- * License along with the Gnome Library; see the file COPYING.LIB. If
- * not, write to the Free Software Foundation, Inc., 51 Franklin St,
- * Fifth Floor, Boston, MA 02110-1301 USA.
+ * License along with the Gnome Library; see the file COPYING.LIB. If not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
*/
/*
@NOTATION@
Modified: trunk/goffice/cut-n-paste/foocanvas/libfoocanvastypes.c
==============================================================================
--- trunk/goffice/cut-n-paste/foocanvas/libfoocanvastypes.c (original)
+++ trunk/goffice/cut-n-paste/foocanvas/libfoocanvastypes.c Sat Jun 21 15:59:55 2008
@@ -20,9 +20,9 @@
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
- * License along with the Gnome Library; see the file COPYING.LIB. If
- * not, write to the Free Software Foundation, Inc., 51 Franklin St,
- * Fifth Floor, Boston, MA 02110-1301 USA.
+ * License along with the Gnome Library; see the file COPYING.LIB. If not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
*/
/*
@NOTATION@
Modified: trunk/goffice/gtk/Makefile.am
==============================================================================
--- trunk/goffice/gtk/Makefile.am (original)
+++ trunk/goffice/gtk/Makefile.am Sat Jun 21 15:59:55 2008
@@ -77,19 +77,6 @@
go-format-sel.glade \
go-image-save-dialog-extra.glade
-# This list should be empty when we reach a stable phase.
-UNUSED = \
- go-dock.c \
- go-dock.h \
- go-dock-band.c \
- go-dock-band.h \
- go-dock-item.c \
- go-dock-item.h \
- go-dock-item-grip.c \
- go-dock-item-grip.h \
- go-dock-layout.c \
- go-dock-layout.h
-
EXTRA_DIST = $(UNUSED)
include $(top_srcdir)/goffice.mk
Modified: trunk/goffice/gtk/go-action-combo-stack.c
==============================================================================
--- trunk/goffice/gtk/go-action-combo-stack.c (original)
+++ trunk/goffice/gtk/go-action-combo-stack.c Sat Jun 21 15:59:55 2008
@@ -72,7 +72,7 @@
#define GO_COMBO_STACK(o) G_TYPE_CHECK_INSTANCE_CAST (o, GO_COMBO_STACK_TYPE, GOComboStack)
#define IS_GO_COMBO_STACK(o) G_TYPE_CHECK_INSTANCE_TYPE (o, GO_COMBO_STACK_TYPE)
-static GtkType go_combo_stack_get_type (void);
+static GType go_combo_stack_get_type (void);
static guint go_combo_stack_signals [LAST_SIGNAL] = { 0, };
static void
Modified: trunk/goffice/gtk/go-combo-text.c
==============================================================================
--- trunk/goffice/gtk/go-combo-text.c (original)
+++ trunk/goffice/gtk/go-combo-text.c Sat Jun 21 15:59:55 2008
@@ -221,7 +221,7 @@
g_signal_connect (G_OBJECT (ct->entry),
"activate",
- GTK_SIGNAL_FUNC (cb_entry_activate), (gpointer) ct);
+ G_CALLBACK (cb_entry_activate), (gpointer) ct);
g_signal_connect (G_OBJECT (ct->scroll),
"size_request",
G_CALLBACK (cb_scroll_size_request), (gpointer) ct);
Modified: trunk/tools/import-foocanvas
==============================================================================
--- trunk/tools/import-foocanvas (original)
+++ trunk/tools/import-foocanvas Sat Jun 21 15:59:55 2008
@@ -47,7 +47,7 @@
while (<SRC>) {
next if /^pkgconfig/ ... !/\\\s*$/;
- s|/libfoocanvas-1.0/libfoocanvas|/libgoffice- GOFFICE_API_VER@/goffice/cut-n-paste/foocanvas/|;
+ s|/libfoocanvas-1.0/libfoocanvas|/libgoffice-\ GOFFICE_API_VER\@/goffice/cut-n-paste/foocanvas/|;
s|\$\(LIBFOOCANVAS_CFLAGS\)|\$\(GOFFICE_CFLAGS\)|;
s/lib_LTLIBRARIES/noinst_LTLIBRARIES/;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
