X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/730a38c15de801678c2670df8c70f75af570f2b2..80471a6a905e00bf80ad04fa2061f88ea81f15cb:/src/vikwindow.c?ds=inline diff --git a/src/vikwindow.c b/src/vikwindow.c index 3193c03d..2863e0f8 100644 --- a/src/vikwindow.c +++ b/src/vikwindow.c @@ -1317,10 +1317,6 @@ GtkWidget *vik_window_get_drawmode_button ( VikWindow *vw, VikViewportDrawMode m switch ( mode ) { #ifdef VIK_CONFIG_EXPEDIA case VIK_VIEWPORT_DRAWMODE_EXPEDIA: buttonname = "/ui/MainMenu/View/ModeExpedia"; break; -#endif -#ifdef VIK_CONFIG_OLD_GOOGLE - case VIK_VIEWPORT_DRAWMODE_GOOGLE: buttonname = "/ui/MainMenu/View/ModeGoogle"; break; - case VIK_VIEWPORT_DRAWMODE_KH: buttonname = "/ui/MainMenu/View/ModeKH"; break; #endif case VIK_VIEWPORT_DRAWMODE_MERCATOR: buttonname = "/ui/MainMenu/View/ModeMercator"; break; default: buttonname = "/ui/MainMenu/View/ModeUTM"; @@ -1857,12 +1853,6 @@ static void window_change_coord_mode_cb ( GtkAction *old_a, GtkAction *a, VikWin else if (!strcmp(gtk_action_get_name(a), "ModeExpedia")) { drawmode = VIK_VIEWPORT_DRAWMODE_EXPEDIA; } - else if (!strcmp(gtk_action_get_name(a), "ModeGoogle")) { - drawmode = VIK_VIEWPORT_DRAWMODE_GOOGLE; - } - else if (!strcmp(gtk_action_get_name(a), "ModeKH")) { - drawmode = VIK_VIEWPORT_DRAWMODE_KH; - } else if (!strcmp(gtk_action_get_name(a), "ModeMercator")) { drawmode = VIK_VIEWPORT_DRAWMODE_MERCATOR; } @@ -1997,9 +1987,7 @@ static GtkActionEntry entries[] = { static GtkRadioActionEntry mode_entries[] = { { "ModeUTM", NULL, N_("_UTM Mode"), "u", NULL, 0 }, { "ModeExpedia", NULL, N_("_Expedia Mode"), "e", NULL, 1 }, - { "ModeGoogle", NULL, N_("_Old Google Mode"), "o", NULL, 2 }, - { "ModeKH", NULL, N_("Old _KH Mode"), "k", NULL, 3 }, - { "ModeMercator", NULL, N_("_Google Mode"), "g", NULL, 4 } + { "ModeMercator", NULL, N_("_Mercator Mode"), "g", NULL, 4 } }; static GtkRadioActionEntry tool_entries[] = {