X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/33534cd89a6eb1529e8adda0619e34e6326fcaa8..6260ce3f8b6f735800bb23d07e6105302e171c06:/src/vikgeoreflayer.c?ds=sidebyside

diff --git a/src/vikgeoreflayer.c b/src/vikgeoreflayer.c
index f969274b..4ba541a8 100644
--- a/src/vikgeoreflayer.c
+++ b/src/vikgeoreflayer.c
@@ -36,7 +36,6 @@ enum { PARAM_IMAGE = 0, PARAM_CE, PARAM_CN, PARAM_ME, PARAM_MN, NUM_PARAMS };
 
 static void georef_layer_marshall( VikGeorefLayer *vgl, guint8 **data, gint *len );
 static VikGeorefLayer *georef_layer_unmarshall( guint8 *data, gint len, VikViewport *vvp );
-static VikGeorefLayer *georef_layer_copy ( VikGeorefLayer *vgl, gpointer vp );
 static gboolean georef_layer_set_param ( VikGeorefLayer *vgl, guint16 id, VikLayerParamData data, VikViewport *vp );
 static VikLayerParamData georef_layer_get_param ( VikGeorefLayer *vgl, guint16 id );
 VikGeorefLayer *georef_layer_new ( );
@@ -76,6 +75,8 @@ VikLayerInterface vik_georef_layer_interface = {
   NULL,
   0,
 
+  VIK_MENU_ITEM_ALL,
+
   (VikLayerFuncCreate)                  georef_layer_create,
   (VikLayerFuncRealize)                 NULL,
   (VikLayerFuncPostRead)                georef_layer_load_image,
@@ -85,13 +86,15 @@ VikLayerInterface vik_georef_layer_interface = {
   (VikLayerFuncDraw)                    georef_layer_draw,
   (VikLayerFuncChangeCoordMode)         NULL,
 
+  (VikLayerFuncSetMenuItemsSelection)   NULL,
+  (VikLayerFuncGetMenuItemsSelection)   NULL,
+
   (VikLayerFuncAddMenuItems)            georef_layer_add_menu_items,
   (VikLayerFuncSublayerAddMenuItems)    NULL,
 
   (VikLayerFuncSublayerRenameRequest)   NULL,
   (VikLayerFuncSublayerToggleVisible)   NULL,
 
-  (VikLayerFuncCopy)                    georef_layer_copy,
   (VikLayerFuncMarshall)		georef_layer_marshall,
   (VikLayerFuncUnmarshall)		georef_layer_unmarshall,
 
@@ -145,23 +148,6 @@ GType vik_georef_layer_get_type ()
   return vgl_type;
 }
 
-static VikGeorefLayer *georef_layer_copy ( VikGeorefLayer *vgl, gpointer vp )
-{
-  VikGeorefLayer *rv = georef_layer_new ();
-  rv->corner = vgl->corner;
-  rv->mpp_easting = vgl->mpp_easting;
-  rv->mpp_northing = vgl->mpp_northing;
-  rv->width = vgl->width;
-  rv->height = vgl->height;
-
-  if ( vgl->image )
-  {
-    rv->image = g_strdup ( vgl->image );
-    georef_layer_load_image ( rv );
-  }
-  return rv;
-}
-
 static void georef_layer_marshall( VikGeorefLayer *vgl, guint8 **data, gint *len )
 {
   vik_layer_marshall_params ( VIK_LAYER(vgl), data, len );
@@ -380,7 +366,7 @@ static gboolean georef_layer_dialog ( VikGeorefLayer **vgl, gpointer vp, GtkWind
                                                   GTK_RESPONSE_REJECT,
                                                   GTK_STOCK_OK,
                                                   GTK_RESPONSE_ACCEPT,
-                                                  0 );
+                                                  NULL );
   GtkWidget *table, *wfp_hbox, *wfp_label, *wfp_button, *ce_label, *ce_spin, *cn_label, *cn_spin, *xlabel, *xspin, *ylabel, *yspin, *imagelabel, *imageentry;
 
   GtkWidget *pass_along[4];