Diff of /trunk/src/main.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 31 by harbaum, Sat Jul 25 10:29:30 2009 UTC revision 32 by harbaum, Tue Jul 28 13:21:22 2009 UTC
# Line 1509  cb_menu_export_garmin(GtkWidget *widget, Line 1509  cb_menu_export_garmin(GtkWidget *widget,
1509    garmin_export(appdata);    garmin_export(appdata);
1510  }  }
1511    
1512    #ifdef ENABLE_OSM_GPS_MAP
1513    static void
1514    cb_menu_map(GtkWidget *window, gpointer data) {
1515      map((appdata_t *)data);
1516    }
1517    #endif
1518    
1519  static void  static void
1520  cb_menu_geomath(GtkWidget *window, gpointer data) {  cb_menu_geomath(GtkWidget *window, gpointer data) {
1521    geomath_dialog((appdata_t *)data);    geomath_dialog((appdata_t *)data);
# Line 1630  void on_export_clicked(GtkButton *button Line 1637  void on_export_clicked(GtkButton *button
1637  }  }
1638    
1639  static const menu_entry_t submenu_tools_entries[] = {  static const menu_entry_t submenu_tools_entries[] = {
1640    #ifdef ENABLE_OSM_GPS_MAP
1641      { "Map",              "Display an interactive world map",
1642        G_CALLBACK(cb_menu_map) },
1643    #endif
1644    { "Geomath",          "Geocoordinate calculation",    { "Geomath",          "Geocoordinate calculation",
1645      G_CALLBACK(cb_menu_geomath) },      G_CALLBACK(cb_menu_geomath) },
1646    { "Geotext",          "Text analysis",    { "Geotext",          "Text analysis",
# Line 1813  void menu_create(appdata_t *appdata) { Line 1824  void menu_create(appdata_t *appdata) {
1824    submenu = gtk_menu_new();    submenu = gtk_menu_new();
1825    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1826    
1827    #ifdef ENABLE_OSM_GPS_MAP
1828      item = gtk_menu_item_new_with_label( _("Map") );
1829      gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1830      g_signal_connect(item, "activate",
1831                       GTK_SIGNAL_FUNC(cb_menu_map), appdata);
1832    #endif
1833    
1834    item = gtk_menu_item_new_with_label( _("Geomath") );    item = gtk_menu_item_new_with_label( _("Geomath") );
1835    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1836    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
Legend:
Removed from v.31  
changed lines
  Added in v.32