Refactor: TrackWaypoint sublayer menu callback functions.

[andy/viking.git] / src / viklayer.c

diff --git a/src/viklayer.c b/src/viklayer.c
index 1cd70cbe12a1ed1f1f129f5f60e6189a60f68688..dd1ce92805d4651da543f27413693048e516797a 100644 (file)
--- a/src/viklayer.c
+++ b/src/viklayer.c
@@ -234,11 +234,11 @@ gboolean vik_layer_properties ( VikLayer *layer, gpointer vp )
   return vik_layer_properties_factory ( layer, vp );
 }
 
-void vik_layer_draw ( VikLayer *l, gpointer data )
+void vik_layer_draw ( VikLayer *l, VikViewport *vp )
 {
   if ( l->visible )
     if ( vik_layer_interfaces[l->type]->draw )
-      vik_layer_interfaces[l->type]->draw ( l, data );
+      vik_layer_interfaces[l->type]->draw ( l, vp );
 }
 
 void vik_layer_change_coord_mode ( VikLayer *l, VikCoordMode mode )
@@ -248,7 +248,7 @@ void vik_layer_change_coord_mode ( VikLayer *l, VikCoordMode mode )
 }
 
 typedef struct {
-  gint layer_type;
+  VikLayerTypeEnum layer_type;
   gint len;
   guint8 data[0];
 } header_t;
@@ -525,7 +525,8 @@ static gboolean vik_layer_properties_factory ( VikLayer *vl, VikViewport *vp )
                                            vl, 
                                            vp,
                                            (gpointer) vik_layer_interfaces[vl->type]->get_param, 
-                                           vl) ) {
+                                           vl,
+                                           (gpointer) vik_layer_interfaces[vl->type]->change_param ) ) {
     case 0:
     case 3:
       return FALSE;
@@ -636,7 +637,7 @@ void vik_layer_set_defaults ( VikLayer *vl, VikViewport *vvp )
       // only DEM files uses this currently
       if ( vli->params[i].type != VIK_LAYER_PARAM_STRING_LIST ) {
         data = a_layer_defaults_get ( layer_name, vli->params[i].name, vli->params[i].type );
-        vik_layer_set_param ( vl, i, data, vvp, FALSE );
+        vik_layer_set_param ( vl, i, data, vvp, TRUE ); // Possibly come from a file
       }
     }
   }