Index: gui/new_map_win.cc
===================================================================
--- gui/new_map_win.cc	(revision 1837)
+++ gui/new_map_win.cc	(revision 1849)
@@ -10,5 +10,5 @@
 }
 
-NewMapWin::NewMapWin(const std::string& title, MainWin & mw, bool itisedge, bool edgenode):Gtk::Dialog(title, true, true),mainwin(mw),node("Create NodeMap"),edge("Create EdgeMap")
+NewMapWin::NewMapWin(const std::string& title, NoteBookTab & mw, bool itisedge, bool edgenode):Gtk::Dialog(title, true, true),mytab(mw),node("Create NodeMap"),edge("Create EdgeMap")
 {
   set_default_size(200, 50);
@@ -84,9 +84,9 @@
 	    {
 	      //create the new map
-	      Graph::EdgeMap<double> * emptr=new Graph::EdgeMap<double> (mainwin.mapstorage.graph);
+	      Graph::EdgeMap<double> * emptr=new Graph::EdgeMap<double> (mytab.mapstorage.graph);
 
 	      std::stack<double> polishstack;
   
-	      for(EdgeIt k(mainwin.mapstorage.graph); k!=INVALID; ++k)
+	      for(EdgeIt k(mytab.mapstorage.graph); k!=INVALID; ++k)
 		{
 		  for(int i=0;i<(int)polishform.size();i++)
@@ -107,9 +107,9 @@
 			default:
 			  //substitute variable
-			  std::map< std::string,Graph::EdgeMap<double> * > ems=mainwin.mapstorage.edgemap_storage;
+			  std::map< std::string,Graph::EdgeMap<double> * > ems=mytab.mapstorage.edgemap_storage;
 			  bool itisvar=(ems.find(ch2var[ polishform[i] ])!=ems.end());
 			  if(itisvar)
 			    {
-			      polishstack.push( (*(mainwin.mapstorage.edgemap_storage[ ch2var[ polishform[i] ] ]))[k]);
+			      polishstack.push( (*(mytab.mapstorage.edgemap_storage[ ch2var[ polishform[i] ] ]))[k]);
 			    }
 			  else
@@ -154,5 +154,5 @@
 	      //if addition was not successful addEdgeMap returns one.
 	      //cause can be that there is already a map named like the new one
-	      if(mainwin.mapstorage.addEdgeMap(mapname, emptr, def_val))
+	      if(mytab.mapstorage.addEdgeMap(mapname, emptr, def_val))
 		{
 		  abortion=1;
@@ -160,5 +160,5 @@
 
 	      //add it to the list of the displayable maps
-	      mainwin.registerNewEdgeMap(mapname);
+	      mytab.registerNewEdgeMap(mapname);
 
 	      //display it
@@ -168,9 +168,9 @@
 	    {
 	      //create the new map
-	      Graph::NodeMap<double> * emptr=new Graph::NodeMap<double> (mainwin.mapstorage.graph);
+	      Graph::NodeMap<double> * emptr=new Graph::NodeMap<double> (mytab.mapstorage.graph);
 
 	      std::stack<double> polishstack;
   
-	      for(NodeIt k(mainwin.mapstorage.graph); k!=INVALID; ++k)
+	      for(NodeIt k(mytab.mapstorage.graph); k!=INVALID; ++k)
 		{
 		  for(int i=0;i<(int)polishform.size();i++)
@@ -190,9 +190,9 @@
 			  break;
 			default:
-			  std::map< std::string,Graph::NodeMap<double> * > nms=mainwin.mapstorage.nodemap_storage;
+			  std::map< std::string,Graph::NodeMap<double> * > nms=mytab.mapstorage.nodemap_storage;
 			  bool itisvar=(nms.find(ch2var[ polishform[i] ])!=nms.end());
 			  if(itisvar)
 			    {
-			      polishstack.push( (*(mainwin.mapstorage.nodemap_storage[ ch2var[ polishform[i] ] ]))[k]);
+			      polishstack.push( (*(mytab.mapstorage.nodemap_storage[ ch2var[ polishform[i] ] ]))[k]);
 			    }
 			  else
@@ -237,5 +237,5 @@
 	      //if addition was not successful addNodeMap returns one.
 	      //cause can be that there is already a map named like the new one
-	      if(mainwin.mapstorage.addNodeMap(mapname,emptr, def_val))
+	      if(mytab.mapstorage.addNodeMap(mapname,emptr, def_val))
 		{
 		  abortion=1;
@@ -243,5 +243,5 @@
 
 	      //add it to the list of the displayable maps
-	      mainwin.registerNewNodeMap(mapname);
+	      mytab.registerNewNodeMap(mapname);
 
 	      //display it
@@ -432,9 +432,9 @@
   if(itisedge)
     {
-      cancel=(mainwin.mapstorage.edgemap_storage.find(variable)==mainwin.mapstorage.edgemap_storage.end());
+      cancel=(mytab.mapstorage.edgemap_storage.find(variable)==mytab.mapstorage.edgemap_storage.end());
     }
   else
     {
-      cancel=(mainwin.mapstorage.nodemap_storage.find(variable)==mainwin.mapstorage.nodemap_storage.end());
+      cancel=(mytab.mapstorage.nodemap_storage.find(variable)==mytab.mapstorage.nodemap_storage.end());
     }
   //maybe it is number
