diff -r 291764ce6d91 -r a4d1362397fe gui/map_win.cc
--- a/gui/map_win.cc	Mon Dec 05 17:03:58 2005 +0000
+++ b/gui/map_win.cc	Tue Dec 06 10:53:38 2005 +0000
@@ -5,13 +5,13 @@
 {
   if(e->keyval==GDK_Escape)
   {
-    mainwin.closeMapWin();
+    mytab.closeMapWin();
     //    hide();
   }
   return true;
 }
 
-MapWin::MapWin(const std::string& title, std::vector<std::string> eml, std::vector<std::string> nml, MainWin & mw):mainwin(mw)
+MapWin::MapWin(const std::string& title, std::vector<std::string> eml, std::vector<std::string> nml, NoteBookTab & mw):mytab(mw)
 {
   set_title(title);
   set_default_size(200, 50);
@@ -24,7 +24,7 @@
 
   for(int i=0;i<EDGE_PROPERTY_NUM;i++)
   {
-    e_combo_array[i]=new MapSelector(eml, mainwin.getActiveEdgeMap(i), i, true);
+    e_combo_array[i]=new MapSelector(eml, mytab.getActiveEdgeMap(i), i, true);
 
     (*table).attach((*(e_combo_array[i])),0,1,i,i+1,Gtk::SHRINK,Gtk::SHRINK,10,3);
 
@@ -44,7 +44,7 @@
 
   for(int i=0;i<NODE_PROPERTY_NUM;i++)
   {
-    n_combo_array[i]=new MapSelector(nml, mainwin.getActiveNodeMap(i), i, false);
+    n_combo_array[i]=new MapSelector(nml, mytab.getActiveNodeMap(i), i, false);
 
     (*table).attach((*(n_combo_array[i])),0,1,i,i+1,Gtk::SHRINK,Gtk::SHRINK,10,3);
 
@@ -68,17 +68,17 @@
 
 void MapWin::nodeMapChanged(std::string mapname, int prop)
 {
-  mainwin.propertyChange(false, prop, mapname);
+  mytab.propertyChange(false, prop, mapname);
 }
 
 void MapWin::edgeMapChanged(std::string mapname, int prop)
 {
-  mainwin.propertyChange(true, prop, mapname);
+  mytab.propertyChange(true, prop, mapname);
 }
 
 void MapWin::newMapWinNeeded(bool itisedge, int prop)
 {
-  mainwin.popupNewMapWin(itisedge, prop);
+  mytab.popupNewMapWin(itisedge, prop);
 }
 
 void MapWin::update(std::vector<std::string> eml, std::vector<std::string> nml)
@@ -115,6 +115,6 @@
 bool MapWin::on_delete_event(GdkEventAny * event)
 {
   event=event;
-  mainwin.closeMapWin();
+  mytab.closeMapWin();
   return true;
 }