1.1 --- a/map_win.cc	Wed Nov 30 13:24:23 2005 +0000
     1.2 +++ b/map_win.cc	Tue Dec 06 10:53:38 2005 +0000
     1.3 @@ -5,13 +5,13 @@
     1.4  {
     1.5    if(e->keyval==GDK_Escape)
     1.6    {
     1.7 -    mainwin.closeMapWin();
     1.8 +    mytab.closeMapWin();
     1.9      //    hide();
    1.10    }
    1.11    return true;
    1.12  }
    1.13  
    1.14 -MapWin::MapWin(const std::string& title, std::vector<std::string> eml, std::vector<std::string> nml, MainWin & mw):mainwin(mw)
    1.15 +MapWin::MapWin(const std::string& title, std::vector<std::string> eml, std::vector<std::string> nml, NoteBookTab & mw):mytab(mw)
    1.16  {
    1.17    set_title(title);
    1.18    set_default_size(200, 50);
    1.19 @@ -24,7 +24,7 @@
    1.20  
    1.21    for(int i=0;i<EDGE_PROPERTY_NUM;i++)
    1.22    {
    1.23 -    e_combo_array[i]=new MapSelector(eml, mainwin.getActiveEdgeMap(i), i, true);
    1.24 +    e_combo_array[i]=new MapSelector(eml, mytab.getActiveEdgeMap(i), i, true);
    1.25  
    1.26      (*table).attach((*(e_combo_array[i])),0,1,i,i+1,Gtk::SHRINK,Gtk::SHRINK,10,3);
    1.27  
    1.28 @@ -44,7 +44,7 @@
    1.29  
    1.30    for(int i=0;i<NODE_PROPERTY_NUM;i++)
    1.31    {
    1.32 -    n_combo_array[i]=new MapSelector(nml, mainwin.getActiveNodeMap(i), i, false);
    1.33 +    n_combo_array[i]=new MapSelector(nml, mytab.getActiveNodeMap(i), i, false);
    1.34  
    1.35      (*table).attach((*(n_combo_array[i])),0,1,i,i+1,Gtk::SHRINK,Gtk::SHRINK,10,3);
    1.36  
    1.37 @@ -68,17 +68,17 @@
    1.38  
    1.39  void MapWin::nodeMapChanged(std::string mapname, int prop)
    1.40  {
    1.41 -  mainwin.propertyChange(false, prop, mapname);
    1.42 +  mytab.propertyChange(false, prop, mapname);
    1.43  }
    1.44  
    1.45  void MapWin::edgeMapChanged(std::string mapname, int prop)
    1.46  {
    1.47 -  mainwin.propertyChange(true, prop, mapname);
    1.48 +  mytab.propertyChange(true, prop, mapname);
    1.49  }
    1.50  
    1.51  void MapWin::newMapWinNeeded(bool itisedge, int prop)
    1.52  {
    1.53 -  mainwin.popupNewMapWin(itisedge, prop);
    1.54 +  mytab.popupNewMapWin(itisedge, prop);
    1.55  }
    1.56  
    1.57  void MapWin::update(std::vector<std::string> eml, std::vector<std::string> nml)
    1.58 @@ -115,6 +115,6 @@
    1.59  bool MapWin::on_delete_event(GdkEventAny * event)
    1.60  {
    1.61    event=event;
    1.62 -  mainwin.closeMapWin();
    1.63 +  mytab.closeMapWin();
    1.64    return true;
    1.65  }