1.1 --- a/gui/map_win.cc	Fri Oct 21 08:34:47 2005 +0000
     1.2 +++ b/gui/map_win.cc	Fri Oct 21 13:32:12 2005 +0000
     1.3 @@ -10,7 +10,7 @@
     1.4    return true;
     1.5  }
     1.6  
     1.7 -MapWin::MapWin(const std::string& title, MapStorage & mapst, GraphDisplayerCanvas & grdispc):gdc(grdispc),ms(mapst)
     1.8 +MapWin::MapWin(const std::string& title, MapStorage & mapst, GraphDisplayerCanvas & grdispc, NewMapWin & newmapwin):gdc(grdispc),ms(mapst), nmw(newmapwin)
     1.9  {
    1.10    set_title(title);
    1.11    set_default_size(200, 50);
    1.12 @@ -23,7 +23,7 @@
    1.13  
    1.14    for(int i=0;i<EDGE_PROPERTY_NUM;i++)
    1.15    {
    1.16 -    e_combo_array[i]=new MapSelector(gdc, ms, *this, i, true);
    1.17 +    e_combo_array[i]=new MapSelector(gdc, ms, nmw, i, true);
    1.18  
    1.19      (*table).attach((*(e_combo_array[i])),0,1,i,i+1,Gtk::SHRINK,Gtk::SHRINK,10,3);
    1.20    }
    1.21 @@ -40,7 +40,7 @@
    1.22  
    1.23    for(int i=0;i<NODE_PROPERTY_NUM;i++)
    1.24    {
    1.25 -    n_combo_array[i]=new MapSelector(gdc, ms, *this, i, false);
    1.26 +    n_combo_array[i]=new MapSelector(gdc, ms, nmw, i, false);
    1.27  
    1.28      (*table).attach((*(n_combo_array[i])),0,1,i,i+1,Gtk::SHRINK,Gtk::SHRINK,10,3);
    1.29    }
    1.30 @@ -101,7 +101,7 @@
    1.31    for(int i=0;i<NODE_PROPERTY_NUM;i++)
    1.32    {
    1.33      //filling in combo box with choices
    1.34 -    e_combo_array[i]->append_text((Glib::ustring)newmapname);
    1.35 +    n_combo_array[i]->append_text((Glib::ustring)newmapname);
    1.36    }
    1.37    //setting text property for the new map
    1.38    n_combo_array[N_TEXT]->set_active_text((Glib::ustring)newmapname);