X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/aa7ed888d46aee6812e45655ec04bdde7224f929..3f31bec4a6927651bc562e8b21aa0c7354328e1b:/src/vikaggregatelayer.h?ds=sidebyside

diff --git a/src/vikaggregatelayer.h b/src/vikaggregatelayer.h
index c8bb75ca..4f29ed56 100644
--- a/src/vikaggregatelayer.h
+++ b/src/vikaggregatelayer.h
@@ -22,10 +22,12 @@
 #ifndef _VIKING_AGGREGATELAYER_H
 #define _VIKING_AGGREGATELAYER_H
 
-#include <time.h>
+#include <glib.h>
 
 #include "viklayer.h"
 
+G_BEGIN_DECLS
+
 #define VIK_AGGREGATE_LAYER_TYPE            (vik_aggregate_layer_get_type ())
 #define VIK_AGGREGATE_LAYER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), VIK_AGGREGATE_LAYER_TYPE, VikAggregateLayer))
 #define VIK_AGGREGATE_LAYER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), VIK_AGGREGATE_LAYER_TYPE, VikAggregateLayerClass))
@@ -43,10 +45,10 @@ GType vik_aggregate_layer_get_type ();
 typedef struct _VikAggregateLayer VikAggregateLayer;
 
 VikAggregateLayer *vik_aggregate_layer_new ();
-void vik_aggregate_layer_add_layer ( VikAggregateLayer *val, VikLayer *l );
+void vik_aggregate_layer_add_layer ( VikAggregateLayer *val, VikLayer *l, gboolean allow_reordering );
 void vik_aggregate_layer_insert_layer ( VikAggregateLayer *val, VikLayer *l, GtkTreeIter *replace_layer );
 void vik_aggregate_layer_move_layer ( VikAggregateLayer *val, GtkTreeIter *child_iter, gboolean up );
-void vik_aggregate_layer_draw ( VikAggregateLayer *val, gpointer data );
+void vik_aggregate_layer_draw ( VikAggregateLayer *val, VikViewport *vp );
 void vik_aggregate_layer_free ( VikAggregateLayer *val );
 void vik_aggregate_layer_clear ( VikAggregateLayer *val );
 gboolean vik_aggregate_layer_delete ( VikAggregateLayer *val, GtkTreeIter *iter );
@@ -55,13 +57,14 @@ VikAggregateLayer *vik_aggregate_layer_create (VikViewport *vp);
 /* returns: 0 = success, 1 = none appl. found, 2 = found but rejected */
 // guint vik_aggregate_layer_tool ( VikAggregateLayer *val, guint16 layer_type, VikToolInterfaceFunc tool_func, GdkEventButton *event, VikViewport *vvp);
 
-VikLayer *vik_aggregate_layer_get_top_visible_layer_of_type ( VikAggregateLayer *val, gint type );
+VikLayer *vik_aggregate_layer_get_top_visible_layer_of_type ( VikAggregateLayer *val, VikLayerTypeEnum type );
 void vik_aggregate_layer_realize ( VikAggregateLayer *val, VikTreeview *vt, GtkTreeIter *layer_iter );
 gboolean vik_aggregate_layer_load_layers ( VikAggregateLayer *val, FILE *f, gpointer vp );
 gboolean vik_aggregate_layer_is_empty ( VikAggregateLayer *val );
 
 const GList *vik_aggregate_layer_get_children ( VikAggregateLayer *val );
-GList *vik_aggregate_layer_get_all_layers_of_type(VikAggregateLayer *val, GList *layers, gint type, gboolean include_invisible);
+GList *vik_aggregate_layer_get_all_layers_of_type(VikAggregateLayer *val, GList *layers, VikLayerTypeEnum type, gboolean include_invisible);
 
+G_END_DECLS
 
 #endif