Fix incorrect GPSBabel/Garmin symbol names.

[andy/viking.git] / src / vikaggregatelayer.h

diff --git a/src/vikaggregatelayer.h b/src/vikaggregatelayer.h
index d62dca45bf099dc64043c1bbcd204f7ad79023f8..4a3cf7a13420b16bb1a2547bd4973ae606fcd3ed 100644 (file)
--- a/src/vikaggregatelayer.h
+++ b/src/vikaggregatelayer.h
@@ -22,10 +22,10 @@
 #ifndef _VIKING_AGGREGATELAYER_H
 #define _VIKING_AGGREGATELAYER_H
 
-#include <time.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))
@@ -46,7 +46,7 @@ VikAggregateLayer *vik_aggregate_layer_new ();
 void vik_aggregate_layer_add_layer ( VikAggregateLayer *val, VikLayer *l );
 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,12 +55,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, VikLayerTypeEnum type, gboolean include_invisible);
 
+G_END_DECLS
 
 #endif