include <ZMap/zmapWindow.h> to fix issue with bumping and mark

src/zmapWindow/items/zmapWindowCollectionFeature.c

@@ -27,9 +27,9 @@
  *
  * Exported functions: See XXXXXXXXXXXXX.h
  * HISTORY:
- * Last edited: Jun  3 23:17 2009 (rds)
+ * Last edited: Jun  5 22:51 2009 (rds)
  * Created: Wed Dec  3 10:02:22 2008 (rds)
- * CVS info:   $Id: zmapWindowCollectionFeature.c,v 1.5 2009-06-03 22:29:08 rds Exp $
+ * CVS info:   $Id: zmapWindowCollectionFeature.c,v 1.6 2009-06-07 08:14:38 rds Exp $
  *-------------------------------------------------------------------
  */
 
@@ -142,12 +142,16 @@ ZMapWindowCanvasItem zMapWindowCollectionFeatureCreate(FooCanvasGroup *parent)
       
   if(item && ZMAP_IS_CANVAS_ITEM(item))
     {
+#ifdef DEBUG_PINK_COLLECTION_FEATURE_BACKGROUND
       FooCanvasItem *background;
+#endif /* DEBUG_PINK_COLLECTION_FEATURE_BACKGROUND */
+
       canvas_item = ZMAP_CANVAS_ITEM(item);
       
       if(ZMAP_CANVAS_ITEM_GET_CLASS(canvas_item)->post_create)
 	(* ZMAP_CANVAS_ITEM_GET_CLASS(canvas_item)->post_create)(canvas_item);
-  
+
+#ifdef DEBUG_PINK_COLLECTION_FEATURE_BACKGROUND
       if((background = canvas_item->items[WINDOW_ITEM_BACKGROUND]))
 	{
 	  GdkColor fill = {0};
@@ -156,9 +160,9 @@ ZMapWindowCanvasItem zMapWindowCollectionFeatureCreate(FooCanvasGroup *parent)
 
 	  foo_canvas_item_set(background, "fill_color_gdk", &fill, NULL);
 	}
+#endif
 
-      zMapWindowCanvasItemCheckSize(canvas_item);
-      
+      zMapWindowCanvasItemCheckSize(canvas_item);      
     }
   
   return canvas_item;

src/zmapWindow/items/zmapWindowContainerFeatureSet.c

@@ -27,9 +27,9 @@
  *
  * Exported functions: See XXXXXXXXXXXXX.h
  * HISTORY:
- * Last edited: Jun  4 08:50 2009 (rds)
+ * Last edited: Jun  5 22:48 2009 (rds)
  * Created: Mon Jul 30 13:09:33 2007 (rds)
- * CVS info:   $Id: zmapWindowContainerFeatureSet.c,v 1.3 2009-06-04 09:13:04 rds Exp $
+ * CVS info:   $Id: zmapWindowContainerFeatureSet.c,v 1.4 2009-06-07 08:14:38 rds Exp $
  *-------------------------------------------------------------------
  */
 #include <string.h>		/* memset */
@@ -130,7 +130,7 @@ GType zmapWindowContainerFeatureSetGetType(void)
 
 
 ZMapWindowContainerFeatureSet zmapWindowContainerFeatureSetAugment(ZMapWindowContainerFeatureSet container_set,
-								   gpointer   window,
+								   ZMapWindow window,
 								   GQuark     feature_set_unique_id,
 								   GQuark     feature_set_original_id, /* unused! */
 								   GList     *style_list,

src/zmapWindow/items/zmapWindowContainerFeatureSet.h

@@ -27,9 +27,9 @@
  *
  * Exported functions: See XXXXXXXXXXXXX.h
  * HISTORY:
- * Last edited: Jun  4 08:49 2009 (rds)
+ * Last edited: Jun  6 20:48 2009 (rds)
  * Created: Wed Dec  3 08:21:03 2008 (rds)
- * CVS info:   $Id: zmapWindowContainerFeatureSet.h,v 1.3 2009-06-04 09:13:04 rds Exp $
+ * CVS info:   $Id: zmapWindowContainerFeatureSet.h,v 1.4 2009-06-07 08:14:38 rds Exp $
  *-------------------------------------------------------------------
  */
 
@@ -37,6 +37,9 @@
 #define ZMAP_WINDOW_CONTAINER_FEATURESET_H
 
 #include <glib-object.h>
+#include <ZMap/zmapFeature.h>
+#include <ZMap/zmapStyle.h>
+#include <ZMap/zmapWindow.h>	/* ZMapWindow type */
 
 
 #define ZMAP_WINDOW_CONTAINER_FEATURESET_NAME 	"ZMapWindowContainerFeatureSet"
@@ -62,7 +65,7 @@ typedef struct _zmapWindowContainerFeatureSetClassStruct  zmapWindowContainerFea
 GType zmapWindowContainerFeatureSetGetType(void);
 
 ZMapWindowContainerFeatureSet zmapWindowContainerFeatureSetAugment(ZMapWindowContainerFeatureSet container_set,
-								   gpointer   window,
+								   ZMapWindow window,
 								   GQuark     feature_set_unique_id,
 								   GQuark     feature_set_original_id, /* unused! */
 								   GList     *style_list,

src/zmapWindow/items/zmapWindowContainerFeatureSet_I.h

@@ -27,9 +27,9 @@
  *
  * Exported functions: See XXXXXXXXXXXXX.h
  * HISTORY:
- * Last edited: Jun  4 08:51 2009 (rds)
+ * Last edited: Jun  5 22:46 2009 (rds)
  * Created: Fri Feb  6 11:49:03 2009 (rds)
- * CVS info:   $Id: zmapWindowContainerFeatureSet_I.h,v 1.3 2009-06-04 09:13:04 rds Exp $
+ * CVS info:   $Id: zmapWindowContainerFeatureSet_I.h,v 1.4 2009-06-07 08:14:38 rds Exp $
  *-------------------------------------------------------------------
  */
 
@@ -37,8 +37,6 @@
 #define __ZMAP_WINDOW_CONTAINER_FEATURE_SET_I_H__
 
 #include <glib.h>
-#include <ZMap/zmapFeature.h>
-#include <ZMap/zmapStyle.h>
 #include <zmapWindowContainerGroup_I.h>
 #include <zmapWindowContainerFeatureSet.h>
 #include <zmapWindowContainerUtils_P.h>
@@ -48,7 +46,7 @@ typedef struct _zmapWindowContainerFeatureSetStruct
 {
   zmapWindowContainerGroup __parent__;
 
-  gpointer    window;
+  ZMapWindow  window;
   ZMapStrand  strand ;
   ZMapFrame   frame ;
   GHashTable *style_table ;