1.1 --- a/gui/map_win.cc Tue Nov 29 19:31:58 2005 +0000
1.2 +++ b/gui/map_win.cc Wed Nov 30 13:24:23 2005 +0000
1.3 @@ -5,7 +5,8 @@
1.4 {
1.5 if(e->keyval==GDK_Escape)
1.6 {
1.7 - hide();
1.8 + mainwin.closeMapWin();
1.9 + // hide();
1.10 }
1.11 return true;
1.12 }
1.13 @@ -23,7 +24,7 @@
1.14
1.15 for(int i=0;i<EDGE_PROPERTY_NUM;i++)
1.16 {
1.17 - e_combo_array[i]=new MapSelector(eml, i, true);
1.18 + e_combo_array[i]=new MapSelector(eml, mainwin.getActiveEdgeMap(i), i, true);
1.19
1.20 (*table).attach((*(e_combo_array[i])),0,1,i,i+1,Gtk::SHRINK,Gtk::SHRINK,10,3);
1.21
1.22 @@ -43,7 +44,7 @@
1.23
1.24 for(int i=0;i<NODE_PROPERTY_NUM;i++)
1.25 {
1.26 - n_combo_array[i]=new MapSelector(nml, i, false);
1.27 + n_combo_array[i]=new MapSelector(nml, mainwin.getActiveNodeMap(i), i, false);
1.28
1.29 (*table).attach((*(n_combo_array[i])),0,1,i,i+1,Gtk::SHRINK,Gtk::SHRINK,10,3);
1.30
1.31 @@ -61,6 +62,10 @@
1.32
1.33 }
1.34
1.35 +MapWin::~MapWin()
1.36 +{
1.37 +}
1.38 +
1.39 void MapWin::nodeMapChanged(std::string mapname, int prop)
1.40 {
1.41 mainwin.propertyChange(false, prop, mapname);
1.42 @@ -106,3 +111,10 @@
1.43 n_combo_array[i]->append_text((Glib::ustring)newmapname);
1.44 }
1.45 }
1.46 +
1.47 +bool MapWin::on_delete_event(GdkEventAny * event)
1.48 +{
1.49 + event=event;
1.50 + mainwin.closeMapWin();
1.51 + return true;
1.52 +}