diff -r 121452cc4096 -r 9a0e6e92d06c main_win.cc
--- a/main_win.cc	Wed Jul 27 11:35:13 2005 +0000
+++ b/main_win.cc	Thu Jul 28 14:31:32 2005 +0000
@@ -1,11 +1,8 @@
 #include <main_win.h>
 
 MainWin::MainWin(const std::string& title, Graph & graph, CoordinatesMap & cm,
-    MapStorage & ms):mapwin("Map Setup", ms, gd_canvas),editwin("Editorial Window", gd_canvas),newmapwin("Creating new map",gd_canvas),gd_canvas(graph, cm, ms, &mapwin)
+    MapStorage & ms):mapwin("Map Setup", ms, gd_canvas),newmapwin("Creating new map",gd_canvas),gd_canvas(graph, cm, ms, &mapwin)
 {
-  //Creating a window for setting new maps.
-//   newmapwin=new NewMapWi("Creating new map",*this);
-
 
   set_title (title);
   set_default_size(WIN_WIDTH,WIN_HEIGHT);
@@ -23,7 +20,7 @@
   ag->add( Gtk::Action::create("FileSaveAs", Gtk::Stock::SAVE_AS),
       sigc::mem_fun(*this, &MainWin::saveFileAs));
   ag->add( Gtk::Action::create("FileQuit", Gtk::Stock::QUIT),
-      sigc::mem_fun(*this, &MainWin::quit));
+      sigc::mem_fun(*this, &MainWin::hide));
 
   ag->add( Gtk::Action::create("ViewMenu", "_View") );
   ag->add( Gtk::Action::create("ViewZoomIn", Gtk::Stock::ZOOM_IN),
@@ -37,9 +34,7 @@
   
   ag->add( Gtk::Action::create("ShowMenu", "_Show") );
   ag->add( Gtk::Action::create("ShowMaps", "_Maps"),
-      sigc::mem_fun(*this, &MainWin::showMaps));
-  ag->add( Gtk::Action::create("ShowEditorials", "_Editorials"),
-      sigc::mem_fun(*this, &MainWin::showEditorials));
+      sigc::mem_fun(this->mapwin, &MapWin::show));
 
   ag->add( Gtk::Action::create("CreateNode", Gtk::Stock::NO),
       sigc::bind( sigc::mem_fun ( this->gd_canvas, &GraphDisplayerCanvas::changeEditorialTool ), 1) );
@@ -81,7 +76,6 @@
       "    </menu>"
       "    <menu action='ShowMenu'>"
       "      <menuitem action='ShowMaps'/>"
-      "      <menuitem action='ShowEditorials'/>"
       "    </menu>"
       "  </menubar>"
       "  <toolbar name='ToolBar'>"
@@ -132,21 +126,6 @@
   show_all_children();
 }
 
-void MainWin::showMaps()
-{
-  mapwin.show();
-}
-
-void MainWin::showEditorials()
-{
-  editwin.show();
-}
-
-void MainWin::quit()
-{
-  hide();
-}
-
 void MainWin::newFile()
 {
   std::cerr << "MainWin::newFile(): not yet implemented" << std::endl;