X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fdisplay%2Fcanvas-arena.h;h=5e6188eeed4fb9da41364189e95e16daabf8ed91;hb=77eda576f455eeb23c7b92510f38bc60738473ab;hp=a2728a7b5cc693a2601056331554ad4c34582d89;hpb=c87d0307348fcfdc65b6b4ab6999a3cb0de2431f;p=inkscape.git

diff --git a/src/display/canvas-arena.h b/src/display/canvas-arena.h
index a2728a7b5..5e6188eee 100644
--- a/src/display/canvas-arena.h
+++ b/src/display/canvas-arena.h
@@ -1,5 +1,5 @@
-#ifndef __SP_CANVAS_ARENA_H__
-#define __SP_CANVAS_ARENA_H__
+#ifndef SEEN_SP_CANVAS_ARENA_H
+#define SEEN_SP_CANVAS_ARENA_H
 
 /*
  * RGBA display list system for inkscape
@@ -13,8 +13,10 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-struct SPCanvasArena;
-struct SPCanvasArenaClass;
+#include "../display/sp-canvas.h"
+#include "nr-arena-item.h"
+
+G_BEGIN_DECLS
 
 #define SP_TYPE_CANVAS_ARENA (sp_canvas_arena_get_type ())
 #define SP_CANVAS_ARENA(obj) (GTK_CHECK_CAST ((obj), SP_TYPE_CANVAS_ARENA, SPCanvasArena))
@@ -22,37 +24,39 @@ struct SPCanvasArenaClass;
 #define SP_IS_CANVAS_ARENA(obj) (GTK_CHECK_TYPE ((obj), SP_TYPE_CANVAS_ARENA))
 #define SP_IS_CANVAS_ARENA_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), SP_TYPE_CANVAS_ARENA))
 
-#include "../display/sp-canvas.h"
-#include "nr-arena-item.h"
+typedef struct _SPCanvasArena      SPCanvasArena;
+typedef struct _SPCanvasArenaClass SPCanvasArenaClass;
 
-struct SPCanvasArena {
-	SPCanvasItem item;
+struct _SPCanvasArena {
+    SPCanvasItem item;
 
-	guint cursor : 1;
-	guint sticky : 1;
-	NR::Point c; // what is this?
+    guint cursor : 1;
+    guint sticky : 1;
+    NR::Point c; // what is this?
 
-	NRArena *arena;
-	NRArenaItem *root;
-	NRGC gc;
+    NRArena *arena;
+    NRArenaItem *root;
+    NRGC gc;
 
-	NRArenaItem *active;
-	/* fixme: */
-	NRArenaItem *picked;
-	gdouble delta;
+    NRArenaItem *active;
+    /* fixme: */
+    NRArenaItem *picked;
+    gdouble delta;
 };
 
-struct SPCanvasArenaClass {
-	SPCanvasItemClass parent_class;
+struct _SPCanvasArenaClass {
+    SPCanvasItemClass parent_class;
 
-	gint (* arena_event) (SPCanvasArena *carena, NRArenaItem *item, GdkEvent *event);
+    gint (* arena_event) (SPCanvasArena *carena, NRArenaItem *item, GdkEvent *event);
 };
 
 GtkType sp_canvas_arena_get_type (void);
 
 void sp_canvas_arena_set_pick_delta (SPCanvasArena *ca, gdouble delta);
-void sp_canvas_arena_set_sticky (SPCanvasArena *ca, bool sticky);
+void sp_canvas_arena_set_sticky (SPCanvasArena *ca, gboolean sticky);
 
 void sp_canvas_arena_render_pixblock (SPCanvasArena *ca, NRPixBlock *pb);
 
-#endif
+G_END_DECLS
+
+#endif // SEEN_SP_CANVAS_ARENA_H