diff --git a/src/zmapWindow/items/zmapWindowCanvas.h b/src/zmapWindow/items/zmapWindowCanvas.h index 3ae822896122f248c31a08f95c9bb830202b1c62..8d413d8a4ac666b649644627b1427dad184bca2e 100755 --- a/src/zmapWindow/items/zmapWindowCanvas.h +++ b/src/zmapWindow/items/zmapWindowCanvas.h @@ -27,17 +27,17 @@ * * Exported functions: See XXXXXXXXXXXXX.h * HISTORY: - * Last edited: Jun 3 21:37 2009 (rds) + * Last edited: Feb 16 10:19 2010 (edgrif) * Created: Wed Apr 29 14:45:58 2009 (rds) - * CVS info: $Id: zmapWindowCanvas.h,v 1.2 2009-06-03 22:29:08 rds Exp $ + * CVS info: $Id: zmapWindowCanvas.h,v 1.3 2010-02-16 10:19:54 edgrif Exp $ *------------------------------------------------------------------- */ - #ifndef ZMAP_WINDOW_CANVAS_H #define ZMAP_WINDOW_CANVAS_H #include <libfoocanvas/libfoocanvas.h> + #define ZMAP_WINDOW_CANVAS_NAME "zmapWindowCanvas" #define ZMAP_TYPE_CANVAS (zMapWindowCanvasGetType ()) @@ -47,22 +47,18 @@ #define ZMAP_IS_CANVAS_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), ZMAP_TYPE_CANVAS)) #define ZMAP_CANVAS_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), ZMAP_TYPE_CANVAS, zmapWindowCanvasClass)) -enum +typedef enum { ZMAP_CANVAS_UPDATE_CROP_REQUIRED = 1 << 5, ZMAP_CANVAS_UPDATE_NEED_REPOSITION = 1 << 6, - }; + } ZMapWindowCanvasUpdateType ; typedef struct _zmapWindowCanvasStruct zmapWindowCanvas, *ZMapWindowCanvas; - - typedef struct _zmapWindowCanvasClassStruct zmapWindowCanvasClass, *ZMapWindowCanvasClass; - GType zMapWindowCanvasGetType(void) ; - GtkWidget *zMapWindowCanvasNew (double max_zoom) ; gboolean zMapWindowCanvasBusy (ZMapWindowCanvas canvas) ; gboolean zMapWindowCanvasUnBusy (ZMapWindowCanvas canvas) ; diff --git a/src/zmapWindow/items/zmapWindowCanvasItem_I.h b/src/zmapWindow/items/zmapWindowCanvasItem_I.h index f039c373ea02218e1a3f4af71c92d8e77c520a42..aee199d341a31e66760d63a3799ba52b9a3774f4 100755 --- a/src/zmapWindow/items/zmapWindowCanvasItem_I.h +++ b/src/zmapWindow/items/zmapWindowCanvasItem_I.h @@ -27,9 +27,9 @@ * * Exported functions: See XXXXXXXXXXXXX.h * HISTORY: - * Last edited: Jan 13 13:12 2010 (edgrif) + * Last edited: Feb 16 09:53 2010 (edgrif) * Created: Wed Dec 3 08:38:10 2008 (rds) - * CVS info: $Id: zmapWindowCanvasItem_I.h,v 1.5 2010-01-14 09:10:08 edgrif Exp $ + * CVS info: $Id: zmapWindowCanvasItem_I.h,v 1.6 2010-02-16 10:22:11 edgrif Exp $ *------------------------------------------------------------------- */ @@ -46,13 +46,13 @@ #define ZMAP_PARAM_STATIC_WO (ZMAP_PARAM_STATIC | G_PARAM_WRITABLE) -enum +typedef enum { WINDOW_ITEM_BACKGROUND, WINDOW_ITEM_UNDERLAY, WINDOW_ITEM_OVERLAY, WINDOW_ITEM_COUNT - }; + } ZMapWindowCanvasItemType ; /* This class is basically a foocanvas group, and might well be one... */ /* If ZMAP_USE_WINDOW_CANVAS_ITEM is defined FooCanvasGroup will be used... */