[goocanvas/new-api] 2010-06-29 Damon Chaplin <damon gnome org>

[Damon Chaplin <damon src gnome org>]

commit 0c94702e168955878f17d933da88c4549c9f6014
Author: Damon Chaplin <damon gnome org>
Date:   Tue Jun 29 12:20:29 2010 +0100

    2010-06-29  Damon Chaplin  <damon gnome org>
    
    	    * src/goocanvasitem.h: rearranged a bit.

 ChangeLog           |    4 ++++
 src/goocanvasitem.h |   29 +++++++++++++++++------------
 2 files changed, 21 insertions(+), 12 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index e860f1a..3f4d3f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-06-29  Damon Chaplin  <damon gnome org>
+
+	* src/goocanvasitem.h: rearranged a bit.
+
 2010-06-28  Damon Chaplin  <damon gnome org>
 
 	* src/goocanvaspolyline.c (goo_canvas_polyline_reconfigure_arrows)
diff --git a/src/goocanvasitem.h b/src/goocanvasitem.h
index de8ee8f..220c1e5 100644
--- a/src/goocanvasitem.h
+++ b/src/goocanvasitem.h
@@ -209,6 +209,8 @@ struct _GooCanvasItemClass
 							 const GooCanvasBounds	*bounds,
 							 gdouble		 scale);
 
+  /* Virtual methods that canvas items must implement if they are going to be
+     used in a layout container such as GooCanvasTable. */
   gboolean		(* get_requested_area)		(GooCanvasItem		*item,
 							 cairo_t		*cr,
 							 GooCanvasBounds	*requested_area);
@@ -226,6 +228,9 @@ struct _GooCanvasItemClass
 							 const cairo_matrix_t	*transform);
   gboolean		(* is_visible)			(GooCanvasItem		*item);
   gboolean		(* get_can_focus)		(GooCanvasItem		*item);
+  gboolean		(* get_is_static)		(GooCanvasItem		*item);
+  void			(* set_is_static)		(GooCanvasItem		*item,
+							 gboolean		 is_static);
   gdouble               (* get_requested_height)	(GooCanvasItem		*item,
 							 cairo_t		*cr,
 							 gdouble		 width);
@@ -259,27 +264,22 @@ struct _GooCanvasItemClass
   gboolean		(* key_release_event)		(GooCanvasItem		*item,
 							 GooCanvasItem		*target,
 							 GdkEventKey		*event);
+  gboolean		(* scroll_event)		(GooCanvasItem		*item,
+							 GooCanvasItem		*target,
+							 GdkEventScroll		*event);
   gboolean		(* grab_broken_event)		(GooCanvasItem		*item,
 							 GooCanvasItem		*target,
 							 GdkEventGrabBroken	*event);
-  void			(* child_notify)		(GooCanvasItem		*item,
-							 GParamSpec		*pspec);
+
   gboolean		(* query_tooltip)		(GooCanvasItem		*item,
 							 gdouble		 x,
 							 gdouble		 y,
 							 gboolean		 keyboard_tooltip,
 							 GtkTooltip		*tooltip);
-
-  gboolean		(* get_is_static)		(GooCanvasItem		*item);
-  void			(* set_is_static)		(GooCanvasItem		*item,
-							 gboolean		 is_static);
-
   void			(* animation_finished)		(GooCanvasItem           *item,
 							 gboolean                 stopped);
-
-  gboolean		(* scroll_event)		(GooCanvasItem		*item,
-							 GooCanvasItem		*target,
-							 GdkEventScroll		*event);
+  void			(* child_notify)		(GooCanvasItem		*item,
+							 GParamSpec		*pspec);
 
   /*< private >*/
 
@@ -288,6 +288,10 @@ struct _GooCanvasItemClass
   void (*_goo_canvas_reserved2) (void);
   void (*_goo_canvas_reserved3) (void);
   void (*_goo_canvas_reserved4) (void);
+  void (*_goo_canvas_reserved5) (void);
+  void (*_goo_canvas_reserved6) (void);
+  void (*_goo_canvas_reserved7) (void);
+  void (*_goo_canvas_reserved8) (void);
 };
 
 
@@ -295,7 +299,8 @@ GType              goo_canvas_item_get_type       (void) G_GNUC_CONST;
 
 
 /*
- * Group functions - these should only be called on container items.
+ * Group functions - functions for adding & removing children and setting their
+ * properties.
  */
 gint               goo_canvas_item_get_n_children (GooCanvasItem   *item);
 GooCanvasItem*     goo_canvas_item_get_child      (GooCanvasItem   *item,